public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] gdb/testsuite/gdb.base/break.exp: split test_break_user_call
@ 2022-11-24 15:23 Simon Marchi
0 siblings, 0 replies; only message in thread
From: Simon Marchi @ 2022-11-24 15:23 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3ad818379788f3999c62097be1007e56c5b5a6e1
commit 3ad818379788f3999c62097be1007e56c5b5a6e1
Author: Simon Marchi <simon.marchi@polymtl.ca>
Date: Wed Nov 23 13:39:52 2022 -0500
gdb/testsuite/gdb.base/break.exp: split test_break_user_call
Change-Id: I9151ce9db9435722b758f41c6606b461bf15f320
Approved-By: Kevin Buettner <kevinb@redhat.com>
Diff:
---
gdb/testsuite/gdb.base/break.exp | 54 ++++++++++++++++++++++++----------------
1 file changed, 32 insertions(+), 22 deletions(-)
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index 1f6c620ee0c..d9cfeb9b21f 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -626,34 +626,44 @@ with_test_prefix "set line breakpoint via convenience variable" {
}
# Verify that we can set and trigger a breakpoint in a user-called function.
-#
-gdb_test "break marker2" \
- "Breakpoint (\[0-9\]*) at .*, line $bp_location8.*" \
- "set breakpoint on to-be-called function"
-
-gdb_test "print marker2(99)" \
- "The program being debugged stopped while in a function called from GDB.\r\nEvaluation of the expression containing the function\r\n.[func marker2]. will be abandoned.\r\nWhen the function is done executing, GDB will silently stop.*" \
- "hit breakpoint on called function"
-# As long as we're stopped (breakpointed) in a called function,
-# verify that we can successfully backtrace & such from here.
-gdb_test "bt" \
- "#0\[ \t\]*($hex in )?marker2.*:$bp_location8\r\n#1\[ \t\]*<function called from gdb>.*" \
- "backtrace while in called function"
+proc_with_prefix test_break_user_call {} {
+ clean_restart break
-# Return from the called function. For remote targets, it's important to do
-# this before runto_main, which otherwise may silently stop on the dummy
-# breakpoint inserted by GDB at the program's entry point.
-#
-gdb_test_multiple "finish" "finish from called function" {
- -re "Run till exit from .*marker2.* at .*$bp_location8\r\n.*function called from gdb.*$gdb_prompt $" {
- pass "finish from called function"
+ if { ![runto_main] } {
+ return
}
- -re "Run till exit from .*marker2.* at .*$bp_location8\r\n.*Value returned.*$gdb_prompt $" {
- pass "finish from called function"
+
+ gdb_test "break marker2" \
+ "Breakpoint (\[0-9\]*) at .*, line $::bp_location8.*" \
+ "set breakpoint on to-be-called function"
+
+ gdb_test "print marker2(99)" \
+ "The program being debugged stopped while in a function called from GDB.\r\nEvaluation of the expression containing the function\r\n.[func marker2]. will be abandoned.\r\nWhen the function is done executing, GDB will silently stop.*" \
+ "hit breakpoint on called function"
+
+ # As long as we're stopped (breakpointed) in a called function,
+ # verify that we can successfully backtrace & such from here.
+ gdb_test "bt" \
+ "#0\[ \t\]*($::hex in )?marker2.*:$::bp_location8\r\n#1\[ \t\]*<function called from gdb>.*" \
+ "backtrace while in called function"
+
+ # Return from the called function. For remote targets, it's important to do
+ # this before runto_main, which otherwise may silently stop on the dummy
+ # breakpoint inserted by GDB at the program's entry point.
+ #
+ gdb_test_multiple "finish" "finish from called function" {
+ -re "Run till exit from .*marker2.* at .*$::bp_location8\r\n.*function called from gdb.*$::gdb_prompt $" {
+ pass "finish from called function"
+ }
+ -re "Run till exit from .*marker2.* at .*$::bp_location8\r\n.*Value returned.*$::gdb_prompt $" {
+ pass "finish from called function"
+ }
}
}
+test_break_user_call
+
# Verify that GDB responds gracefully to a "finish" command with
# arguments.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-11-24 15:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-24 15:23 [binutils-gdb] gdb/testsuite/gdb.base/break.exp: split test_break_user_call 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).