2009-10-22 Michael Snyder <msnyder@vmware.com>

	* gdb.reverse/consecutive-reverse.exp: Substitute gdb_test_multiple
	for gdb_expect.  Adjust one test's expect strings for the new
	format of disassemble.
	* gdb.reverse/finish-reverse.exp: Delete 'return'.
	* gdb.reverse/sigall-reverse.exp: Substitute gdb_test for
	gdb_test_multiple.
	* gdb.reverse/step-reverse.exp: Delete 'return'.
	* gdb.reverse/until-reverse.exp: Delete blank lines.
	* gdb.reverse/watch-reverse.exp: Delete blank lines.

6 files changed, 6 insertions, 28 deletions

diff --git a/gdb/testsuite/gdb.reverse/consecutive-reverse.exp b/gdb/testsuite/gdb.reverse/consecutive-reverse.exp
index e2ba83a..d3ab968 100644
--- a/gdb/testsuite/gdb.reverse/consecutive-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/consecutive-reverse.exp
@@ -50,7 +50,7 @@ gdb_expect {
     global foo2_addr
     global gdb_prompt
 
-    -re "($hex).*\[\r\n\]+($hex).*$gdb_prompt $" {
+    -re "=> ($hex).*\[\r\n\]+   ($hex).*$gdb_prompt $" {
 	set foo1_addr $expect_out(1,string)
 	set foo2_addr $expect_out(2,string)
 	pass "get breakpoint address for foo"
@@ -68,8 +68,8 @@ gdb_expect {
 gdb_test "break \*$foo2_addr" "Breakpoint $decimal at $foo2_addr: file .*" \
 	"set bp, 2nd instr"
 
-send_gdb "step\n"
-gdb_expect {
+set testmsg "stopped at bp, 2nd instr"
+gdb_test_multiple "step" $testmsg {
     -re "Breakpoint $decimal, ($hex) in foo.*$gdb_prompt $" {
 	set stop_addr $expect_out(1,string)
 	if [eval expr "$foo2_addr == $stop_addr"] then {
@@ -78,13 +78,6 @@ gdb_expect {
 	    fail "stopped at bp, 2nd instr (wrong address)"
 	}
     }
-    -re ".*$gdb_prompt $" {
-	fail "stopped at bp, 2nd instr"
-    }
-    timeout {
-	fail "stopped at bp, 2nd instr (timeout)"
-
-    }
 }
 
 ###
diff --git a/gdb/testsuite/gdb.reverse/finish-reverse.exp b/gdb/testsuite/gdb.reverse/finish-reverse.exp
index ddf8568..47e1b3d 100644
--- a/gdb/testsuite/gdb.reverse/finish-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/finish-reverse.exp
@@ -228,5 +228,3 @@ gdb_test_multiple "finish" "$test_msg" {
 	pass "$test_msg"
     }
 }
-
-return 0
diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/gdb.reverse/sigall-reverse.exp
index fa49ad5..23c08bd 100644
--- a/gdb/testsuite/gdb.reverse/sigall-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-reverse.exp
@@ -262,16 +262,9 @@ gdb_test "continue" \
     "get signal TERM"
 gdb_test "continue" "Breakpoint.*handle_TERM.*" "send signal TERM"
 
-set testmsg "continue to sigall exit"
-gdb_test_multiple "continue" $testmsg {
-    -re ".*Do you want to stop the program.*$" {
-	send_gdb "yes\n"
-	exp_continue
-    }
-    -re "$gdb_prompt " {
-	pass $testmsg
-    }
-}
+gdb_test "continue" "Program received .*" "continue to sigall exit" \
+    "The next instruction is syscall exit_group.* program...y. or n. " \
+    "yes"
 
 test_one_sig_reverse TERM
 test_one_sig_reverse 63
diff --git a/gdb/testsuite/gdb.reverse/step-reverse.exp b/gdb/testsuite/gdb.reverse/step-reverse.exp
index 31a707d..cf4634a 100644
--- a/gdb/testsuite/gdb.reverse/step-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/step-reverse.exp
@@ -252,4 +252,3 @@ gdb_test "next" ".*NEXT TEST 1.*" "reverse next test 2"
 # gdb_test "set exec-dir forward" "" "set forward execution"
 # gdb_continue_to_end "step-reverse.exp"
 
-return 0
diff --git a/gdb/testsuite/gdb.reverse/until-reverse.exp b/gdb/testsuite/gdb.reverse/until-reverse.exp
index 6667fa2..bfff18b 100644
--- a/gdb/testsuite/gdb.reverse/until-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/until-reverse.exp
@@ -125,5 +125,3 @@ gdb_test "advance $bp_location19" \
 gdb_test "until $bp_location7" \
     "factorial .value=6..*$srcfile:$bp_location7.*" \
     "reverse-until to entry of factorial"
-
-
diff --git a/gdb/testsuite/gdb.reverse/watch-reverse.exp b/gdb/testsuite/gdb.reverse/watch-reverse.exp
index ab9efa8..d843e31 100644
--- a/gdb/testsuite/gdb.reverse/watch-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/watch-reverse.exp
@@ -122,6 +122,3 @@ gdb_test "continue" \
 gdb_test "continue" \
     ".*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = -1.*ival3 = count; ival4 = count;.*" \
     "watchpoint hit in reverse, fifth time"
-
-
-return 0