gdb/testsuite/gdb.base/break.exp: split test_rbreak_shlib
Change-Id: I130e8914c2713095aab03e84aba1481b4c7af978
Approved-By: Kevin Buettner <kevinb@redhat.com>
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index be349d9..a972879 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -835,9 +835,6 @@
}
}
-clean_restart breako2
-
-#
# test that 'rbreak' on a symbol that may be from a shared library doesn't
# cause a "Junk at end of arguments." error.
#
@@ -846,28 +843,31 @@
# Note that this test won't necessarily choke on all targets even if
# all the rbreak issue is present. rbreak needs to match and set a
# breakpoint on a symbol causes 'break' to choke.
-#
-gdb_test_no_output "set breakpoint pending on" "rbreak junk pending setup"
+proc_with_prefix test_rbreak_shlib {} {
+ clean_restart breako2
-# We expect at least one breakpoint to be set when we "rbreak main".
-gdb_test "rbreak main" \
- ".*Breakpoint.*at.* file .*$srcfile, line.*" \
- "rbreak junk set breakpoint"
+ gdb_test_no_output "set breakpoint pending on" "rbreak junk pending setup"
-# Run to a breakpoint. Fail if we see "Junk at end of arguments".
-gdb_run_cmd
+ # We expect at least one breakpoint to be set when we "rbreak main".
+ gdb_test "rbreak main" \
+ ".*Breakpoint.*at.* file .*$::srcfile, line.*"
-set test "rbreak junk"
-gdb_test_multiple "" $test {
- -re "Junk at end of arguments" {
- fail $test
- }
- -re ".*Breakpoint \[0-9\]+,.*$gdb_prompt $" {
- pass $test
+ # Run to a breakpoint. Fail if we see "Junk at end of arguments".
+ gdb_run_cmd
+
+ gdb_test_multiple "" "rbreak junk" {
+ -re -wrap "Junk at end of arguments.*" {
+ fail $gdb_test_name
+ }
+ -re -wrap ".*Breakpoint \[0-9\]+,.*" {
+ pass $gdb_test_name
+ }
}
}
+test_rbreak_shlib
+
# Test break via convenience variable with file name
proc_with_prefix test_break_file_line_convenience_var {} {
