Add option to specify output file location in sunspider.

https://bugs.webkit.org/show_bug.cgi?id=134339

Patch by Gergo Balogh <gbalogh.u-szeged@partner.samsung.com> on 2014-07-08
Reviewed by Darin Adler.

PerformanceTests/SunSpider:
* sunspider:

Tools:
* Scripts/run-sunspider:

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

diff --git a/PerformanceTests/SunSpider/ChangeLog b/PerformanceTests/SunSpider/ChangeLog
index 32dd4c9..9d62bc1 100644 (file)
--- a/PerformanceTests/SunSpider/ChangeLog
+++ b/PerformanceTests/SunSpider/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-08  Gergo Balogh  <gbalogh.u-szeged@partner.samsung.com>
+
+        Add option to specify output file location in sunspider.
+        https://bugs.webkit.org/show_bug.cgi?id=134339
+
+        Reviewed by Darin Adler.
+
+        * sunspider:
+
 2014-06-03  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
 
         REGRESSION(r169092 and r169102): Skip failing JSC tests poperly on non-x86 Darwin platforms

diff --git a/PerformanceTests/SunSpider/sunspider b/PerformanceTests/SunSpider/sunspider
index ca91c4c..071a864 100755 (executable)
--- a/PerformanceTests/SunSpider/sunspider
+++ b/PerformanceTests/SunSpider/sunspider
@@ -43,6 +43,7 @@ my $jsShellArgs = "";
 my $setBaseline = 0;
 my $testsPattern;
 my $testRuns = 10;
+my $resultsFile = "";
 
 my $programName = basename($0);
 my $usage = <<EOF;
@@ -57,6 +58,7 @@ Usage: $programName --shell=[path] [options]
   --suite           Select a specific benchmark suite. The default is sunspider-1.0.1
   --ubench          Use microbenchmark suite instead of regular tests. Same as --suite=ubench
   --v8-suite        Use the V8 benchmark suite. Same as --suite=v8-v4
+  --output          Override the default output path and filename
   --parse-only      Use the parse-only benchmark suite. Same as --suite=parse-only
 EOF
 
@@ -70,6 +72,7 @@ GetOptions('runs=i' => \$testRuns,
            'v8-suite' => \$v8suite,
            'parse-only' => \$parseOnly,
            'tests=s' => \$testsPattern,
+           'output=s' => \$resultsFile,
            'help' => \$showHelp);
 
 
@@ -122,7 +125,7 @@ sub loadTestsList()
 
 my $timeString = strftime "%Y-%m-%d-%H.%M.%S", localtime $^T;
 my $prefixFile = "$resultDirectory/sunspider-test-prefix.js";
-my $resultsFile = "$resultDirectory/sunspider-results-$timeString.js";
+$resultsFile = "$resultDirectory/sunspider-results-$timeString.js" unless $resultsFile;
 
 sub writePrefixFile()
 {

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 590d434..c5372de 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-08  Gergo Balogh  <gbalogh.u-szeged@partner.samsung.com>
+
+        Add option to specify output file location in sunspider.
+        https://bugs.webkit.org/show_bug.cgi?id=134339
+
+        Reviewed by Darin Adler.
+
+        * Scripts/run-sunspider:
+
 2014-07-07  Alex Christensen  <achristensen@webkit.org>
 
         Unreviewed build fix.

diff --git a/Tools/Scripts/run-sunspider b/Tools/Scripts/run-sunspider
index 4173134..79b6228 100755 (executable)
--- a/Tools/Scripts/run-sunspider
+++ b/Tools/Scripts/run-sunspider
@@ -46,6 +46,7 @@ my $parseonly = 0;
 my $setBaseline = 0;
 my $showHelp = 0;
 my $testsPattern;
+my $output = "";
 my $noBuild = 0;
 my $jsShellArgs="";
 
@@ -63,6 +64,7 @@ Usage: $programName [options] [options to pass to build system]
   --ubench          Use microbenchmark suite instead of regular tests. Same as --suite=ubench
   --v8-suite        Use the V8 benchmark suite. Same as --suite=v8-v4
   --parse-only      Use the parse-only benchmark suite. Same as --suite=parse-only
+  --output          Override the default output path and filename
   --no-build        Do not try to build JSC before running the tests.
 EOF
 
@@ -76,6 +78,7 @@ GetOptions('root=s' => sub { my ($x, $value) = @_; $root = $value; setConfigurat
            'v8-suite' => \$v8suite,
            'parse-only' => \$parseonly,
            'tests=s' => \$testsPattern,
+           'output=s' => \$output,
            'help' => \$showHelp,
            'no-build' => \$noBuild);
 
@@ -126,5 +129,6 @@ push @args, "--v8-suite" if $v8suite;
 push @args, "--parse-only" if $parseonly;
 push @args, "--tests", $testsPattern if $testsPattern;
 push @args, "--args", $jsShellArgs if $jsShellArgs;
+push @args, "--output", $output if $output;
 
 exec currentPerlPath(), "./sunspider", @args;