[lldb][test] Replace seven.join_for_shell with shlex.join (#163191)

shlex.join is available in Python 3.8, which is the LLVM Project's
minimum version.

https://docs.python.org/3/library/shlex.html#shlex.join
This commit is contained in:
David Spickett 2025-10-13 14:55:39 +01:00 committed by GitHub
parent 14a1d3e0ae
commit 0dd51f92fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 10 deletions

View File

@ -1,5 +1,4 @@
import binascii
import shlex
import subprocess
@ -38,8 +37,3 @@ def 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])

View File

@ -36,6 +36,7 @@ import json
import os.path
import re
import shutil
import shlex
import signal
from subprocess import *
import sys
@ -56,7 +57,6 @@ 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_event import build_exception
# See also dotest.parseOptionsAndInitTestdirs(), where the environment variables
@ -1508,7 +1508,7 @@ class Base(unittest.TestCase):
self.runBuildCommand(command)
def runBuildCommand(self, command):
self.trace(seven.join_for_shell(command))
self.trace(shlex.join(command))
try:
output = check_output(command, stderr=STDOUT, errors="replace")
except CalledProcessError as cpe:

View File

@ -1,10 +1,10 @@
from lldbsuite.support import seven
import shlex
class BuildError(Exception):
def __init__(self, called_process_error):
super(BuildError, self).__init__("Error when building test subject")
self.command = seven.join_for_shell(called_process_error.cmd)
self.command = shlex.join(called_process_error.cmd)
self.build_error = called_process_error.output
def __str__(self):

View File

@ -2,6 +2,7 @@ import random
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.support import seven
from fork_testbase import GdbRemoteForkTestBase