[libcxx-commits] [libcxx] eb5f9a5 - [libcxx] [test] Unbreak passing multiple env variables in ssh.py

[Martin Storsjö via libcxx-commits]

Author: Martin Storsjö
Date: 2023-04-27T19:25:59+03:00
New Revision: eb5f9a5a521ba1786a2648b2d9b36b506ebd26e4

URL: https://github.com/llvm/llvm-project/commit/eb5f9a5a521ba1786a2648b2d9b36b506ebd26e4
DIFF: https://github.com/llvm/llvm-project/commit/eb5f9a5a521ba1786a2648b2d9b36b506ebd26e4.diff

LOG: [libcxx] [test] Unbreak passing multiple env variables in ssh.py

No test actually does this, but this makes the option behave like
the corresponding one in run.py.

This was broken by commit b8b23aa80eefe84187d6ba364d06496c90c53bdb
(https://reviews.llvm.org/D99242) which introduced quoting; instead
of quoting the whole space separated list, quote each individual
argument.

Differential Revision: https://reviews.llvm.org/D149319

Added: 
    

Modified: 
    libcxx/utils/ssh.py

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ssh.py b/libcxx/utils/ssh.py
index 6c1d706984dd..281ff10b52bc 100755
--- a/libcxx/utils/ssh.py
+++ b/libcxx/utils/ssh.py
@@ -109,7 +109,8 @@ def main():
         commandLine = (pathOnRemote(x) if isTestExe(x) else x for x in commandLine)
         remoteCommands.append('cd {}'.format(tmp))
         if args.env:
-            remoteCommands.append('export {}'.format(cmd_quote(' '.join(args.env))))
+            env = list(map(cmd_quote, args.env))
+            remoteCommands.append('export {}'.format(' '.join(args.env)))
         remoteCommands.append(subprocess.list2cmdline(commandLine))
 
         # Finally, SSH to the remote host and execute all the commands.