2008-09-02 Cameron Zwarich <cwzwarich@uwaterloo.ca>

        Rubber-stamped by Oliver Hunt.

        Make SunSpider work with JavaScript shells that don't take filenames
        after a '-f' argument.

        * sunspider:

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

diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog
index d5e0f86..4b1b07e 100644 (file)
--- a/SunSpider/ChangeLog
+++ b/SunSpider/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-02  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Rubber-stamped by Oliver Hunt.
+
+        Make SunSpider work with JavaScript shells that don't take filenames
+        after a '-f' argument.
+
+        * sunspider:
+
 2008-06-07  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 
         Reviewed by Timothy.

diff --git a/SunSpider/sunspider b/SunSpider/sunspider
index 36eaa09..2826654 100755 (executable)
--- a/SunSpider/sunspider
+++ b/SunSpider/sunspider
@@ -144,7 +144,7 @@ sub writePrefixFile()
 sub runTestsOnce($)
 {
     my ($useShark) = @_;
-    my $shellArgs = "-f $prefixFile -f resources/sunspider-standalone-driver.js 2> /dev/null";
+    my $shellArgs = "$prefixFile resources/sunspider-standalone-driver.js 2> /dev/null";
     my $output;
     if ($useShark) {
         my $intervalArg = $useShark == 20 ? "-I 20u" : "";
@@ -209,7 +209,7 @@ my $output = "var output = [\n" . join(",\n", @results) . "\n];\n";
 dumpToFile($output, $resultsFile);
 dumpToFile(File::Spec->rel2abs($resultsFile), "tmp/baseline-filename.txt") if $setBaseline;
 
-system("$jsShellPath", "-f", $prefixFile, "-f", $resultsFile, "-f", "resources/sunspider-analyze-results.js");
+system("$jsShellPath", $prefixFile, $resultsFile, "resources/sunspider-analyze-results.js");
 
 if ($runShark) {
     my $newestMShark = newestFile(".", qr/\.mshark$/);