diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2002-09-18 15:34:10 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2002-09-18 15:34:10 +0000 |
| commit | 11350d2a6f73a4a510fa335553e1363857f8b84f (patch) | |
| tree | a74216547c66fb4d2a3e1c81c2102d26655211c6 /gdb/testsuite | |
| parent | 05a487dc8c398898e46d2ba52cc3e05f3f25b965 (diff) | |
| download | gdb-11350d2a6f73a4a510fa335553e1363857f8b84f.zip gdb-11350d2a6f73a4a510fa335553e1363857f8b84f.tar.gz gdb-11350d2a6f73a4a510fa335553e1363857f8b84f.tar.bz2 | |
* lib/gdb.exp (rerun_to_main): Allow restarting application.
* gdb.base/ena-dis-br.exp (rerun_to_main): Eliminate.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/ena-dis-br.exp | 24 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 4 |
3 files changed, 9 insertions, 24 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2582161..3235f08 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2002-09-18 Corinna Vinschen <vinschen@redhat.com> + + * lib/gdb.exp (rerun_to_main): Allow restarting application. + * gdb.base/ena-dis-br.exp (rerun_to_main): Eliminate. + 2002-09-17 Tom Tromey <tromey@redhat.com> * gdb.base/printcmds.exp (test_print_string_constants): Expect diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp index 40b0bda..93f6707 100644 --- a/gdb/testsuite/gdb.base/ena-dis-br.exp +++ b/gdb/testsuite/gdb.base/ena-dis-br.exp @@ -38,30 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } -proc rerun_to_main {} { - global gdb_prompt - - if [target_info exists use_gdb_stub] { - gdb_run_cmd - gdb_expect { - -re ".*Breakpoint .*main .*$gdb_prompt $"\ - {pass "rerun to main" ; return 0} - -re "$gdb_prompt $"\ - {fail "rerun to main" ; return 0} - timeout {fail "(timeout) rerun to main" ; return 0} - } - } else { - send_gdb "run\n" - gdb_expect { - -re "Starting program.*$gdb_prompt $"\ - {pass "rerun to main" ; return 0} - -re "$gdb_prompt $"\ - {fail "rerun to main" ; return 0} - timeout {fail "(timeout) rerun to main" ; return 0} - } - } -} - gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 7e4a5b1..aae7365 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1685,6 +1685,10 @@ proc rerun_to_main {} { } else { send_gdb "run\n" gdb_expect { + -re "The program .* has been started already.*y or n. $" { + send_gdb "y\n" + exp_continue + } -re "Starting program.*$gdb_prompt $"\ {pass "rerun to main" ; return 0} -re "$gdb_prompt $"\ |