diff options
| author | Michael Snyder <msnyder@vmware.com> | 2010-05-24 22:06:59 +0000 |
|---|---|---|
| committer | Michael Snyder <msnyder@vmware.com> | 2010-05-24 22:06:59 +0000 |
| commit | a76e022adf3f91ab44ae8b95e7a5bdc2e06b7136 (patch) | |
| tree | 503018fe47350071e8f7d719a5dedd8e4c4925c0 /gdb/testsuite/gdb.base/display.exp | |
| parent | ad3986f07b99393eb3a6282381d82cc1e8fe02fd (diff) | |
| download | gdb-a76e022adf3f91ab44ae8b95e7a5bdc2e06b7136.zip gdb-a76e022adf3f91ab44ae8b95e7a5bdc2e06b7136.tar.gz gdb-a76e022adf3f91ab44ae8b95e7a5bdc2e06b7136.tar.bz2 | |
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.
Diffstat (limited to 'gdb/testsuite/gdb.base/display.exp')
| -rw-r--r-- | gdb/testsuite/gdb.base/display.exp | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp index c1102b4..434df3c 100644 --- a/gdb/testsuite/gdb.base/display.exp +++ b/gdb/testsuite/gdb.base/display.exp @@ -112,28 +112,12 @@ gdb_test "info disp" ".*Auto-display expressions now in effect.*y /f f.*y / gdb_test "cont" ".*\[Ww\]atch.*5.1415.*.*i = 0.*" "next hit" -send_gdb "undisp\n" -gdb_expect { - -re ".*Delete all auto-display expressions.*y or n. $" { - send_gdb "y\n" - gdb_expect { - -re "y\r\n$gdb_prompt $" { - pass "undisp all" - } - -re ".*$gdb_prompt $" { - fail "some un-helpful response" - } - -re ".*Delete all.*$" { - fail "re-ask question" - } - timeout { fail "timeout" } - } - } - -re ".*$gdb_prompt $" { - fail "undisp all" - } - timeout { fail "timeout" } -} +gdb_test "undisp" \ + "" \ + "undisp all" \ + ".*Delete all auto-display expressions.*y or n. $" \ + "y" + gdb_test "disab 3" ".*.*" "disab 3" gdb_test "cont" ".*Breakpoint 4.*" "watch off" @@ -144,8 +128,7 @@ gdb_test "cont" ".*Breakpoint 4.*" "watch off" # targets, including but not limited to the m68k, i386 & PA. So we # have to arrange to step until we hit the line with the call to # "do_vars". -send_gdb "finish\n" -gdb_expect { +gdb_test_multiple "finish" "finish" { -re ".*do_loops\\(\\);.*$gdb_prompt $" { send_gdb "step\n" exp_continue @@ -153,14 +136,6 @@ gdb_expect { -re ".*do_vars.*$gdb_prompt $" { pass "finish" } - -re ".*$gdb_prompt $" { - fail "finish" - gdb_suppress_tests - } - timeout { - fail "(timeout) finish" - gdb_suppress_tests - } } gdb_test "step" ".*do_vars.*.*i = 9.*" |