aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.base/annota3.exp
diff options
context:
space:
mode:
authorMichael Snyder <msnyder@vmware.com>2010-05-26 18:05:25 +0000
committerMichael Snyder <msnyder@vmware.com>2010-05-26 18:05:25 +0000
commit6acb16a2933eda8acd00095c425e32cf5ef171cb (patch)
treede3d1b0b64286b4a9712054e1a7e1b2d84228564 /gdb/testsuite/gdb.base/annota3.exp
parentdfc8cf43a16e6e304c311bad583594485657cf8a (diff)
downloadgdb-6acb16a2933eda8acd00095c425e32cf5ef171cb.zip
gdb-6acb16a2933eda8acd00095c425e32cf5ef171cb.tar.gz
gdb-6acb16a2933eda8acd00095c425e32cf5ef171cb.tar.bz2
2010-05-25 Michael Snyder <msnyder@vmware.com>
* gdb.ada/formatted_ref.exp: Replace send_gdb with gdb_test. * gdb.asm/asm-source.exp: Replace send_gdb with gdb_test. * gdb.base/a2-run.exp: Replace send_gdb with gdb_test. * gdb.base/all-bin.exp: Replace send_gdb with gdb_test. * gdb.base/annota1.exp: Replace send_gdb with gdb_test. * gdb.base/annota3.exp: Replace send_gdb with gdb_test. * gdb.base/assign.exp: Replace send_gdb with gdb_test. * gdb.base/attach.exp: Replace send_gdb with gdb_test. * gdb.base/bitfields.exp: Replace send_gdb with gdb_test. * gdb.base/bitfields2.exp: Replace send_gdb with gdb_test. * gdb.base/bitops.exp: Replace send_gdb with gdb_test.
Diffstat (limited to 'gdb/testsuite/gdb.base/annota3.exp')
-rw-r--r--gdb/testsuite/gdb.base/annota3.exp19
1 files changed, 5 insertions, 14 deletions
diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
index e8b0657..574a86a 100644
--- a/gdb/testsuite/gdb.base/annota3.exp
+++ b/gdb/testsuite/gdb.base/annota3.exp
@@ -61,8 +61,7 @@ set main_line 32
# The commands we test here produce many lines of output; disable "press
# <return> to continue" prompts.
-send_gdb "set height 0\n"
-gdb_expect -re "$gdb_prompt $"
+gdb_test_no_output "set height 0"
#
# break at main
@@ -100,26 +99,18 @@ gdb_expect_list "annotation set at level 3" "\r\n$gdb_prompt$" {
#
# if construct:
#
-send_gdb "if 1\n"
-gdb_expect {
+gdb_test_multiple "if 1" "start if construct" {
-re "^if 1\r\n\r\n\032\032post-prompt\r\n\r\n\032\032pre-commands\r\n >\r\n\032\032commands\r\n$" {
pass "start if construct"
}
- -re ".*\032\032commands\r\n" {
- fail "start if construct"
- }
- timeout { fail "start if construct (timeout)" }
}
-send_gdb "end\n"
-gdb_expect {
+
+gdb_test_multiple "end" "end if construct" {
-re "^end\r\n\r\n\032\032post-commands\r\n$gdb_prompt$" {
pass "end if construct"
}
- -re ".*$gdb_prompt$" {
- fail "end if construct"
- }
- timeout { fail "end if construct (timeout)" }
}
+
#
# info break:
#