Title: [179930] trunk/Tools
- Revision
- 179930
- Author
- [email protected]
- Date
- 2015-02-11 09:10:01 -0800 (Wed, 11 Feb 2015)
Log 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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (179929 => 179930)
--- trunk/Tools/ChangeLog 2015-02-11 17:09:33 UTC (rev 179929)
+++ trunk/Tools/ChangeLog 2015-02-11 17:10:01 UTC (rev 179930)
@@ -1,3 +1,14 @@
+2015-02-11 Csaba Osztrogonác <[email protected]>
+
+ 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 <[email protected]>
[GTK] Add default color chooser implementation using GtkColorChooserDialog
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (179929 => 179930)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2015-02-11 17:09:33 UTC (rev 179929)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2015-02-11 17:10:01 UTC (rev 179930)
@@ -46,8 +46,6 @@
HELPERS_PATH = SCRIPTS_PATH + "jsc-stress-test-helpers"
-IMPORTANT_ENVS = ["JSC_timeout"]
-
begin
require 'shellwords'
rescue Exception => e
@@ -492,12 +490,7 @@
script += "cd .runner\n"
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)}"
end
@@ -1382,8 +1375,9 @@
remoteScript += "rm -rf #{$outputDir.basename} && "
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
Dir.chdir($runnerDir) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
