gdb.base/foll-fork.exp: remove DUPLICATEs

Remove DUPLICATEs, and and at the same time replace two uses of
gdb_test_multiple with gdb_test.  I don't think using gdb_test_multiple
is necessary here.

Change-Id: I8dcf097c3364e92d4f0e11f0c0f05dbb88e86742
diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp
index a3fa5bf..f777f2b 100644
--- a/gdb/testsuite/gdb.base/foll-fork.exp
+++ b/gdb/testsuite/gdb.base/foll-fork.exp
@@ -194,13 +194,9 @@
 
     # 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\]*\\),.*" \
@@ -208,13 +204,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"