diff options
| author | Pedro Alves <palves@redhat.com> | 2014-09-12 22:16:31 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2014-09-12 22:16:31 +0100 |
| commit | fa43b1d7ca8d9699a253b1f227e91c406a043a0b (patch) | |
| tree | cde814e330d7e2657020cf31199edbddc47934fe /gdb/testsuite/gdb.base/dbx.exp | |
| parent | f37f681c2bb884e74cd33340617a6d1a408d1a75 (diff) | |
| download | gdb-fa43b1d7ca8d9699a253b1f227e91c406a043a0b.zip gdb-fa43b1d7ca8d9699a253b1f227e91c406a043a0b.tar.gz gdb-fa43b1d7ca8d9699a253b1f227e91c406a043a0b.tar.bz2 | |
after gdb_run_cmd, gdb_expect -> gdb_test_multiple/gdb_test
See:
https://sourceware.org/ml/gdb-patches/2014-09/msg00404.html
We have a number of places that do gdb_run_cmd followed by gdb_expect,
when it would be better to use gdb_test_multiple or gdb_test.
This converts all that "grep gdb_run_cmd -A 2 | grep gdb_expect"
found.
Tested on x86_64 Fedora 20, native and gdbserver.
gdb/testsuite/
2014-09-12 Pedro Alves <palves@redhat.com>
* gdb.arch/gdb1558.exp: Replace uses of gdb_expect after
gdb_run_cmd with gdb_test_multiple or gdb_test throughout.
* gdb.arch/i386-size-overlap.exp: Likewise.
* gdb.arch/i386-size.exp: Likewise.
* gdb.arch/i386-unwind.exp: Likewise.
* gdb.base/a2-run.exp: Likewise.
* gdb.base/break.exp: Likewise.
* gdb.base/charset.exp: Likewise.
* gdb.base/chng-syms.exp: Likewise.
* gdb.base/commands.exp: Likewise.
* gdb.base/dbx.exp: Likewise.
* gdb.base/find.exp: Likewise.
* gdb.base/funcargs.exp: Likewise.
* gdb.base/jit-simple.exp: Likewise.
* gdb.base/reread.exp: Likewise.
* gdb.base/sepdebug.exp: Likewise.
* gdb.base/step-bt.exp: Likewise.
* gdb.cp/mb-inline.exp: Likewise.
* gdb.cp/mb-templates.exp: Likewise.
* gdb.objc/basicclass.exp: Likewise.
* gdb.threads/killed.exp: Likewise.
Diffstat (limited to 'gdb/testsuite/gdb.base/dbx.exp')
| -rw-r--r-- | gdb/testsuite/gdb.base/dbx.exp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index 06638c7..4383e79 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -258,11 +258,14 @@ proc test_assign { } { global gdb_prompt gdb_run_cmd - gdb_expect 30 { - -re "Break.* at .*:$decimal.*$gdb_prompt $" { pass "running to main" } - -re "Breakpoint \[0-9\]*, \[0-9xa-f\]* in .*$gdb_prompt $" { pass "running to main" } - -re "$gdb_prompt $" { fail "running to main" } - timeout { fail "running to main (timeout)" } + set test "running to main" + gdb_test_multiple "" $test { + -re "Break.* at .*:$decimal.*$gdb_prompt $" { + pass $test + } + -re "Breakpoint \[0-9\]*, \[0-9xa-f\]* in .*$gdb_prompt $" { + pass $test + } } send_gdb "assign first=1\n" gdb_expect { |