FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-98894: Fix DTrace test_check_probes for shared builds by stratakis · Pull Request #151122 · python/cpython · GitHub

/ cpython Public

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 2 commits into from
Jun 10, 2026
Conversation 11 Commits 2 Checks 52 Files changed
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82d5208
gh-98894: Fix DTrace test_check_probes for shared builds
stratakis Jun 9, 2026
cb21249
Force the C locale on readelf output
stratakis Jun 9, 2026
File filter

Filter by extension

Filter by extension .py  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
29 changes: 28 additions & 1 deletion Lib/test/test_dtrace.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,14 @@ def setUpClass(cls):
def get_readelf_version():
try:
cmd = ["readelf", "--version"]
# Force the C locale to disable localization.
env = dict(os.environ, LC_ALL="C")
proc = subprocess.Popen(
cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
universal_newlines=True,
env=env,
)
with proc:
version, stderr = proc.communicate()
Expand All @@ -405,12 +408,36 @@ def get_readelf_version():
return int(match.group(1)), int(match.group(2))

def get_readelf_output(self):
command = ["readelf", "-n", sys.executable]
binary = sys.executable
if sysconfig.get_config_var("Py_ENABLE_SHARED"):
lib_dir = sysconfig.get_config_var("LIBDIR")
if not lib_dir or sysconfig.is_python_build():
lib_dir = os.path.abspath(os.path.dirname(sys.executable))

lib_names = []
for name in (
sysconfig.get_config_var("INSTSONAME"),
sysconfig.get_config_var("LDLIBRARY"),
):
if name and name not in lib_names:
lib_names.append(name)

if lib_dir:
for name in lib_names:
libpython_path = os.path.join(lib_dir, name)
if os.path.exists(libpython_path):
binary = libpython_path
break

command = ["readelf", "-n", binary]
Comment thread
stratakis marked this conversation as resolved.
# Force the C locale to disable localization.
env = dict(os.environ, LC_ALL="C")
stdout, _ = subprocess.Popen(
command,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
universal_newlines=True,
env=env,
).communicate()
return stdout

Expand Down
Loading
Back | FazBrowse Home | New Git URL