From: Martin Storsjö Date: Thu, 27 Apr 2023 07:11:05 +0000 (+0300) Subject: [libcxx] [test] Unbreak passing multiple env variables in ssh.py X-Git-Tag: upstream/17.0.6~10166 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb5f9a5a521ba1786a2648b2d9b36b506ebd26e4;p=platform%2Fupstream%2Fllvm.git [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 --- 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.