diff options
author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-01-22 12:43:27 -0500 |
---|---|---|
committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-01-22 12:43:27 -0500 |
commit | 2189c312652ae4f66eaf55b306cb64d4c1678636 (patch) | |
tree | ca983ba85c1fff86eac62e83883f3b55c4f49cab /gdb/testsuite/lib/range-stepping-support.exp | |
parent | 02349803fc5a7941b4e23d1580bd8b600d6be1bd (diff) | |
download | gdb-2189c312652ae4f66eaf55b306cb64d4c1678636.zip gdb-2189c312652ae4f66eaf55b306cb64d4c1678636.tar.gz gdb-2189c312652ae4f66eaf55b306cb64d4c1678636.tar.bz2 |
gdb: add remote_debug_printf
This is the next in the new-style debug macro series.
For this one, I decided to omit the function name from the "Sending packet" /
"Packet received" kind of prints, just because it's not very useful in that
context and hinders readability more than anything else. This is completely
arbitrary.
This is with:
[remote] putpkt_binary: Sending packet: $qTStatus#49...
[remote] getpkt_or_notif_sane_1: Packet received: T0;tnotrun:0;tframes:0;tcreated:0;tfree:500000;tsize:500000;circular:0;disconn:0;starttime:0;stoptime:0;username:;notes::
and without:
[remote] Sending packet: $qTStatus#49...
[remote] Packet received: T0;tnotrun:0;tframes:0;tcreated:0;tfree:500000;tsize:500000;circular:0;disconn:0;starttime:0;stoptime:0;username:;notes::
A difference is that previously, the query packet and its reply would be
printed on the same line, like this:
Sending packet: $qTStatus#49...Packet received: T0;tnotrun:0;tframes:0;tcreated:0;tfree:500000;tsize:500000;circular:0;disconn:0;starttime:0;stoptime:0;username:;notes::
Now, they are printed on two lines, since each remote_debug_printf{,_nofunc}
prints its own complete message including an end of line. It's probably
a matter of taste, but I prefer the two-line version, it's easier to
follow, especially when the query packet is long.
As a result, lib/range-stepping-support.exp needs to be updated, as it
currently expects the vCont packet and the reply to be on the same line.
I think it's sufficient in that context to just expect the vCont packet
and not the reply, since the goal is just to count how many vCont;r GDB
sends.
gdb/ChangeLog:
* remote.h (remote_debug_printf): New.
(remote_debug_printf_nofunc): New.
(REMOTE_SCOPED_DEBUG_ENTER_EXIT): New.
* remote.c: Use above macros throughout file.
gdbsupport/ChangeLog:
* common-debug.h (debug_prefixed_printf_cond_nofunc): New.
* common-debug.c (debug_prefixed_vprintf): Handle a nullptr
func.
gdb/testsuite/ChangeLog:
* lib/range-stepping-support.exp (exec_cmd_expect_vCont_count):
Adjust to "set debug remote" changes.
Change-Id: Ica6dead50d3f82e855c7d763f707cef74bed9fee
Diffstat (limited to 'gdb/testsuite/lib/range-stepping-support.exp')
-rw-r--r-- | gdb/testsuite/lib/range-stepping-support.exp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gdb/testsuite/lib/range-stepping-support.exp b/gdb/testsuite/lib/range-stepping-support.exp index 5961ab7..c970836 100644 --- a/gdb/testsuite/lib/range-stepping-support.exp +++ b/gdb/testsuite/lib/range-stepping-support.exp @@ -25,15 +25,13 @@ proc exec_cmd_expect_vCont_count { cmd exp_vCont_r } { set r_counter 0 set s_counter 0 set ret 1 - # We either get a stop reply in all-stop mode, or an OK in - # non-stop mode. - set vcont_reply "(T\[\[:xdigit:\]\]\[\[:xdigit:\]\]|OK)" + set any {[^\r\n]*} gdb_test_multiple $cmd $test { - -re "vCont;s\[^\r\n\]*Packet received: $vcont_reply" { + -re "vCont;s${any}\r\n" { incr s_counter exp_continue } - -re "vCont;r\[^\r\n\]*Packet received: $vcont_reply" { + -re "vCont;r${any}\r\n" { incr r_counter exp_continue } |