Strip carriage returns from results

        Carriage returns were screwing up sunspider-compare-results on
        Windows.

        Rubberstamped by Oliver.

        * sunspider:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27075 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog
index e68b1549d02497477b899d3a24b5179382b06ac2..05cf038c1607e810681dc6d84571a3ba2c64212c 100644 (file)
--- a/SunSpider/ChangeLog
+++ b/SunSpider/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-25  Adam Roben  <aroben@apple.com>
+
+        Strip carriage returns from results
+
+        Carriage returns were screwing up sunspider-compare-results on
+        Windows.
+
+        Rubberstamped by Oliver.
+
+        * sunspider:
+
 2007-10-24  Darin Adler  <darin@apple.com>
 
         Reviewed by Eric.

diff --git a/SunSpider/sunspider b/SunSpider/sunspider
index 70d7210345a1ecf218557b31e4f61d2434490552..9a954e6890fcf43c835273724f22dbf4bfe8491f 100755 (executable)
--- a/SunSpider/sunspider
+++ b/SunSpider/sunspider
@@ -131,6 +131,7 @@ my $total = 0;
 print "[";
 while ($count++ < $testRuns) {
     $result = runTestsOnce($runShark);
+    $result =~ s/\r\n/\n/g;
     chomp $result;
     push @results, $result;
     print $result;