FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make command-repeat work after gdb.execute

Browse source 
Since commit

  56bcdbea2b ("Let gdb.execute handle multi-line commands")

command repetition after using the `gdb.execute` Python function
fails (the previous command is not repeated anymore). This happens
because read_command_lines_1 sets dont_repeat, but the call to
prevent_dont_repeat in execute_gdb_command is later.

The fix is to move the call to prevent_dont_repeat to the beginning of
the function.

Tested on my laptop (ArchLinux-x86_64).

gdb/ChangeLog:

	PR python/23714
	* gdb/python/python.c (execute_gdb_command): Call
	prevent_dont_repeat earlier to avoid affecting dont_repeat.

gdb/testuite/ChangeLog:

	PR python/23714
	* gdb.python/python.exp: Test command repetition after
	gdb.execute.
This commit is contained in:
Benno Fünfstück 2018-11-21 17:06:05 +00:00 • committed by Pedro Alves
parent ca94519e70
commit 1c97054b87
4 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2018-11-21 Benno Fünfstück <benno.fuenfstueck@gmail.com>
PR python/23714
* gdb/python/python.c (execute_gdb_command): Call
prevent_dont_repeat earlier to avoid affecting dont_repeat.
2018-11-21 Andrew Burgess <andrew.burgess@embecosm.com> 2018-11-21 Andrew Burgess <andrew.burgess@embecosm.com>
* Makefile.in (ALL_TARGET_OBS): Add arch/riscv.o. * Makefile.in (ALL_TARGET_OBS): Add arch/riscv.o.

3
gdb/python/python.c
View file

@ -583,6 +583,8 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
std::string to_string_res; std::string to_string_res;
scoped_restore preventer = prevent_dont_repeat ();
TRY TRY
{ {
struct interp *interp; struct interp *interp;
@ -612,7 +614,6 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
interp = interp_lookup (current_ui, "console"); interp = interp_lookup (current_ui, "console");
current_uiout = interp->interp_ui_out (); current_uiout = interp->interp_ui_out ();
scoped_restore preventer = prevent_dont_repeat ();
if (to_string) if (to_string)
to_string_res = execute_control_commands_to_string (lines.get (), to_string_res = execute_control_commands_to_string (lines.get (),
from_tty); from_tty);

6
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2018-11-21 Benno Fünfstück <benno.fuenfstueck@gmail.com>
PR python/23714
* gdb.python/python.exp: Test command repetition after
gdb.execute.
2018-11-20 Andrew Burgess <andrew.burgess@embecosm.com> 2018-11-20 Andrew Burgess <andrew.burgess@embecosm.com>
* gdb.opt/inline-break.exp: Add test that info breakpoint output * gdb.opt/inline-break.exp: Add test that info breakpoint output

1
gdb/testsuite/gdb.python/python.exp
View file

@ -121,6 +121,7 @@ gdb_test "python print (x)" "23"
gdb_test "python gdb.execute('echo 2\\necho 3\\\\n\\n')" "23" \ gdb_test "python gdb.execute('echo 2\\necho 3\\\\n\\n')" "23" \
"multi-line execute" "multi-line execute"
gdb_test " " "23" "gdb.execute does not affect repeat history"
# Test post_event. # Test post_event.
gdb_py_test_multiple "post event insertion" \ gdb_py_test_multiple "post event insertion" \