Title: [278234] trunk/Tools
- Revision
- 278234
- Author
- zhifei_f...@apple.com
- Date
- 2021-05-28 21:34:13 -0700 (Fri, 28 May 2021)
Log Message
[JSC] Escape $ only when run with SSH
https://bugs.webkit.org/show_bug.cgi?id=226385
Reviewed by Alexey Proskuryakov.
* Scripts/run-jsc-stress-tests:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (278233 => 278234)
--- trunk/Tools/ChangeLog 2021-05-29 01:28:12 UTC (rev 278233)
+++ trunk/Tools/ChangeLog 2021-05-29 04:34:13 UTC (rev 278234)
@@ -1,3 +1,12 @@
+2021-05-28 Zhifei Fang <zhifei_f...@apple.com>
+
+ [JSC] Escape $ only when run with SSH
+ https://bugs.webkit.org/show_bug.cgi?id=226385
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/run-jsc-stress-tests:
+
2021-05-28 Matt Gilligan <matthew_gilli...@apple.com>
Prevent resetting scroll position in unnecessary cases during page load
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (278233 => 278234)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2021-05-29 01:28:12 UTC (rev 278233)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2021-05-29 04:34:13 UTC (rev 278234)
@@ -2197,9 +2197,14 @@
mysys(["scp", "-o", "NoHostAuthenticationForLocalhost=yes", "-P", remoteHost.port.to_s, ($outputDir.dirname + $tarFileName).to_s, "#{remoteHost.user}@#{remoteHost.host}:#{remoteHost.remoteDirectory}"])
end
-def exportBaseEnvironmentVariables
- dyldFrameworkPath = "\\$(cd #{$testingFrameworkPath.dirname}; pwd)"
- ldLibraryPath = "\\$(cd #{$testingFrameworkPath.dirname}/..; pwd)/#{$jscPath.dirname}"
+def exportBaseEnvironmentVariables(escape)
+ if escape
+ dyldFrameworkPath = "\\$(cd #{$testingFrameworkPath.dirname}; pwd)"
+ ldLibraryPath = "\\$(cd #{$testingFrameworkPath.dirname}/..; pwd)/#{$jscPath.dirname}"
+ else
+ dyldFrameworkPath = "\$(cd #{$testingFrameworkPath.dirname}; pwd)"
+ ldLibraryPath = "\$(cd #{$testingFrameworkPath.dirname}/..; pwd)/#{$jscPath.dirname}"
+ end
[
"export DYLD_FRAMEWORK_PATH=#{dyldFrameworkPath} && ",
"export LD_LIBRARY_PATH=#{ldLibraryPath} &&",
@@ -2220,7 +2225,7 @@
remoteScript += "rm -rf #{$outputDir.basename} && "
remoteScript += "tar xzf #{$tarFileName} && "
remoteScript += "cd #{$outputDir.basename}/.runner && "
- remoteScript += exportBaseEnvironmentVariables
+ remoteScript += exportBaseEnvironmentVariables(true)
$envVars.each { |var| remoteScript += "export " << var << "\n" }
remoteScript += "#{testRunnerCommand(remoteIndex)}\""
runAndMonitorTestRunnerCommand(["ssh", "-o", "NoHostAuthenticationForLocalhost=yes", "-p", remoteHost.port.to_s, "#{remoteHost.user}@#{remoteHost.host}", remoteScript])
@@ -2632,7 +2637,7 @@
"--timeout", timeout.to_s,
"-a", inputs,
"if test -e #{$outputDir.basename}/.runner; then cd #{$outputDir.basename}/.runner; else echo #{PARALLEL_REMOTE_STATE_LOST_MARKER}; false; fi && " +
- exportBaseEnvironmentVariables +
+ exportBaseEnvironmentVariables(false) +
$envVars.collect { |var | "export #{var} &&"}.join("") +
"sh "
]
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
