Changeset 194601 in webkit

Timestamp:

Jan 5, 2016 12:56:43 PM (8 years ago)

Author:

mark.lam@apple.com

Message:

Rename badly named JSC_timeout env var to JSCTEST_timeout.
​https://bugs.webkit.org/show_bug.cgi?id=152748

Reviewed by Geoffrey Garen.

Now that we validate JSC options, the badly named JSC_timeout env var causes the
bots to have a bad time.

• Scripts/run-javascriptcore-tests:
• Scripts/run-jsc-stress-tests:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-javascriptcore-tests (modified) (1 diff)
• Scripts/run-jsc-stress-tests (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-01-05  Mark Lam  <mark.lam@apple.com>
+
+        Rename badly named JSC_timeout env var to JSCTEST_timeout.
+        https://bugs.webkit.org/show_bug.cgi?id=152748
+
+        Reviewed by Geoffrey Garen.
+
+        Now that we validate JSC options, the badly named JSC_timeout env var causes the
+        bots to have a bad time.
+
+        * Scripts/run-javascriptcore-tests:
+        * Scripts/run-jsc-stress-tests:
+
 2016-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/run-javascriptcore-tests

@@ -163 +163 @@
 my $productDir = jscProductDir();
 $ENV{DYLD_FRAMEWORK_PATH} = $productDir;
-$ENV{JSC_timeout} = 60 unless $ENV{JSC_timeout}; # Set a 60 second timeout on all jsc tests (if environment variable not defined already).
+$ENV{JSCTEST_timeout} = 60 unless $ENV{JSCTEST_timeout}; # Set a 60 second timeout on all jsc tests (if environment variable not defined already).
 $ENV{TZ}="US/Pacific"; # Some tests fail if the time zone is not set to US/Pacific (<https://webkit.org/b/136363>)
 setPathForRunningWebKitApp(\%ENV) if isCygwin();

trunk/Tools/Scripts/run-jsc-stress-tests

@@ -607 +607 @@
 
         script += "export DYLD_FRAMEWORK_PATH=$(cd #{$testingFrameworkPath.dirname}; pwd)\n"
-        script += "export JSC_timeout=#{Shellwords.shellescape(ENV['JSC_timeout'])}\n"
+        script += "export JSCTEST_timeout=#{Shellwords.shellescape(ENV['JSCTEST_timeout'])}\n"
         $envVars.each { |var| script += "export " << var << "\n" }
         script += "#{shellCommand} || exit 1"
@@ -1716 +1716 @@
         remoteScript += "export DYLD_FRAMEWORK_PATH=\\\"\\$(cd #{$testingFrameworkPath.dirname}; pwd)\\\" && "
         remoteScript += "export LD_LIBRARY_PATH=#{$remoteDirectory}/#{$outputDir.basename}/#{$jscPath.dirname} && "
-        remoteScript += "export JSC_timeout=#{Shellwords.shellescape(ENV['JSC_timeout'])} && "
+        remoteScript += "export JSCTEST_timeout=#{Shellwords.shellescape(ENV['JSCTEST_timeout'])} && "
         $envVars.each { |var| remoteScript += "export " << var << "\n" }
         remoteScript += "#{testRunnerCommand}\""
@@ -1776 +1776 @@
 end
 
-if $enableFTL and ENV["JSC_timeout"]
+if $enableFTL and ENV["JSCTEST_timeout"]
     # Currently, using the FTL is a performance regression particularly in real
     # (i.e. non-loopy) benchmarks. Account for this in the timeout.
-    ENV["JSC_timeout"] = (ENV["JSC_timeout"].to_i * 2).to_s
-end
-
-if ENV["JSC_timeout"]
+    ENV["JSCTEST_timeout"] = (ENV["JSCTEST_timeout"].to_i * 2).to_s
+end
+
+if ENV["JSCTEST_timeout"]
     # In the worst case, the processors just interfere with each other.
     # Increase the timeout proportionally to the number of processors.
-    ENV["JSC_timeout"] = (ENV["JSC_timeout"].to_i.to_f * Math.sqrt($numChildProcesses)).to_i.to_s
+    ENV["JSCTEST_timeout"] = (ENV["JSCTEST_timeout"].to_i.to_f * Math.sqrt($numChildProcesses)).to_i.to_s
 end