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

gh-98894: Check readelf failures in test_dtrace by stratakis · Pull Request #152345 · python/cpython · GitHub

/ cpython Public
Merged
Changes from all commits
Commits
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
62 changes: 29 additions & 33 deletions Lib/test/test_dtrace.py
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
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,33 @@ def kill_process_group(proc):
proc.communicate() # Clean up


def run_readelf(cmd):
# Force the C locale to disable localization.
env = dict(os.environ, LC_ALL="C")
try:
proc = subprocess.Popen(
cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
env=env,
)
except OSError:
raise unittest.SkipTest("Couldn't find readelf on the path")

with proc:
stdout, stderr = proc.communicate()

if proc.returncode:
raise AssertionError(
f"Command {' '.join(cmd)!r} failed "
f"with exit code {proc.returncode}: "
f"stdout={stdout!r} stderr={stderr!r}"
)

return stdout


class TraceBackend:
EXTENSION = None
COMMAND = None
Expand Down Expand Up @@ -408,28 +435,7 @@ def setUpClass(cls):

@staticmethod
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()

if proc.returncode:
raise Exception(
f"Command {' '.join(cmd)!r} failed "
f"with exit code {proc.returncode}: "
f"stdout={version!r} stderr={stderr!r}"
)
except OSError:
raise unittest.SkipTest("Couldn't find readelf on the path")
version = run_readelf(["readelf", "--version"])

# Regex to parse:
# 'GNU readelf (GNU Binutils) 2.40.0\n' -> 2.40
Expand Down Expand Up @@ -461,17 +467,7 @@ def get_readelf_output(self):
binary = libpython_path
break

command = ["readelf", "-n", binary]
# 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
return run_readelf(["readelf", "-n", binary])

def test_check_probes(self):
readelf_output = self.get_readelf_output()
Expand Down
Loading

Back | FazBrowse Home | New Git URL