This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[patch] gdb.reverse/*.exp send_gdb vs. gdb_test
- From: Michael Snyder <msnyder at vmware dot com>
- To: "gdb-patches at sourceware dot org" <gdb-patches at sourceware dot org>
- Date: Wed, 26 May 2010 10:41:48 -0700
- Subject: [patch] gdb.reverse/*.exp send_gdb vs. gdb_test
I will commit these.
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.
Index: consecutive-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/consecutive-precsave.exp,v
retrieving revision 1.3
diff -u -p -r1.3 consecutive-precsave.exp
--- consecutive-precsave.exp 1 Jan 2010 07:32:06 -0000 1.3
+++ consecutive-precsave.exp 26 May 2010 17:29:55 -0000
@@ -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"
}
}
Index: consecutive-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/consecutive-reverse.exp,v
retrieving revision 1.3
diff -u -p -r1.3 consecutive-reverse.exp
--- consecutive-reverse.exp 1 Jan 2010 07:32:06 -0000 1.3
+++ consecutive-reverse.exp 26 May 2010 17:29:55 -0000
@@ -43,8 +43,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
@@ -55,14 +54,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 .*" \
@@ -102,17 +93,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"
}
}