REGRESSION (r169241) Crash running run-jsc-stress-tests on EFL ARM
authormsaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 May 2014 18:05:57 +0000 (18:05 +0000)
committermsaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 May 2014 18:05:57 +0000 (18:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=133223

Reviewed by Geoffrey Garen.

Change runAndMonitorTestRunnerCommand() to convert the *cmd argument to a
string before calling IO.popen() to work with older versions of ruby.
Changed the remote path in runShellTestRunner to quote the command
string we want to run via ssh so that it will work correctly with array
to string conversion needed for popen.

* Scripts/run-jsc-stress-tests:

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

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

index 4d919de..62776ab 100644 (file)
@@ -1,3 +1,18 @@
+2014-05-23  Michael Saboff  <msaboff@apple.com>
+
+        REGRESSION (r169241) Crash running run-jsc-stress-tests on EFL ARM
+        https://bugs.webkit.org/show_bug.cgi?id=133223
+
+        Reviewed by Geoffrey Garen.
+
+        Change runAndMonitorTestRunnerCommand() to convert the *cmd argument to a
+        string before calling IO.popen() to work with older versions of ruby.
+        Changed the remote path in runShellTestRunner to quote the command
+        string we want to run via ssh so that it will work correctly with array
+        to string conversion needed for popen.
+
+        * Scripts/run-jsc-stress-tests:
+
 2014-05-23  Zsolt Borbely  <zsborbely.u-szeged@partner.samsung.com>
 
         Remove 'css-shaders' option from the build-webkit
index 9e55615..ef2b74f 100755 (executable)
@@ -1237,7 +1237,7 @@ def runAndMonitorTestRunnerCommand(numberOfTests, *cmd)
        didFail = {}
        blankLine = true
        prevStringLength = 0
-       IO.popen(cmd, mode="r") {
+       IO.popen(cmd.join(' '), mode="r") {
            | inp |
            inp.each_line {
                | line |
@@ -1300,12 +1300,13 @@ def runShellTestRunner
 
         $remoteDirectory = JSON::parse(sshRead("cat ~/.bencher"))["tempPath"]
         mysys("scp", "-P", $remotePort.to_s, ($outputDir.dirname + "payload.tar.gz").to_s, "#{$remoteUser}@#{$remoteHost}:#{$remoteDirectory}")
-        remoteScript = ""
+        remoteScript = "\""
         remoteScript += "cd #{$remoteDirectory} && "
         remoteScript += "rm -rf #{$outputDir.basename} && "
         remoteScript += "tar xzf payload.tar.gz && "
         remoteScript += "cd #{$outputDir.basename}/.runner && "
         remoteScript += "DYLD_FRAMEWORK_PATH=$(cd #{$testingFrameworkPath.dirname}; pwd) sh runscript"
+        remoteScript += "\""
         runAndMonitorTestRunnerCommand(numberOfTests, "ssh", "-p", $remotePort.to_s, "#{$remoteUser}@#{$remoteHost}", remoteScript)
     else
         Dir.chdir($runnerDir) {