* [PATCH][PR python/23714] Make command-repeat work after gdb.execute
@ 2018-11-21 14:50 Benno Fünfstück
2018-11-21 17:12 ` Pedro Alves
0 siblings, 1 reply; 2+ messages in thread
From: Benno Fünfstück @ 2018-11-21 14:50 UTC (permalink / raw)
To: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 858 bytes --]
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 gdb.execute("show commands").
---
gdb/python/python.c | 3 ++-
gdb/testsuite/gdb.python/python.exp | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
[-- Attachment #2: 0001-python-Make-command-repeat-work-after-gdb.execute.patch --]
[-- Type: text/x-patch, Size: 2333 bytes --]
From a173a1a58cf842540c01e8a303b3f44045fdfd4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 21 Nov 2018 15:28:00 +0100
Subject: [PATCH] python: 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 gdb.execute("show commands").
---
gdb/python/python.c | 3 ++-
gdb/testsuite/gdb.python/python.exp | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/gdb/python/python.c b/gdb/python/python.c
index a37ed10bcf..d6453e786c 100644
--- 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/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 0723507af3..cb76a0f8e6 100644
--- 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" "test that gdb.execute does not affect repeat history"
# Test post_event.
gdb_py_test_multiple "post event insertion" \
--
2.19.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH][PR python/23714] Make command-repeat work after gdb.execute
2018-11-21 14:50 [PATCH][PR python/23714] Make command-repeat work after gdb.execute Benno Fünfstück
@ 2018-11-21 17:12 ` Pedro Alves
0 siblings, 0 replies; 2+ messages in thread
From: Pedro Alves @ 2018-11-21 17:12 UTC (permalink / raw)
To: Benno Fünfstück, gdb-patches
Hi,
Thanks for the patch.
On 11/21/2018 02:48 PM, Benno Fünfstück wrote:
> gdb/testuite/ChangeLog:
>
> PR python/#23714
> * gdb.python/python.exp: Test gdb.execute("show commands").
Copy&paste ChangeLog entry detected. :-)
Fixed that and merged. Thanks much for the fix again, and bonus
points for adding a test.
> +gdb_test " " "23" "test that gdb.execute does not affect repeat history"
I dropped the "test that" bit since all tests test something.
Here's what I merged.
From 1c97054b87495b008c6028d697deff61c9fb0b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 21 Nov 2018 17:06:05 +0000
Subject: [PATCH] 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.
---
gdb/ChangeLog | 6 ++++++
gdb/testsuite/ChangeLog | 6 ++++++
gdb/python/python.c | 3 ++-
gdb/testsuite/gdb.python/python.exp | 1 +
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1630bd87a0..d562a4b5df 100644
--- 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/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 093603a89e..06a1a06719 100644
--- 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/python/python.c b/gdb/python/python.c
index a37ed10bcf..d6453e786c 100644
--- 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/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 0723507af3..60423d2fb7 100644
--- 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" \
--
2.14.4
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-21 17:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-21 14:50 [PATCH][PR python/23714] Make command-repeat work after gdb.execute Benno Fünfstück
2018-11-21 17:12 ` Pedro Alves
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).