[libcxx] r299607 - Fix remote test execution in lit

[Mehdi Amini via cfe-commits]

Author: mehdi_amini
Date: Wed Apr  5 20:14:57 2017
New Revision: 299607

URL: http://llvm.org/viewvc/llvm-project?rev=299607&view=rev
Log:
Fix remote test execution in lit

Can be used as such:

  $ python /path/to/lit.py -sv /path/to/llvm/build/projects/libcxx/test/ \
    --param=use_system_cxx_lib=true \
    --param=executor='SSHExecutor("remote.domain", "username")'

Modified:
    libcxx/trunk/utils/libcxx/test/executor.py

Modified: libcxx/trunk/utils/libcxx/test/executor.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/libcxx/test/executor.py?rev=299607&r1=299606&r2=299607&view=diff
==============================================================================
--- libcxx/trunk/utils/libcxx/test/executor.py (original)
+++ libcxx/trunk/utils/libcxx/test/executor.py Wed Apr  5 20:14:57 2017
@@ -196,7 +196,7 @@ class SSHExecutor(RemoteExecutor):
         # Not sure how to do suffix on osx yet
         dir_arg = '-d' if is_dir else ''
         cmd = 'mktemp -q {} /tmp/libcxx.XXXXXXXXXX'.format(dir_arg)
-        temp_path, err, exitCode = self._execute_command_remote([cmd])
+        _, temp_path, err, exitCode = self._execute_command_remote([cmd])
         temp_path = temp_path.strip()
         if exitCode != 0:
             raise RuntimeError(err)
@@ -219,4 +219,5 @@ class SSHExecutor(RemoteExecutor):
         remote_cmd = ' '.join(env_cmd + cmd)
         if remote_work_dir != '.':
             remote_cmd = 'cd ' + remote_work_dir + ' && ' + remote_cmd
-        return self.local_run(ssh_cmd + [remote_cmd])
+        out, err, rc = self.local_run(ssh_cmd + [remote_cmd])
+        return (remote_cmd, out, err, rc)