Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Lib/test/test_dtrace.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import dis
import os.path
import re
import shlex
import signal
import subprocess
import sys
Expand DownExpand Up@@ -92,7 +93,7 @@ def run_readelf(cmd):

if proc.returncode:
raise AssertionError(
f"Command {' '.join(cmd)!r} failed "
f"Command {shlex.join(cmd)!r} failed "
Comment thread
stratakis marked this conversation as resolved.
f"with exit code {proc.returncode}: "
f"stdout={stdout!r} stderr={stderr!r}"
)
Expand DownExpand Up@@ -139,7 +140,7 @@ def trace(self, script_file, subcommand=None, *, timeout=None,
raise
if check_returncode and proc.returncode:
raise AssertionError(
f"Command {' '.join(command)!r} failed "
f"Command {shlex.join(command)!r} failed "
f"with exit code {proc.returncode}: output={stdout!r}"
)
return stdout
Expand All@@ -148,7 +149,7 @@ def trace_python(self, script_file, python_file, optimize_python=None):
python_flags = []
if optimize_python:
python_flags.extend(["-O"] * optimize_python)
subcommand = " ".join([sys.executable] + python_flags + [python_file])
subcommand = shlex.join([sys.executable] + python_flags + [python_file])
return self.trace(script_file, subcommand, timeout=60,
check_returncode=True)

Expand DownExpand Up@@ -276,7 +277,7 @@ def run_case(self, name, optimize_python=None):

try:
proc = create_process_group(
["bpftrace", "-e", program, "-c", " ".join(subcommand)],
["bpftrace", "-e", program, "-c", shlex.join(subcommand)],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
universal_newlines=True,
Expand DownExpand Up@@ -314,7 +315,8 @@ def assert_usable(self):
program = f'usdt:{sys.executable}:python:function__entry {{ printf("probe: success\\n"); exit(); }}'
try:
proc = create_process_group(
["bpftrace", "-e", program, "-c", f"{sys.executable} -c pass"],
["bpftrace", "-e", program, "-c",
shlex.join([sys.executable, "-c", "pass"])],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
universal_newlines=True,
Expand Down
Loading