# Verify that the catchpoint is mentioned in an "info breakpoints",
     # and further that the catchpoint mentions no process id.
-    #
-    set test_name "info shows catchpoint without pid"
-    gdb_test_multiple "info breakpoints" "$test_name" {
-       -re ".*catchpoint.*keep y.*fork\[\r\n\]+$gdb_prompt $" {
-           pass "$test_name"
-       }
-    }
+    gdb_test "info breakpoints" \
+       ".*catchpoint.*keep y.*fork\[\r\n\]+" \
+       "info breakpoints before fork"
 
     gdb_test "continue" \
        "Catchpoint \[0-9\]* \\(forked process \[0-9\]*\\),.*" \
 
     # Verify that the catchpoint is mentioned in an "info breakpoints",
     # and further that the catchpoint managed to capture a process id.
-    #
-    set test_name "info shows catchpoint without pid"
-    gdb_test_multiple "info breakpoints" "$test_name" {
-       -re ".*catchpoint.*keep y.*fork, process.*$gdb_prompt $" {
-           pass "$test_name"
-       }
-    }
+    gdb_test "info breakpoints" \
+       ".*catchpoint.*keep y.*fork, process.*" \
+       "info breakpoints after fork"
 
     gdb_test_no_output "set follow-fork child"