Reviewed by Eric.

        - Support Windows and Windows browsers.

        * hosted/sunspider-results.html: Display results correctly in IE.
        * sunspider: tweaks to work on Windows, and with spaces in the path.

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

diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog
index 85f669e2c288150946eb4cb5a58a8d32cae74e74..a68f7eb8e41a72abf937ca7f26a35d9df7479547 100644 (file)
--- a/SunSpider/ChangeLog
+++ b/SunSpider/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-18  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Eric.
+        
+        - Support Windows and Windows browsers.
+
+        * hosted/sunspider-results.html: Display results correctly in IE.
+        * sunspider: tweaks to work on Windows, and with spaces in the path.
+
 2007-10-18  Maciej Stachowiak  <mjs@apple.com>
 
         Rubber stamped by Oliver.

diff --git a/SunSpider/hosted/sunspider-results.html b/SunSpider/hosted/sunspider-results.html
index e1df43489fb706d88bd4917438ffe6797d2d417f..91853078262af0f4e585d952770da816ab04308b 100644 (file)
--- a/SunSpider/hosted/sunspider-results.html
+++ b/SunSpider/hosted/sunspider-results.html
@@ -39,7 +39,9 @@
 <script>
 var output = eval(decodeURI(location.search.substring(1)));
 function print(str) {
-    document.getElementById("console").appendChild(document.createTextNode(str + "\n"));
+    var console = document.getElementById("console");
+    console.appendChild(document.createTextNode(str));
+    console.appendChild(document.createElement("br"));
 }
 </script>
 

diff --git a/SunSpider/sunspider b/SunSpider/sunspider
index 6e02fbf02dc00f05edf3813040d2885c5a5c9c70..dc397ef896acddb501230f4f3e2a9302f4ea7215 100755 (executable)
--- a/SunSpider/sunspider
+++ b/SunSpider/sunspider
@@ -66,11 +66,12 @@ close TESTLIST;
 my $prefix = "var tests = [ " . join(", ", map { '"' . $_ . '"' } @tests) . " ];\n";
 $prefix .= "var categories = [ " . join(", ", map { '"' . $_ . '"' } @categories) . " ];\n";
 
-open PREFIX, ">/tmp/sunspider-test-prefix.js";
+mkdir "tmp";
+open PREFIX, ">tmp/sunspider-test-prefix.js";
 print PREFIX $prefix;
 close PREFIX;
 
-my $discard = `$jsshell -f /tmp/sunspider-test-prefix.js -f resources/sunspider-standalone-driver.js 2> /dev/null`;
+my $discard = `"$jsshell" -f tmp/sunspider-test-prefix.js -f resources/sunspider-standalone-driver.js 2> /dev/null`;
 
 print "Discarded first run.\n";
 
@@ -79,7 +80,7 @@ my $count = 0;
 my @results = ();
 my $total = 0;
 while ($count++ < $max) {
-    $result = `$jsshell -f /tmp/sunspider-test-prefix.js -f resources/sunspider-standalone-driver.js 2> /dev/null`;
+    $result = `"$jsshell" -f tmp/sunspider-test-prefix.js -f resources/sunspider-standalone-driver.js 2> /dev/null`;
     chomp $result;
     push @results, $result;
     print $result . "\n";
@@ -87,9 +88,8 @@ while ($count++ < $max) {
 
 my $output = "var output = [\n" . join(",\n", @results) . "\n];\n";
 
-open(OUTPUT, ">/tmp/sunspider-results.js");
+open(OUTPUT, ">tmp/sunspider-results.js");
 print OUTPUT $output;
 close(OUTPUT);
 
-system("$jsshell -f /tmp/sunspider-test-prefix.js -f /tmp/sunspider-results.js -f resources/sunspider-analyze-results.js");
-
+system("$jsshell", "-f", "tmp/sunspider-test-prefix.js", "-f", "tmp/sunspider-results.js", "-f", "resources/sunspider-analyze-results.js");