[binutils-gdb] gdb/testsuite/gdb.base/break.exp: split test_no_break_on_catchpoint

[binutils-gdb] gdb/testsuite/gdb.base/break.exp: split test_no_break_on_catchpoint

[Simon Marchi]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=46c3b224a35e16197225fe76e7b5546830d2501a

commit 46c3b224a35e16197225fe76e7b5546830d2501a
Author: Simon Marchi <simon.marchi@polymtl.ca>
Date:   Wed Nov 23 13:39:57 2022 -0500

    gdb/testsuite/gdb.base/break.exp: split test_no_break_on_catchpoint
    
    Change-Id: Ifa7070943f1de22c2839fedf5f346d6591bb5a76
    Approved-By: Kevin Buettner <kevinb@redhat.com>

Diff:
---
 gdb/testsuite/gdb.base/break.exp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index a5ef521a4b0..4a2f130ff29 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -478,21 +478,27 @@ gdb_test "info break" "Num     Type.*Disp Enb Address.*What.*\[\r\n\]
 # Verify that catchpoints for fork, vfork and exec don't trigger
 # inappropriately.  (There are no calls to those system functions
 # in this test program.)
-#
-if ![runto_main] then {
-    return
-}
 
-gdb_test "catch fork" "Catchpoint \[0-9\]+ \\(fork\\)" \
-    "set catch fork, never expected to trigger"
+proc_with_prefix test_no_break_on_catchpoint {} {
+    clean_restart break
+
+    if ![runto_main] then {
+	return
+    }
+
+    gdb_test "catch fork" "Catchpoint \[0-9\]+ \\(fork\\)" \
+	"set catch fork, never expected to trigger"
 
-gdb_test "catch vfork" "Catchpoint \[0-9\]+ \\(vfork\\)" \
-    "set catch vfork, never expected to trigger"
+    gdb_test "catch vfork" "Catchpoint \[0-9\]+ \\(vfork\\)" \
+	"set catch vfork, never expected to trigger"
 
-gdb_test "catch exec" "Catchpoint \[0-9\]+ \\(exec\\)" \
-    "set catch exec, never expected to trigger"
+    gdb_test "catch exec" "Catchpoint \[0-9\]+ \\(exec\\)" \
+	"set catch exec, never expected to trigger"
+
+    gdb_continue_to_end
+}
 
-gdb_continue_to_end
+test_no_break_on_catchpoint
 
 # Verify that GDB responds gracefully when asked to set a breakpoint
 # on a nonexistent source line.