2010-05-24 Michael Snyder <msnyder@vmware.com>

	* gdb.base/default.exp: Replace send_gdb with gdb_test.
	* gdb.base/define.exp: Replace send_gdb with gdb_test.
	* gdb.base/display.exp: Replace send_gdb with gdb_test.
	* gdb.base/dump.exp: Replace send_gdb with gdb_test.
	* gdb.base/ending-run.exp: Replace send_gdb with gdb_test.
	* gdb.base/eval-skip.exp: Replace send_gdb with gdb_test.
	* gdb.base/exprs.exp: Replace send_gdb with gdb_test.
	* gdb.base/fileio.exp: Replace send_gdb with gdb_test.
	* gdb.base/finish.exp: Replace send_gdb with gdb_test.
	* gdb.base/foll-fork.exp: Replace send_gdb with gdb_test.
	* gdb.base/funcargs.exp: Replace send_gdb with gdb_test.
	* gdb.base/gcore-buffer-overflow.exp: Replace send_gdb with gdb_test.
	* gdb.base/gcore.exp: Replace send_gdb with gdb_test.
	* gdb.base/gdb1090.exp: Replace send_gdb with gdb_test.
	* gdb.base/gdbvars.exp: Replace send_gdb with gdb_test.
	* gdb.base/help.exp: Replace send_gdb with gdb_test.
	* gdb.base/info-proc.exp: Replace send_gdb with gdb_test.
	* gdb.base/jump.exp: Replace send_gdb with gdb_test.
	* gdb.base/long_long.exp: Replace send_gdb with gdb_test.

1 files changed, 36 insertions, 94 deletions

diff --git a/gdb/testsuite/gdb.base/jump.exp b/gdb/testsuite/gdb.base/jump.exp
index 8c80a01..9e4ed37 100644
--- a/gdb/testsuite/gdb.base/jump.exp
+++ b/gdb/testsuite/gdb.base/jump.exp
@@ -47,96 +47,59 @@ if ![runto_main] then {
 # Set a breakpoint on the statement that we're about to jump to.
 # The statement doesn't contain a function call.
 #
-send_gdb "break 22\n"
 set bp_on_non_call 0
-gdb_expect {
-  -re "\[Bb\]reakpoint (\[0-9\]*) at 0x\[0-9a-fA-F\]*: file .*${srcfile}, line 22.*$gdb_prompt $"\
-          {set bp_on_non_call $expect_out(1,string)
-           pass "break before jump to non-call"}
-  -re "$gdb_prompt $"\
-          {fail "break before jump to non-call"}
-  timeout {fail "(timeout) break before jump to non-call"}
+gdb_test_multiple "break 22" "break before jump to non-call" {
+    -re "\[Bb\]reakpoint (\[0-9\]*) at 0x\[0-9a-fA-F\]*: file .*${srcfile}, line 22.*$gdb_prompt $" {
+	set bp_on_non_call $expect_out(1,string)
+	pass "break before jump to non-call"
+    }
 }
 
 # Can we jump to the statement?  Do we stop there?
 #
-send_gdb "jump 22\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*, .*${srcfile}:22.*$gdb_prompt $"\
-          {pass "jump to non-call"}
-  -re "$gdb_prompt $"\
-          {fail "jump to non-call"}
-  timeout {fail "(timeout) jump to non-call"}
-}
+gdb_test "jump 22" "Breakpoint \[0-9\]*, .*${srcfile}:22.*" \
+    "jump to non-call"
 
 # Set a breakpoint on the statement that we're about to jump to.
 # The statement does contain a function call.
 #
-send_gdb "break 21\n"
 set bp_on_call 0
-gdb_expect {
-  -re "\[Bb\]reakpoint (\[0-9\]*) at 0x\[0-9a-fA-F\]*: file .*${srcfile}, line 21.*$gdb_prompt $"\
-          {set bp_on_call $expect_out(1,string)
-           pass "break before jump to call"}
-  -re "$gdb_prompt $"\
-          {fail "break before jump to call"}
-  timeout {fail "(timeout) break before jump to call"}
+gdb_test_multiple "break 21" "break before jump to call" {
+    -re "\[Bb\]reakpoint (\[0-9\]*) at 0x\[0-9a-fA-F\]*: file .*${srcfile}, line 21.*$gdb_prompt $" {
+	set bp_on_call $expect_out(1,string)
+	pass "break before jump to call"
+    }
 }
 
 # Can we jump to the statement?  Do we stop there?
 #
-send_gdb "jump 21\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*, .*${srcfile}:21.*$gdb_prompt $"\
-          {pass "jump to call"}
-  -re "$gdb_prompt $"\
-          {fail "jump to call"}
-  timeout {fail "(timeout) jump to call"}
-}
+gdb_test "jump 21" \
+    "Breakpoint \[0-9\]*, .*${srcfile}:21.*" \
+    "jump to call"
 
 # If we disable the breakpoint at the function call, and then
 # if we jump to that statement, do we not stop there, but at
 # the following breakpoint?
 #
-send_gdb "disable $bp_on_call\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "disable breakpoint on call"}
-  timeout {fail "(timeout) disable breakpoint on call"}
-}
+gdb_test_no_output "disable $bp_on_call" "disable breakpoint on call"
 
-send_gdb "jump 21\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*, .*${srcfile}:22.*$gdb_prompt $"\
-          {pass "jump to call with disabled breakpoint"}
-  -re "$gdb_prompt $"\
-          {fail "jump to call with disabled breakpoint"}
-  timeout {fail "(timeout) jump to call with disabled breakpoint"}
-}
+gdb_test "jump 21" "Breakpoint \[0-9\]*, .*${srcfile}:22.*" \
+    "jump to call with disabled breakpoint"
 
 # Verify that GDB responds gracefully to the "jump" command without
 # an argument.
 #
-send_gdb "jump\n"
-gdb_expect {
-  -re "Argument required .starting address..*$gdb_prompt $"\
-          {pass "jump without argument disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "jump without argument disallowed"}
-  timeout {fail "(timeout) jump without argument disallowed"}
-}
+gdb_test "jump" "Argument required .starting address.*" \
+    "jump without argument disallowed"
+
 
 # Verify that GDB responds gracefully to the "jump" command with
 # trailing junk.
 #
-send_gdb "jump 21 100\n"
-gdb_expect {
-  -re "Junk at end of line specification: 100.*$gdb_prompt $"\
-          {pass "jump with trailing argument junk"}
-  -re "$gdb_prompt $"\
-          {fail "jump with trailing argument junk"}
-  timeout {fail "(timeout) jump with trailing argument junk"}
-}
+gdb_test "jump 21 100" \
+    "Junk at end of line specification: 100.*" \
+    "jump with trailing argument junk"
+
 
 # Verify that GDB responds gracefully to a request to jump out of
 # the current function.  (Note that this will very likely cause the
@@ -145,39 +108,18 @@ gdb_expect {
 #
 # Try it both ways: confirming and not confirming the jump.
 #
-send_gdb "jump 12\n"
-gdb_expect {
-  -re "Line 12 is not in `main'.  Jump anyway.*y or n. $"\
-          {send_gdb "n\n"
-           gdb_expect {
-             -re "Not confirmed.*$gdb_prompt $"\
-                     {pass "aborted jump out of current function"}
-             -re "$gdb_prompt $"\
-                     {fail "aborted jump out of current function"}
-             timeout {fail "(timeout) aborted jump out of current function"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "aborted jump out of current function"}
-  timeout {fail "(timeout) aborted jump out of current function"}
-}
 
-send_gdb "jump 12\n"
-gdb_expect {
-  -re "Line 12 is not in `main'.  Jump anyway.*y or n. $"\
-          {send_gdb "y\n"
-           gdb_expect {
-             -re "Continuing at.*$gdb_prompt $"\
-                     {pass "jump out of current function"}
-             -re "$gdb_prompt $"\
-                     {fail "jump out of current function"}
-             timeout {fail "(timeout) jump out of current function"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "jump out of current function"}
-  timeout {fail "(timeout) jump out of current function"}
-}
+gdb_test "jump 12" \
+    "Not confirmed.*" \
+    "aborted jump out of current function" \
+    "Line 12 is not in `main'.  Jump anyway.*y or n. $" \
+    "n"
+
+gdb_test "jump 12" \
+    "Continuing at.*" \
+    "jump out of current function" \
+    "Line 12 is not in `main'.  Jump anyway.*y or n. $" \
+    "y"
 
 gdb_exit
 return 0