GeezerVison

Copy link

Copy Markdown

Contributor

stratakis force-pushed the shlex_dtrace branch from d97d139 to eea0a12 Compare July 2, 2026 15:28

vstinner reviewed Jul 3, 2026

View reviewed changes

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

diff --git a/Lib/test/test_dtrace.py b/Lib/test/test_dtrace.py
index 30731b8f90a..b890f467807 100644
--- a/Lib/test/test_dtrace.py
+++ b/Lib/test/test_dtrace.py
@@ -22,7 +22,7 @@
 
 
 def abspath(filename):
-    return os.path.abspath(findfile(filename, subdir="dtracedata"))
+    return os.path.abspath(findfile(filename, subdir="dtrace data"))
 
 
 def normalize_trace_output(output):

$ sudo bpftrace -e 'usdt:/home/vstinner/python/main/python:python:function__entry {}' -c "/home/vstinner/python/main/python -O -O '/home/vstinner/python/main/Lib/test/dtrace data/gc.py'"
Attached 1 probe
/home/vstinner/python/main/python: can't open file "/home/vstinner/python/main/'/home/vstinner/python/main/Lib/test/dtrace": [Errno 2] No such file or directory

$ git diff
diff --git a/Lib/test/test_dtrace.py b/Lib/test/test_dtrace.py
index 30731b8f90a..011507bd5c3 100644
--- a/Lib/test/test_dtrace.py
+++ b/Lib/test/test_dtrace.py
@@ -314,9 +314,15 @@ def assert_usable(self):
         # Check if bpftrace is available and can attach to USDT probes
         program = f'usdt:{sys.executable}:python:function__entry {{ printf("probe: success\\n"); exit(); }}'
         try:
+            exe = sys.executable + ' .exe'
+            import shutil
+            shutil.copy2(sys.executable, exe)
+            cmd = shlex.join([exe, "-c", "pass"])
+            print("CMD", cmd)
+            cmd = ["bpftrace", "-e", program, "-c", cmd]
+            print("CMD", cmd)
             proc = create_process_group(
-                ["bpftrace", "-e", program, "-c",
-                 shlex.join([sys.executable, "-c", "pass"])],
+                cmd,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 universal_newlines=True,

$ sudo bpftrace -e 'usdt:/home/vstinner/python/main/python:python:function__entry { printf("probe: success\\n"); exit(); }' '-c' "'/home/vstinner/python/main/python .exe' -c pass"
ERROR: Failed to fork child: path ''/home/vstinner/python/main/python' does not exist or is not executable

vstinner approved these changes Jul 9, 2026

View reviewed changes

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

52 checks passed

…53459)

gh-98894: Quote test_dtrace tracer subcommands (GH-152901)

Use shlex.join() when building tracer -c command strings
for avoiding issues with spaces.
(cherry picked from commit a159c68)

Co-authored-by: stratakis <[email protected]>

stratakis deleted the shlex_dtrace branch July 9, 2026 22:03

* gh-98894: Fix DTrace test_check_probes for shared builds (#151122)

When building with --enable-shared, the SystemTap/DTrace notes
live in libpython. Add detection logic to be used by readelf.

Force the C locale on readelf output.

(cherry picked from commit 3a08e93)

* gh-151496: Use process groups in test_dtrace (#151512)

Create a new process group to run bpftrace commands, so it's possible
to kill also child processes on timeout.

(cherry picked from commit a064b32)

* gh-151496: Use process groups in TraceBackend in test_dtrace (#152039)

Run the generic DTrace/SystemTap commands in a new process group and
terminate the whole group on timeout.

This prevents a forked tracer child from keeping stdout/stderr pipes
open after the direct tracer process is killed.

(cherry picked from commit 1785f4b)

* gh-98894: Check readelf failures in test_dtrace (#152345)

Report readelf command failures directly instead of later failing with
missing-probe assertions.

(cherry picked from commit d60a677)

* gh-98894: Check tracer exit status in test_dtrace (#152893)

Fail functional dtrace and SystemTap cases directly when the tracer exits
non-zero.

(cherry picked from commit 311e7e7)

* gh-98894: Quote test_dtrace tracer subcommands (#152901)

Use shlex.join() when building tracer -c command strings
for avoiding issues with spaces.

(cherry picked from commit a159c68)

* gh-98894: Fix dtrace tests in shared builds (#153372)

Generate SystemTap probe definitions targeting libpython for shared
builds and use centralized USDT probe object discovery for readelf
and BPFTrace.

(cherry picked from commit 298bef3)

* gh-156703: Set LD_LIBRARY_PATH in SystemTap trace commands (GH-156424)

Prefix commands passed to stap -c with LD_LIBRARY_PATH via env, when
probes reside in libpython. This allows the interpreter to find
libpython when staprun does not preserve the loader path.

(cherry picked from commit faf4e52)

* gh-156722, test_dtrace: Terminate tracing processes gracefully on timeout (#156753)

Send SIGTERM to the tracing process group before falling back to SIGKILL.

(cherry picked from commit 55ecc0a)

* gh-156701: Increase the SystemTap usability timeout (#156720)

SystemTap may compile a kernel module during its usability check
(if no cached module is available). We need to allow a larger timeout
for that case.

(cherry picked from commit e1be613)

---------

Co-authored-by: stratakis <[email protected]>
Co-authored-by: stratakis <[email protected]>