aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Snyder <msnyder@vmware.com>2010-06-04 23:09:15 +0000
committerMichael Snyder <msnyder@vmware.com>2010-06-04 23:09:15 +0000
commitdfb88a23362dcc3945486656dc6f9870bdce7519 (patch)
treefb0adf424a975dcaed0a0300593f739ef505bed3
parentf7ae76b3b95f3c6ad3ba4c81c46b8c6039d855da (diff)
downloadgdb-dfb88a23362dcc3945486656dc6f9870bdce7519.zip
gdb-dfb88a23362dcc3945486656dc6f9870bdce7519.tar.gz
gdb-dfb88a23362dcc3945486656dc6f9870bdce7519.tar.bz2
2010-06-04 Michael Snyder <msnyder@vmware.com>
* gdb.base/attach.exp: Replace gdb_test_multiple with gdb_test.
-rw-r--r--gdb/testsuite/ChangeLog3
-rw-r--r--gdb/testsuite/gdb.base/attach.exp10
2 files changed, 7 insertions, 6 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 595ab9f..d0bb484 100644
--- 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 fdea642..bc7d4eb 100644
--- 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}"