Skip to content

Commit

Permalink
bpo-40436: Fix code parsing gdb version (pythonGH-19792)
Browse files Browse the repository at this point in the history
test_gdb and test.pythoninfo now check gdb command exit code.
(cherry picked from commit ec9bea4)

Co-authored-by: Victor Stinner <[email protected]>
  • Loading branch information
miss-islington and vstinner authored Apr 29, 2020
1 parent cc011b5 commit d9e9049
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Lib/test/pythoninfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,9 @@ def collect_gdb(info_add):
stderr=subprocess.PIPE,
universal_newlines=True)
version = proc.communicate()[0]
if proc.returncode:
# ignore gdb failure: test_gdb will log the error
return
except OSError:
return

Expand Down
10 changes: 8 additions & 2 deletions Lib/test/test_gdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,18 @@

def get_gdb_version():
try:
proc = subprocess.Popen(["gdb", "-nx", "--version"],
cmd = ["gdb", "-nx", "--version"]
proc = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
universal_newlines=True)
with proc:
version = proc.communicate()[0]
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:
# This is what "no gdb" looks like. There may, however, be other
# errors that manifest this way too.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test_gdb and test.pythoninfo now check gdb command exit code.

0 comments on commit d9e9049

Please sign in to comment.