[PATCH 7/9] gdb/testsuite/dap: rename dap_read_event to dap_wait_for_event_and_check

Simon Marchi via Gdb-patches
2023-01-06T18:58:34Z

I think that name describes a bit better what the proc does, it is
similar to "wait_for" in tuiterm.exp.

Change-Id: Ie55aa011e6595dd1b5a874db13881ba572ace419
---
gdb/testsuite/gdb.dap/basic-dap.exp | 10 +++++-----
gdb/testsuite/lib/dap-support.exp | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/gdb.dap/basic-dap.exp b/gdb/testsuite/gdb.dap/basic-dap.exp
index 68d0440f692..795702a5a8f 100644
--- a/gdb/testsuite/gdb.dap/basic-dap.exp
+++ b/gdb/testsuite/gdb.dap/basic-dap.exp
@@ -88,9 +88,9 @@ set bplist [dict get $response body breakpoints]
set insn_pc [dict get [lindex $bplist 0] instructionReference]

dap_check_request_and_response "start inferior" configurationDone
-dap_read_event "inferior started" thread "body reason" started
+dap_wait_for_event_and_check "inferior started" thread "body reason" started

-dap_read_event "stopped at function breakpoint" stopped \
+dap_wait_for_event_and_check "stopped at function breakpoint" stopped \
"body reason" breakpoint \
"body hitBreakpointIds" $fn_bpno

@@ -100,7 +100,7 @@ dap_match_values "global value in function" [lindex $obj 0] \
"body result" 23

dap_check_request_and_response step stepIn {o threadId [i 1]}
-dap_read_event "stopped after step" stopped "body reason" step
+dap_wait_for_event_and_check "stopped after step" stopped "body reason" step

set obj [dap_check_request_and_response "evaluate global second time" \
evaluate {o expression [s global_variable]}]
@@ -108,12 +108,12 @@ dap_match_values "global value after step" [lindex $obj 0] \
"body result" 24

dap_check_request_and_response "continue to address" continue
-dap_read_event "stopped at address breakpoint" stopped \
+dap_wait_for_event_and_check "stopped at address breakpoint" stopped \
"body reason" breakpoint \
"body hitBreakpointIds" $insn_bpno

dap_check_request_and_response "continue to line" continue
-dap_read_event "stopped at line breakpoint" stopped \
+dap_wait_for_event_and_check "stopped at line breakpoint" stopped \
"body reason" breakpoint \
"body hitBreakpointIds" $line_bpno

diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp
index ee55a4acc9c..179f675b4d8 100644
--- a/gdb/testsuite/lib/dap-support.exp
+++ b/gdb/testsuite/lib/dap-support.exp
@@ -284,7 +284,7 @@ proc dap_match_values {name d args} {

# A helper for dap_read_event that reads events, looking for one
# matching TYPE.
-proc _dap_read_event {type} {
+proc _dap_wait_for_event {type} {
while 1 {
# We don't do any extra error checking here for the time
# being; we'll just get a timeout thrown instead.
@@ -303,12 +303,12 @@ proc _dap_read_event {type} {
# between a field name (in "dict get" form) and its expected value.
#
# Returns the dict for the chosen event, or empty string on error.
-proc dap_read_event {name type args} {
+proc dap_wait_for_event_and_check {name type args} {
if {$name == ""} {
set name $type
}

- set result [_dap_read_event $type]
+ set result [_dap_wait_for_event $type]
eval dap_match_values [list $name $result] $args

return $result
--
2.38.1