diff options
| author | Jim Kingdon <jkingdon@engr.sgi.com> | 1994-12-22 00:32:15 +0000 |
|---|---|---|
| committer | Jim Kingdon <jkingdon@engr.sgi.com> | 1994-12-22 00:32:15 +0000 |
| commit | 9b826d6df6c9d126b9e52e2c4b3eabfc3589eb0d (patch) | |
| tree | 65d557dd9ac91f21c35de7cf4e6a56e73a6e896a | |
| parent | 62b32254f363730a11b9a4cb376ff4e6161646ba (diff) | |
| download | gdb-9b826d6df6c9d126b9e52e2c4b3eabfc3589eb0d.zip gdb-9b826d6df6c9d126b9e52e2c4b3eabfc3589eb0d.tar.gz gdb-9b826d6df6c9d126b9e52e2c4b3eabfc3589eb0d.tar.bz2 | |
* gdb.base/list.exp (test_forward_search): Set timeout higher
when we'll be getting lots of output from gdb.
* gdb.base/a1-selftest.exp: Move code that was inside expect -re
"init_malloc" to after the expect statement. Run it if that
regexp is taken, but also for two others which happen if source
cannot be found.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/a1-selftest.exp | 57 |
2 files changed, 48 insertions, 19 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 37bd3a4..94caad8e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,13 @@ +Wed Dec 21 12:51:37 1994 Jim Kingdon <kingdon@deneb.cygnus.com> + + * gdb.base/list.exp (test_forward_search): Set timeout higher + when we'll be getting lots of output from gdb. + + * gdb.base/a1-selftest.exp: Move code that was inside expect -re + "init_malloc" to after the expect statement. Run it if that + regexp is taken, but also for two others which happen if source + cannot be found. + Tue Dec 20 12:35:21 1994 Jim Kingdon (kingdon@lioth.cygnus.com) * gdb.base/printcmds.exp: New test, for printing register before diff --git a/gdb/testsuite/gdb.base/a1-selftest.exp b/gdb/testsuite/gdb.base/a1-selftest.exp index 5cf6d53..6e4e2ea 100644 --- a/gdb/testsuite/gdb.base/a1-selftest.exp +++ b/gdb/testsuite/gdb.base/a1-selftest.exp @@ -221,13 +221,34 @@ proc test_with_self {} { # now jump over a few functions set description "next over get_run_time and everything it calls" + set got_over_get_run_time 0 send "next\n" expect { -re ".*init_malloc.*$prompt $" { pass "$description" - set description "next over init_malloc and everything it calls" - send "next\n" - expect { + set got_over_get_run_time 1 + } + -re ".*No such file or directory.\r\n$prompt $" { + pass "$description (no source available)" + set got_over_get_run_time 1 + } + -re ".*A file or directory .* does not exist..\r\n$prompt $" { + pass "$description (no source available)" + set got_over_get_run_time 1 + } + -re ".*$prompt $" { + fail "$description" + } + timeout { + fail "$description (timeout)" + } + } + # -re "if \(setmp \(to_top_level\)\).*$prompt $" { pass "first next" } + + if $got_over_get_run_time then { + set description "next over init_malloc and everything it calls" + send "next\n" + expect { -re "if.*SET_TOP_LEVEL.*$prompt $" { pass "$description" } @@ -254,24 +275,22 @@ proc test_with_self {} { } } } - } - } - } - -re ".*No such file or directory.\r\n$prompt $" { - pass "$description (no source available)" - } - -re ".*A file or directory .* does not exist..\r\n$prompt $" { - pass "$description (no source available)" - } - -re ".*$prompt $" { - fail "$description" - } - timeout { - fail "$description (timeout)" + } + -re ".*No such file or directory.\r\n$prompt $" { + pass "$description (no source available)" + } + -re ".*A file or directory .* does not exist..\r\n$prompt $" { + pass "$description (no source available)" + } + -re ".*$prompt $" { + fail "$description" + } + default { + fail "$description (timeout or eof)" + } } } - # -re "if \(setmp \(to_top_level\)\).*$prompt $" { pass "first next" } - + # This one fails on Solaris (for some versions of gdb) because you # can't next over library functions setup_xfail "sparc-sun-solaris2" 1817 |