Make command-repeat work after gdb.execute

Since commit

  56bcdbea2bed ("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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1630bd87a0d3b64c8d1c0809ef81db757e962739..d562a4b5df4fd7aca32b9b44a0dce87040cc7949 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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>
 
        * Makefile.in (ALL_TARGET_OBS): Add arch/riscv.o.

diff --git a/gdb/python/python.c b/gdb/python/python.c
index a37ed10bcfbb81624ceb808c48322ef77b53a8a0..d6453e786c98a231cd07a7d912cda201544ff3bc 100644 (file)
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -583,6 +583,8 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
 
   std::string to_string_res;
 
+  scoped_restore preventer = prevent_dont_repeat ();
+
   TRY
     {
       struct interp *interp;
@@ -612,7 +614,6 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
        interp = interp_lookup (current_ui, "console");
        current_uiout = interp->interp_ui_out ();
 
-       scoped_restore preventer = prevent_dont_repeat ();
        if (to_string)
          to_string_res = execute_control_commands_to_string (lines.get (),
                                                              from_tty);

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 093603a89ec2a6f431b1f613951e1791267ddef2..06a1a067199075eb712af4c73d25445d5d46641d 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -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>
 
        * gdb.opt/inline-break.exp: Add test that info breakpoint output

diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 0723507af3e5990550ea0a097690ce86919c254b..60423d2fb777636a5253b52f4e192713f39b04c9 100644 (file)
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -121,6 +121,7 @@ gdb_test "python print (x)" "23"
 
 gdb_test "python gdb.execute('echo 2\\necho 3\\\\n\\n')" "23" \
     "multi-line execute"
+gdb_test " " "23" "gdb.execute does not affect repeat history"
 
 # Test post_event.
 gdb_py_test_multiple "post event insertion" \