[libcxx-commits] [libcxx] 7cb1aa9 - Revert "[libc++] Use proper shell escaping in the executors"

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-04-17T17:06:52-04:00
New Revision: 7cb1aa9d9368274300cf472bc5532aa5a099da51

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

LOG: Revert "[libc++] Use proper shell escaping in the executors"

This reverts f8452ddfcc, which broke some bots. I'll figure out what's
wrong and commit it again.

Added: 
    

Modified: 
    libcxx/utils/run.py
    libcxx/utils/ssh.py

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/run.py b/libcxx/utils/run.py
index e9f9859807b3..7cdf65264ec0 100644
--- a/libcxx/utils/run.py
+++ b/libcxx/utils/run.py
@@ -14,7 +14,6 @@
 
 import argparse
 import os
-import pipes
 import shutil
 import subprocess
 import sys
@@ -58,9 +57,8 @@ def main():
             else:
                 shutil.copy2(dep, args.execdir)
 
-        # Run the command line with the given environment in the execution directory.
-        commandLine = (pipes.quote(x) for x in remaining)
-        return subprocess.call(' '.join(commandLine), cwd=args.execdir, env=env, shell=True)
+        # Run the executable with the given environment in the execution directory.
+        return subprocess.call(' '.join(remaining), cwd=args.execdir, env=env, shell=True)
     finally:
         shutil.rmtree(args.execdir)
 

diff  --git a/libcxx/utils/ssh.py b/libcxx/utils/ssh.py
index f9bcabe3c321..c7d8c97a1407 100644
--- a/libcxx/utils/ssh.py
+++ b/libcxx/utils/ssh.py
@@ -15,7 +15,6 @@
 
 import argparse
 import os
-import pipes
 import posixpath
 import subprocess
 import sys
@@ -98,11 +97,10 @@ def main():
         # host by transforming the path of test-executables to their path in the
         # temporary directory, where we know they have been copied when we handled
         # test dependencies above.
-        commandLine = (pathOnRemote(x) if isTestExe(x) else x for x in commandLine)
         remoteCommands += [
             'cd {}'.format(tmp),
             'export {}'.format(' '.join(args.env)),
-            ' '.join(pipes.quote(x) for x in commandLine)
+            ' '.join(pathOnRemote(x) if isTestExe(x) else x for x in commandLine)
         ]
 
         # Finally, SSH to the remote host and execute all the commands.