[lldb/test] Replace shlex.join with shlex.quote

[labath]

Summary

join is only available since python-3.8, but the all the interesting
magic happens in shlex.quote, which has been around since 3.3.

Use shlex.quote, and instead provide a home-grown helper function to
handle the joining.

[teemperor]

Thanks!

lldb/packages/Python/lldbsuite/support/seven.py

54

TODO: Replace this with `shlex.join` when minimum Python version is >= 3.8

lldb/packages/Python/lldbsuite/support/seven.py

 import binascii
 import six
+import shlex
 
 if six.PY2:
     import commands
     get_command_output = commands.getoutput
     get_command_status_output = commands.getstatusoutput
 
     cmp_ = cmp
 else:

 
 def unhexlify(hexstr):
     """Hex-decode a string. The result is always a string."""
     return bitcast_to_string(binascii.unhexlify(hexstr))
 
 def hexlify(data):
     """Hex-encode string data. The result if always a string."""
     return bitcast_to_string(binascii.hexlify(bitcast_to_bytes(data)))
+
+# TODO: Replace this with `shlex.join` when minimum Python version is >= 3.8
+def join_for_shell(split_command):
+    return " ".join([shlex.quote(part) for part in split_command])

lldb/packages/Python/lldbsuite/test/lldbtest.py

 from functools import wraps
 import gc
 import glob
 import io
 import os.path
 import re
 import shutil
 import signal
-import shlex
 from subprocess import *
 import sys
 import time
 import traceback
 import distutils.spawn
 
 # Third-party modules
 import unittest2
 from six import add_metaclass
 from six import StringIO as SixStringIO
 import six
 
 # LLDB modules
 import lldb
 from . import configuration
 from . import decorators
 from . import lldbplatformutil
 from . import lldbtest_config
 from . import lldbutil
 from . import test_categories
 from lldbsuite.support import encoded_file
 from lldbsuite.support import funcutils
+from lldbsuite.support import seven
 from lldbsuite.test.builders import get_builder
 from lldbsuite.test_event import build_exception
 
 # See also dotest.parseOptionsAndInitTestdirs(), where the environment variables
 # LLDB_COMMAND_TRACE is set from '-t' option.
 
 # By default, traceAlways is False.
 if "LLDB_COMMAND_TRACE" in os.environ and os.environ[
def build(
         command = builder_module().getBuildCommand(debug_info, architecture,
                 compiler, dictionary, testdir, testname)
         if command is None:
             raise Exception("Don't know how to build binary")
 
         self.runBuildCommand(command)
 
     def runBuildCommand(self, command):
-        self.trace(shlex.join(command))
+        self.trace(seven.join_for_shell(command))
         try:
             output = check_output(command, stderr=STDOUT, errors="replace")
         except CalledProcessError as cpe:
             raise build_exception.BuildError(cpe)
         self.trace(output)
 
 
     # ==================================================

lldb/packages/Python/lldbsuite/test_event/build_exception.py

-import shlex
+from lldbsuite.support import seven
 
 class BuildError(Exception):
 
     def __init__(self, called_process_error):
         super(BuildError, self).__init__("Error when building test subject")
-        self.command = shlex.join(called_process_error.cmd)
+        self.command = seven.join_for_shell(called_process_error.cmd)
         self.build_error = called_process_error.output
 
     def __str__(self):
         return self.format_build_error(self.command, self.build_error)
 
     @staticmethod
     def format_build_error(command, command_output):
         return "Error when building test subject.\n\nBuild Command:\n{}\n\nBuild Command Output:\n{}".format(
             command, command_output)