mirror of
https://github.com/python/cpython.git
synced 2025-11-11 22:55:08 +00:00
(Merge 3.4) Closes #22188: test_gdb now runs gdb with -nx: "Do not execute
commands from any .gdbinit initialization files".
This commit is contained in:
commit
69c1a6651d
1 changed files with 5 additions and 3 deletions
|
|
@ -22,7 +22,7 @@ from test import support
|
||||||
from test.support import run_unittest, findfile, python_is_optimized
|
from test.support import run_unittest, findfile, python_is_optimized
|
||||||
|
|
||||||
try:
|
try:
|
||||||
gdb_version, _ = subprocess.Popen(["gdb", "--version"],
|
gdb_version, _ = subprocess.Popen(["gdb", "-nx", "--version"],
|
||||||
stdout=subprocess.PIPE).communicate()
|
stdout=subprocess.PIPE).communicate()
|
||||||
except OSError:
|
except OSError:
|
||||||
# This is what "no gdb" looks like. There may, however, be other
|
# This is what "no gdb" looks like. There may, however, be other
|
||||||
|
|
@ -54,7 +54,9 @@ def run_gdb(*args, **env_vars):
|
||||||
env.update(env_vars)
|
env.update(env_vars)
|
||||||
else:
|
else:
|
||||||
env = None
|
env = None
|
||||||
base_cmd = ('gdb', '--batch')
|
# -nx: Do not execute commands from any .gdbinit initialization files
|
||||||
|
# (issue #22188)
|
||||||
|
base_cmd = ('gdb', '--batch', '-nx')
|
||||||
if (gdb_major_version, gdb_minor_version) >= (7, 4):
|
if (gdb_major_version, gdb_minor_version) >= (7, 4):
|
||||||
base_cmd += ('-iex', 'add-auto-load-safe-path ' + checkout_hook_path)
|
base_cmd += ('-iex', 'add-auto-load-safe-path ' + checkout_hook_path)
|
||||||
out, err = subprocess.Popen(base_cmd + args,
|
out, err = subprocess.Popen(base_cmd + args,
|
||||||
|
|
@ -130,7 +132,7 @@ class DebuggerTests(unittest.TestCase):
|
||||||
# print commands
|
# print commands
|
||||||
|
|
||||||
# Use "commands" to generate the arguments with which to invoke "gdb":
|
# Use "commands" to generate the arguments with which to invoke "gdb":
|
||||||
args = ["gdb", "--batch"]
|
args = ["gdb", "--batch", "-nx"]
|
||||||
args += ['--eval-command=%s' % cmd for cmd in commands]
|
args += ['--eval-command=%s' % cmd for cmd in commands]
|
||||||
args += ["--args",
|
args += ["--args",
|
||||||
sys.executable]
|
sys.executable]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue