public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] gdb: use gdb_test_multiple in gdb_breakpoint
@ 2023-01-04 16:22 Simon Marchi
0 siblings, 0 replies; only message in thread
From: Simon Marchi @ 2023-01-04 16:22 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4b9728bec157796478831972fc8d07306dd9dcde
commit 4b9728bec157796478831972fc8d07306dd9dcde
Author: Simon Marchi <simon.marchi@polymtl.ca>
Date: Tue Jan 3 14:22:16 2023 -0500
gdb: use gdb_test_multiple in gdb_breakpoint
When running the testsuite in a non-optimized build on a slow machine, I
sometimes get:
UNTESTED: gdb.gdb/selftest.exp: Cannot set breakpoint at captured_main, skipping testcase.
do_self_tests, in lib/selftest-support.exp, uses `with_timeout_factor
10`, to account for the fact that reading the debug info of the gdb
binary (especially in a non-optimized GDB) can take time. But then it
ends up calling gdb_breakpoint, which uses gdb_expect with a hard-coded
timeout of 30 seconds.
Fix this by making gdb_breakpoint use gdb_test_multiple, which is a
desired change anyway for this kind of simple command / expected
output case.
Change-Id: I9b06ce991cc584810d8cc231b2b4893980b8be75
Reviewed-By: Lancelot Six <lancelot.six@amd.com>
Diff:
---
gdb/testsuite/lib/gdb.exp | 36 ++----------------------------------
1 file changed, 2 insertions(+), 34 deletions(-)
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 135ace68d5e..ba16b2ab315 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -639,18 +639,15 @@ proc gdb_breakpoint { linespec args } {
set print_pass 1
}
- set test_name "gdb_breakpoint: set breakpoint at $linespec"
-
- send_gdb "$break_command $linespec\n"
# The first two regexps are what we get with -g, the third is without -g.
- gdb_expect 30 {
+ gdb_test_multiple "$break_command $linespec" "gdb_breakpoint: set breakpoint at $linespec" {
-re "$break_message \[0-9\]* at .*: file .*, line $decimal.\r\n$gdb_prompt $" {}
-re "$break_message \[0-9\]*: file .*, line $decimal.\r\n$gdb_prompt $" {}
-re "$break_message \[0-9\]* at .*$gdb_prompt $" {}
-re "$break_message \[0-9\]* \\(.*\\) pending.*$gdb_prompt $" {
if {$pending_response == "n"} {
if { $print_fail } {
- fail $test_name
+ fail $gdb_name_name
}
return 0
}
@@ -659,35 +656,6 @@ proc gdb_breakpoint { linespec args } {
send_gdb "$pending_response\n"
exp_continue
}
- -re "A problem internal to GDB has been detected" {
- if { $print_fail } {
- fail "$test_name (GDB internal error)"
- }
- gdb_internal_error_resync
- return 0
- }
- -re "$gdb_prompt $" {
- if { $print_fail } {
- fail $test_name
- }
- return 0
- }
- eof {
- perror "GDB process no longer exists"
- global gdb_spawn_id
- set wait_status [wait -i $gdb_spawn_id]
- verbose -log "GDB process exited with wait status $wait_status"
- if { $print_fail } {
- fail "$test_name (eof)"
- }
- return 0
- }
- timeout {
- if { $print_fail } {
- fail "$test_name (timeout)"
- }
- return 0
- }
}
if { $print_pass } {
pass $test_name
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-04 16:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-04 16:22 [binutils-gdb] gdb: use gdb_test_multiple in gdb_breakpoint Simon Marchi
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).