public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] gdb/testsuite/gdb.base/break.exp: split test_tbreak
@ 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=3274ac5378664deb7d74866028ef5c2a122ad4fe
commit 3274ac5378664deb7d74866028ef5c2a122ad4fe
Author: Simon Marchi <simon.marchi@polymtl.ca>
Date: Wed Nov 23 13:39:58 2022 -0500
gdb/testsuite/gdb.base/break.exp: split test_tbreak
Leave setting bp_location11 in the global scope, so that it's accessible
to other procs.
Change-Id: I8928f01640d3a1e993649b2168b9eda0724ee1d9
Approved-By: Kevin Buettner <kevinb@redhat.com>
Diff:
---
gdb/testsuite/gdb.base/break.exp | 82 ++++++++++++++++++----------------------
1 file changed, 36 insertions(+), 46 deletions(-)
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index 4a2f130ff29..1aa9476c0cf 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -423,55 +423,45 @@ gdb_test "continue" \
".*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location10a.*$bp_location10a\[\t \]+}.*breakpoint 10a here.*" \
"continue to breakpoint at }"
-#
-# delete all breakpoints so we can start over, course this can be a test too
-#
-delete_breakpoints
-
-#
-# test temporary breakpoint at function
-#
-
-gdb_test "tbreak -q main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "temporary breakpoint function"
-
-#
-# test break at function in file
-#
-
-gdb_test "tbreak $srcfile:factorial" "Temporary breakpoint.*at.* file .*$srcfile, line.*" \
- "Temporary breakpoint function in file"
-
-#
-# test break at line number
-#
-gdb_test "tbreak $bp_location1" \
- "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location1.*" \
- "temporary breakpoint line number #1"
-
-gdb_test "tbreak $bp_location6" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "temporary breakpoint line number #2"
-
-#
-# test break at line number in file
-#
-gdb_test "tbreak $srcfile:$bp_location2" \
- "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location2.*" \
- "temporary breakpoint line number in file #1"
-
set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
-gdb_test "tbreak $srcfile:$bp_location11" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location11.*" "Temporary breakpoint line number in file #2"
-#
-# check to see what breakpoints are set (temporary this time)
-#
-gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint del.*y.*in [func main] at .*$srcfile:$main_line.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint del.*y.*in [func factorial] at .*$srcfile:$bp_location7.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint del.*y.*in [func main] at .*$srcfile:$bp_location1.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint del.*y.*in [func main] at .*$srcfile:$bp_location6.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint del.*y.*in [func main] at .*$srcfile:$bp_location2.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint del.*y.*in [func main] at .*$srcfile:$bp_location11.*" \
- "Temporary breakpoint info"
+proc_with_prefix test_tbreak {} {
+ clean_restart break
+
+ # test temporary breakpoint at function
+ gdb_test "tbreak -q main" "Temporary breakpoint.*at.* file .*$::srcfile, line.*" "temporary breakpoint function"
+
+ # test break at function in file
+ gdb_test "tbreak $::srcfile:factorial" "Temporary breakpoint.*at.* file .*$::srcfile, line.*" \
+ "Temporary breakpoint function in file"
+
+ # test break at line number
+ gdb_test "tbreak $::bp_location1" \
+ "Temporary breakpoint.*at.* file .*$::srcfile, line $::bp_location1.*" \
+ "temporary breakpoint line number #1"
+
+ gdb_test "tbreak $::bp_location6" "Temporary breakpoint.*at.* file .*$::srcfile, line $::bp_location6.*" "temporary breakpoint line number #2"
+
+ # test break at line number in file
+ gdb_test "tbreak $::srcfile:$::bp_location2" \
+ "Temporary breakpoint.*at.* file .*$::srcfile, line $::bp_location2.*" \
+ "temporary breakpoint line number in file #1"
+
+ gdb_test "tbreak $::srcfile:$::bp_location11" "Temporary breakpoint.*at.* file .*$::srcfile, line $::bp_location11.*" "Temporary breakpoint line number in file #2"
+
+ # check to see what breakpoints are set (temporary this time)
+ gdb_test "info break" \
+ [multi_line "Num Type.*Disp Enb Address.*What.*" \
+ "$::decimal\[\t \]+breakpoint del.*y.*in [func main] at .*$::srcfile:$::main_line.*" \
+ "$::decimal\[\t \]+breakpoint del.*y.*in [func factorial] at .*$::srcfile:$::bp_location7.*" \
+ "$::decimal\[\t \]+breakpoint del.*y.*in [func main] at .*$::srcfile:$::bp_location1.*" \
+ "$::decimal\[\t \]+breakpoint del.*y.*in [func main] at .*$::srcfile:$::bp_location6.*" \
+ "$::decimal\[\t \]+breakpoint del.*y.*in [func main] at .*$::srcfile:$::bp_location2.*" \
+ "$::decimal\[\t \]+breakpoint del.*y.*in [func main] at .*$::srcfile:$::bp_location11.*"] \
+ "Temporary breakpoint info"
+}
+test_tbreak
#***********
^ 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_tbreak 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).