Title: [262927] trunk/Tools
Revision
262927
Author
[email protected]
Date
2020-06-11 15:31:14 -0700 (Thu, 11 Jun 2020)

Log Message

Unreviewed, reverting r262696.
https://bugs.webkit.org/show_bug.cgi?id=213097

It broke running JSC tests on watchOS

Reverted changeset:

"Allow run-jsc-stress-tests still run if some of the remote
hosts are not available"
https://bugs.webkit.org/show_bug.cgi?id=201426
https://trac.webkit.org/changeset/262696

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (262926 => 262927)


--- trunk/Tools/ChangeLog	2020-06-11 22:11:53 UTC (rev 262926)
+++ trunk/Tools/ChangeLog	2020-06-11 22:31:14 UTC (rev 262927)
@@ -1,3 +1,17 @@
+2020-06-11  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r262696.
+        https://bugs.webkit.org/show_bug.cgi?id=213097
+
+        It broke running JSC tests on watchOS
+
+        Reverted changeset:
+
+        "Allow run-jsc-stress-tests still run if some of the remote
+        hosts are not available"
+        https://bugs.webkit.org/show_bug.cgi?id=201426
+        https://trac.webkit.org/changeset/262696
+
 2020-06-11  Sihui Liu  <[email protected]>
 
         REGRESSION (r262879): 3 TestWebKitAPI.TextManipulation tests are failing

Modified: trunk/Tools/Scripts/run-jsc-stress-tests (262926 => 262927)


--- trunk/Tools/Scripts/run-jsc-stress-tests	2020-06-11 22:11:53 UTC (rev 262926)
+++ trunk/Tools/Scripts/run-jsc-stress-tests	2020-06-11 22:31:14 UTC (rev 262927)
@@ -123,49 +123,6 @@
 $forceCollectContinuously = false
 $reportExecutionTime = false
 
-def sshRead(cmd, remoteIndex=0)
-    raise unless $remote
-
-    remoteHost = $remoteHosts[remoteIndex]
-
-    result = ""
-    IO.popen("ssh -o NoHostAuthenticationForLocalhost=yes -p #{remoteHost.port} #{remoteHost.user}@#{remoteHost.host} '#{cmd}'", "r") {
-      | inp |
-      inp.each_line {
-        | line |
-        result += line
-      }
-    }
-    raise "#{$?}" unless $?.success?
-    result
-end
-
-def checkAndPrepareRemoteHost(remoteIndex=0)
-    available = false
-    remoteHost = $remoteHosts[remoteIndex]
-
-    begin
-        remoteHost.remoteDirectory = JSON::parse(sshRead("cat ~/.bencher", remoteIndex))["tempPath"] unless remoteHost.remoteDirectory
-        mysys("ssh", "-o", "NoHostAuthenticationForLocalhost=yes", "-p", remoteHost.port.to_s, "#{remoteHost.user}@#{remoteHost.host}", "mkdir -p #{remoteHost.remoteDirectory}")
-        available = true
-    rescue
-        $stderr.puts "Host #{remoteHost.host}:#{remoteHost.port} is not available"
-    end
-    available
-end
-
-def checkAndPrepareRemoteHosts
-    availableHosts = []
-    $remoteHosts.each_with_index {
-        | host, remoteIndex |
-        if checkAndPrepareRemoteHost(remoteIndex)
-            availableHosts << host
-        end
-    }
-    raise "There is no remote host available" if availableHosts.empty?
-    $remoteHosts = availableHosts
-end
-
 def usage
     puts "run-jsc-stress-tests -j <shell path> <collections path> [<collections path> ...]"
     puts
@@ -339,8 +296,6 @@
             host
         }
     end
-
-    checkAndPrepareRemoteHosts if $remote
 end
 
 unless jscArg
@@ -2001,6 +1956,23 @@
     }
 end
 
+def sshRead(cmd, remoteIndex=0)
+    raise unless $remote
+
+    remoteHost = $remoteHosts[remoteIndex]
+
+    result = ""
+    IO.popen("ssh -o NoHostAuthenticationForLocalhost=yes -p #{remoteHost.port} #{remoteHost.user}@#{remoteHost.host} '#{cmd}'", "r") {
+      | inp |
+      inp.each_line {
+        | line |
+        result += line
+      }
+    }
+    raise "#{$?}" unless $?.success?
+    result
+end
+
 def runCommandOnTester(cmd)
     if $remote
         result = sshRead(cmd)
@@ -2105,8 +2077,12 @@
 end
 
 def runTestRunner(remoteIndex=0)
-    remoteHost = $remoteHosts[remoteIndex]
     if $remote
+        remoteHost = $remoteHosts[remoteIndex]
+        if !remoteHost.remoteDirectory
+            remoteHost.remoteDirectory = JSON::parse(sshRead("cat ~/.bencher", remoteIndex))["tempPath"]
+        end
+        mysys("ssh", "-o", "NoHostAuthenticationForLocalhost=yes", "-p", remoteHost.port.to_s, "#{remoteHost.user}@#{remoteHost.host}", "mkdir -p #{remoteHost.remoteDirectory}")
         mysys("scp", "-o", "NoHostAuthenticationForLocalhost=yes", "-P", remoteHost.port.to_s, ($outputDir.dirname + $tarFileName).to_s, "#{remoteHost.user}@#{remoteHost.host}:#{remoteHost.remoteDirectory}")
         remoteScript = "\""
         remoteScript += "cd #{remoteHost.remoteDirectory} && "
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to