diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.objc/nondebug.exp | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6abfa24997f..b13f31681e6 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2003-11-28 Michael Chastain <mec.gnu@mindspring.com> + + * gdb.objc/nondebug.exp: Match and KFAIL the output that comes + from current versions of gdb. Clean up regular expressions. + Delete redundant timeout case. + 2003-12-01 Michael Chastain <mec.gnu@mindspring.com> Partial fix for PR testsuite/1456. diff --git a/gdb/testsuite/gdb.objc/nondebug.exp b/gdb/testsuite/gdb.objc/nondebug.exp index af9add32139..9c7a7443524 100644 --- a/gdb/testsuite/gdb.objc/nondebug.exp +++ b/gdb/testsuite/gdb.objc/nondebug.exp @@ -63,12 +63,15 @@ do_objc_tests set name "break on non-debuggable method" gdb_test_multiple "break someMethod" $name \ { - -re "\\\[0\\\] cancel.*\\\[1\\\] all.*\\\[2\\\]\[ \]+-.NonDebug someMethod.*\\\[3\\\]\[ \]+-.NonDebug2 someMethod.*" { + -re "\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\]\[ \]+-.NonDebug someMethod.*\\\[3\\\]\[ \]+-.NonDebug2 someMethod.*" { send_gdb "2\n" exp_continue } - -re "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+.*" { pass $name } + -re "\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n> " { + gdb_test "0" "" "" + kfail "gdb/1236" $name + } + -re "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+.*$gdb_prompt $" { pass $name } -re ".*$gdb_prompt $" { kfail "gdb/1236" $name } - timeout { fail "$name (timeout)" } } |