From eb5f9a5a521ba1786a2648b2d9b36b506ebd26e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Thu, 27 Apr 2023 10:11:05 +0300 Subject: [PATCH] [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 --- libcxx/utils/ssh.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libcxx/utils/ssh.py b/libcxx/utils/ssh.py index 6c1d706..281ff10 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. -- 2.7.4