summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_gdb.py11
-rw-r--r--Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst1
2 files changed, 10 insertions, 2 deletions
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index 9e0eaea..d341a17 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -162,7 +162,11 @@ class DebuggerTests(unittest.TestCase):
commands += ['set print entry-values no']
if cmds_after_breakpoint:
- commands += cmds_after_breakpoint
+ # bpo-32962: When Python is compiled with -mcet -fcf-protection,
+ # arguments are unusable before running the first instruction
+ # of the function entry point. The 'next' command makes the
+ # required first step.
+ commands += ['next'] + cmds_after_breakpoint
else:
commands += ['backtrace']
@@ -847,9 +851,12 @@ id(42)
id("first break point")
l = MyList()
''')
+ # bpo-32962: same case as in get_stack_trace():
+ # we need an additional 'next' command in order to read
+ # arguments of the innermost function of the call stack.
# Verify with "py-bt":
gdb_output = self.get_stack_trace(cmd,
- cmds_after_breakpoint=['break wrapper_call', 'continue', 'py-bt'])
+ cmds_after_breakpoint=['break wrapper_call', 'continue', 'next', 'py-bt'])
self.assertRegex(gdb_output,
r"<method-wrapper u?'__init__' of MyList object at ")
diff --git a/Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst b/Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst
new file mode 100644
index 0000000..97328eb
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst
@@ -0,0 +1 @@
+Fixed test_gdb when Python is compiled with flags -mcet -fcf-protection -O0.