2010-05-26 Michael Snyder <msnyder@msnyder-server.eng.vmware.com>

	* gdb.reverse/consecutive-reverse.exp: Replace send_gdb with gdb_test.
	* gdb.reverse/consecutive-precsave.exp: Replace send_gdb with gdb_test.

	* gdb.mi/mi-basics.exp:
	* gdb.mi/mi-nonstop-exit.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi-nonstop.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi-ns-stale-regcache.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi-nsintrall.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi-nsmoribund.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi-nsthrexec.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi-return.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi-var-display.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi2-basics.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi2-console.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi2-return.exp: Replace send_gdb with gdb_test.
	* gdb.mi/mi2-var-display.exp: Replace send_gdb with gdb_test.

1 files changed, 4 insertions, 22 deletions

diff --git a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
index e6302ac7cb9..a709aa12ef8 100644
--- a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
@@ -62,8 +62,7 @@ set foo1_addr 0
 set foo2_addr 0
 set stop_addr 0
 
-send_gdb "x /2i \$pc\n"
-gdb_expect {
+gdb_test_multiple "x /2i \$pc" "get breakpoint address for foo" {
     global hex
     global foo1_addr
     global foo2_addr
@@ -74,14 +73,6 @@ gdb_expect {
 	set foo2_addr $expect_out(2,string)
 	pass "get breakpoint address for foo"
     }
-    -re ".*$gdb_prompt $" {
-	fail "get breakpoint address for foo"
-	return 0;
-    }
-    timeout {
-	fail "get breakpoint address for foo (timeout)"
-	return 0;
-    }
 }
 
 gdb_test "break \*$foo2_addr" "Breakpoint $decimal at $foo2_addr: file .*" \
@@ -121,17 +112,8 @@ gdb_test_multiple "step" "$test_msg" {
 	}
     }
     -re "Breakpoint $decimal, foo.*$gdb_prompt $" {
-	send_gdb "print \$pc == $foo1_addr\n"
-	gdb_expect {
-	    -re "$decimal = 1\[\r\n\]+$gdb_prompt $" {
-		pass "$test_msg"
-	    }
-	    -re "$decimal = 0\[\r\n\]+$gdb_prompt $" {
-		fail "$test_msg (wrong address)"
-	    }
-	}
-    }
-    -re ".*$gdb_prompt $" {
-	fail "$test_msg"
+	gdb_test "print \$pc == $foo1_addr" \
+	    "$decimal = 1" \
+	    "$test_msg"
     }
 }