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/commands.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/commands.exp')
| -rw-r--r-- | gdb/testsuite/gdb.base/commands.exp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index 74eb306..ef86059 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -493,16 +493,7 @@ proc bp_deleted_in_command_test {} { "end commands" gdb_run_cmd - gdb_expect { - -re ".*factorial command-list executed.*$gdb_prompt $" { - pass "run factorial until breakpoint" - } - -re ".*$gdb_prompt $" { - fail "run factorial until breakpoint" - } - default { fail "(timeout) run factorial until breakpoint" } - timeout { fail "(timeout) run factorial until breakpoint" } - } + gdb_test "" "factorial command-list executed.*" "run factorial until breakpoint" } proc temporary_breakpoint_commands {} { @@ -551,12 +542,8 @@ proc temporary_breakpoint_commands {} { "end tbreak commands" gdb_run_cmd - gdb_expect { - -re ".*factorial tbreak commands executed.*$gdb_prompt $" { - pass "run factorial until temporary breakpoint" - } - timeout { fail "(timeout) run factorial until temporary breakpoint" } - } + gdb_test "" "factorial tbreak commands executed.*" \ + "run factorial until temporary breakpoint" } # Test that GDB can handle $arg0 outside of user functions without |