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

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

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

diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index fdea6423f04f97d29c8f83fb6ff1695056a6f5bf..bc7d4eb72080107dac2f24d5c6407db1388ad6ed 100644 (file)
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -309,11 +309,11 @@ proc do_attach_tests {} {
        "attach when process' a.out not in cwd"
 
     set test "after attach3, exit"
-    gdb_test_multiple "kill" "$test" {
-       -re "Kill the program being debugged.*y or n. $" {
-           gdb_test "y" "" "$test"
-       }
-    }
+    gdb_test "kill" \
+       "" \
+       "$test" \
+       "Kill the program being debugged.*y or n. $" \
+       "y"
     
     # Another "don't leave a process around"
     remote_exec build "kill -9 ${testpid}"