Changeset 179930 in webkit

Timestamp:

Feb 11, 2015, 9:10:01 AM (12 years ago)

Author:

Csaba Osztrogonác

Message:

run-jsc-stress-tests should pass JSC_timeout to remote hosts
​https://bugs.webkit.org/show_bug.cgi?id=141164

Reviewed by Darin Adler.

Additonally removed IMPORTANT_ENVS, since JSC_timeout was the only one.

• Scripts/run-jsc-stress-tests:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2015-02-11  Csaba Osztrogonác  <ossy@webkit.org>
+
+        run-jsc-stress-tests should pass JSC_timeout to remote hosts
+        https://bugs.webkit.org/show_bug.cgi?id=141164
+
+        Reviewed by Darin Adler.
+
+        Additonally removed IMPORTANT_ENVS, since JSC_timeout was the only one.
+
+        * Scripts/run-jsc-stress-tests:
+
 2015-02-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -46 +46 @@
 
 HELPERS_PATH = SCRIPTS_PATH + "jsc-stress-test-helpers"
-
-IMPORTANT_ENVS = ["JSC_timeout"]
 
 begin
@@ -493 +491 @@
 
         script += "export DYLD_FRAMEWORK_PATH=$(cd #{$testingFrameworkPath.dirname}; pwd)\n"
-        IMPORTANT_ENVS.each {
-            | key |
-            if ENV[key]
-                script += "export #{key}=#{Shellwords.shellescape(ENV[key])}\n"
-            end
-        }
+        script += "export JSC_timeout=#{Shellwords.shellescape(ENV['JSC_timeout'])}\n"
         script += "#{shellCommand} || exit 1"
         "echo #{Shellwords.shellescape(script)} > #{Shellwords.shellescape((Pathname.new("..") + @name).to_s)}"
@@ -1383 +1376 @@
         remoteScript += "tar xzf #{$tarFileName} && "
         remoteScript += "cd #{$outputDir.basename}/.runner && "
-        remoteScript += "DYLD_FRAMEWORK_PATH=\\\"\\$(cd #{$testingFrameworkPath.dirname}; pwd)\\\" sh runscript"
-        remoteScript += "\""
+        remoteScript += "export DYLD_FRAMEWORK_PATH=\\\"\\$(cd #{$testingFrameworkPath.dirname}; pwd)\\\" && "
+        remoteScript += "export JSC_timeout=#{Shellwords.shellescape(ENV['JSC_timeout'])} && "
+        remoteScript += "sh runscript\""
         runAndMonitorTestRunnerCommand("ssh", "-p", $remotePort.to_s, "#{$remoteUser}@#{$remoteHost}", remoteScript)
     else