summaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorMichael Chastain <mec.gnu@mindspring.com>2003-12-02 17:03:30 +0000
committerMichael Chastain <mec.gnu@mindspring.com>2003-12-02 17:03:30 +0000
commit8f9d2f2ac0f0f3a122baf369f87b5bed7931393b (patch)
tree50794120eca6c5b77aa333abb0e4edc3c5206903 /gdb
parentbc32f52cbf7f56ed69ad7048bd01cba97ab21c31 (diff)
downloadgdb-8f9d2f2ac0f0f3a122baf369f87b5bed7931393b.tar.gz
2003-11-28 Michael Chastain <mec.gnu@mindspring.com>
* gdb.objc/objcdecode.exp: Match and KFAIL the output that comes from current versions of gdb. Clean up regular expressions. Delete redundant timeout case.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.objc/objcdecode.exp21
2 files changed, 21 insertions, 6 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b13f31681e6..e519b7a2e2c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2003-11-28 Michael Chastain <mec.gnu@mindspring.com>
+ * gdb.objc/objcdecode.exp: Match and KFAIL the output that comes
+ from current versions of gdb. Clean up regular expressions.
+ Delete redundant timeout case.
+
+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.
diff --git a/gdb/testsuite/gdb.objc/objcdecode.exp b/gdb/testsuite/gdb.objc/objcdecode.exp
index ab3be159f2c..e00bffeae77 100644
--- a/gdb/testsuite/gdb.objc/objcdecode.exp
+++ b/gdb/testsuite/gdb.objc/objcdecode.exp
@@ -63,15 +63,24 @@ do_objc_tests
set name "break on multiply defined method"
gdb_test_multiple "break multipleDef" $name \
{
- -re "\\\[0\\\] cancel.*\\\[1\\\] all.*\\\[2\\\] -.Decode multipleDef. at .*\\\[3\\\] multipleDef at .*" {
+ -re "\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] -.Decode multipleDef. at .*\r\n\\\[3\\\] multipleDef at .*\r\n> $" {
send_gdb "3\n"
exp_continue
}
- -re "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file *" { pass $name }
+ -re "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*\r\n$gdb_prompt $" { pass $name }
-re ".*$gdb_prompt $" { kfail "gdb/1236" $name }
- timeout { fail "$name (timeout)" }
}
-gdb_test "run" \
- "Starting program.*Breakpoint \[0-9\]+, multipleDef \\\(\\\) at .*" \
- "continue after break on multiply defined symbol"
+set name "continue after break on multiply defined symbol"
+gdb_test_multiple "run" $name \
+{
+ -re "Starting program.*Breakpoint \[0-9\]+, multipleDef \\\(\\\) at .*\r\n$gdb_prompt $" {
+ pass $name
+ }
+ -re "Starting program.*\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] -.Decode multipleDef. at .*\r\n\\\[3\\\] multipleDef at .*\r\n> $" {
+ send_gdb "0\n"
+ kfail "gdb/1238" $name
+ # gdb is in a bad state here.
+ # It would be difficult to do any more tests after this.
+ }
+}