Changeset 285875 in webkit

Timestamp:

Nov 16, 2021, 11:31:42 AM (5 years ago)

Author:

zhifei_fang@apple.com

Message:

Make run-javascript-core-test and run-jsc-stress-tests support a customized identity file
​https://bugs.webkit.org/show_bug.cgi?id=232453

Reviewed by Ryan Haddad.

• Scripts/run-javascriptcore-tests: Add idFilePath field for remote config.
• Scripts/run-jsc-stress-tests: Add idFilePath field for remote config.
• Scripts/webkitdirs.pm:

(determineNativeArchitecture): Provide -i option to ssh

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-javascriptcore-tests (modified) (1 diff)
• Scripts/run-jsc-stress-tests (modified) (7 diffs)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-16  Zhifei Fang  <zhifei_fang@apple.com>
+
+        Make run-javascript-core-test and run-jsc-stress-tests support a customized identity file
+        https://bugs.webkit.org/show_bug.cgi?id=232453
+
+        Reviewed by Ryan Haddad.
+
+        * Scripts/run-javascriptcore-tests: Add idFilePath field for remote config.
+        * Scripts/run-jsc-stress-tests: Add idFilePath field for remote config.
+        * Scripts/webkitdirs.pm:
+        (determineNativeArchitecture): Provide -i option to ssh
+
 2021-11-16  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/Scripts/run-javascriptcore-tests

@@ -525 +525 @@
     } elsif (defined $remoteConfig->{"remote"}) {
         my @split = split(':', $remoteConfig->{"remote"});
-        $remotes = [
-            {
-                "name" => "synthesized",
-                "address" => $remoteConfig->{"remote"}
-            }
-         ];
+        my $remote = {
+            "name" => "synthesized",
+            "address" => $remoteConfig->{"remote"}
+        };
+        if (exists $remoteConfig->{"idFilePath"}) {
+            $remote->{'idFilePath'} = $remoteConfig->{'idFilePath'};
+        }
+        $remotes = [$remote];
     }
 }

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

@@ -52 +52 @@
 }
 
-RemoteHost = Struct.new(:name, :user, :host, :port, :remoteDirectory)
+RemoteHost = Struct.new(:name, :user, :host, :port, :remoteDirectory, :identity_file_path)
 
 THIS_SCRIPT_PATH = Pathname.new(__FILE__).realpath
@@ -326 +326 @@
             $remoteHosts[0].remoteDirectory = config['remoteDirectory']
         end
+        if config['idFilePath']
+            $remoteHosts[0].identity_file_path = config['idFilePath']
+        end
     end
 
@@ -340 +343 @@
             if remote['remoteDirectory']
                 host.remoteDirectory = remote['remoteDirectory']
+            end
+            if remote['idFilePath']
+                host.identity_file_path = remote['idFilePath']
+                print('Using identity file: ' + host.identity_file_path + "\r")
             end
             host
@@ -2119 +2126 @@
 
     result = ""
-    IO.popen("ssh -o NoHostAuthenticationForLocalhost=yes -p #{remoteHost.port} #{remoteHost.user}@#{remoteHost.host} '#{cmd}'", "r") {
+    IO.popen("ssh -o NoHostAuthenticationForLocalhost=yes -p #{remoteHost.port}" + (remoteHost.identity_file_path ? " -i #{remoteHost.identity_file_path}" : "") + " #{remoteHost.user}@#{remoteHost.host} '#{cmd}'", "r") {
       | inp |
       inp.each_line {
@@ -2257 +2264 @@
 
 def copyBundleToRemote(remoteHost)
-    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}"])
+    mysys(["ssh", "-o", "NoHostAuthenticationForLocalhost=yes"] + (remoteHost.identity_file_path ? ["-i", remoteHost.identity_file_path] : []) + ["-p", remoteHost.port.to_s, "#{remoteHost.user}@#{remoteHost.host}", "mkdir -p #{remoteHost.remoteDirectory}"])
+    mysys(["scp", "-o", "NoHostAuthenticationForLocalhost=yes"] + (remoteHost.identity_file_path ? ["-i", remoteHost.identity_file_path] : []) + ["-P", remoteHost.port.to_s, ($outputDir.dirname + $tarFileName).to_s, "#{remoteHost.user}@#{remoteHost.host}:#{remoteHost.remoteDirectory}"])
 end
 
@@ -2292 +2299 @@
         $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])
+        runAndMonitorTestRunnerCommand(["ssh", "-o", "NoHostAuthenticationForLocalhost=yes"] + (remoteHost.identity_file_path ? ["-i", remoteHost.identity_file_path] : []) + ["-p", remoteHost.port.to_s, "#{remoteHost.user}@#{remoteHost.host}", remoteScript])
     else
         Dir.chdir($runnerDir) {
@@ -2667 +2674 @@
     forEachRemote(remoteHosts, :dropOnFailure => true) {
         | _, remoteHost |
-        mysys(["ssh", "-o", "NoHostAuthenticationForLocalhost=yes",
-               "-p", remoteHost.port.to_s,
+        mysys(["ssh", "-o", "NoHostAuthenticationForLocalhost=yes"] + 
+               (remoteHost.identity_file_path ? ["-i", remoteHost.identity_file_path] : []) + 
+               ["-p", remoteHost.port.to_s,
                "#{remoteHost.user}@#{remoteHost.host}",
                "cd #{Shellwords.shellescape(remoteHost.remoteDirectory)} && rm -rf #{$outputDir.basename} && tar xzf #{$tarFileName}"])

trunk/Tools/Scripts/webkitdirs.pm

@@ -374 +374 @@
             my $port = 22;
             $port = $split[1] if scalar(@split) > 1;
-            $output = `ssh -o NoHostAuthenticationForLocalhost=yes -p $port $target 'uname  -m'`;
+            my $cmd = 'ssh -o NoHostAuthenticationForLocalhost=yes '. (exists $remote->{'idFilePath'} ? ('-i '.$remote->{'idFilePath'}) : '') ." -p $port $target 'uname  -m'";
+            $output = readpipe($cmd);
             last if ($? == 0);
         }