2010-06-04 Michael Snyder <msnyder@vmware.com>

	* gdb.base/pending.exp: Replace gdb_test_multiple with gdb_test.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 10a30799b88d141fec998ce7bacb6c6a6d4fa097..595ab9fc26b74b33059285cecdad43199bd346b7 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2010-06-04  Michael Snyder  <msnyder@vmware.com>
 
+       * gdb.base/pending.exp: Replace gdb_test_multiple with gdb_test.
+
        * gdb.cp/pr-1210.exp: Add message string to gdb_test_multiple.
 
 2010-06-04  Doug Evans  <dje@google.com>

diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
index 657862f3922a68934458a81e7a715b40bce9b6ae..f5b196ea9aeb1237a408dcb6d23ae25bc17d4dab 100644 (file)
--- a/gdb/testsuite/gdb.base/pending.exp
+++ b/gdb/testsuite/gdb.base/pending.exp
@@ -123,11 +123,11 @@ gdb_test "info break" \
 # 
 # Test not setting a pending breakpoint 
 #
-gdb_test_multiple "break pendfunc2" "Don't set pending breakpoint" {
-     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
-           gdb_test "n" "" "Don't set pending breakpoint"
-     }
-}
+gdb_test "break pendfunc2" \
+    "" \
+    "Don't set pending breakpoint" \
+    ".*Make breakpoint pending.*y or \\\[n\\\]. $" \
+    "n"
 
 #
 # Add condition to pending breakpoint