aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2010-02-01 17:51:18 +0000
committerDaniel Jacobowitz <drow@false.org>2010-02-01 17:51:18 +0000
commitc593ac0e2369c486dc92648bdb0ed266e9d7271b (patch)
tree2e0cdef33bf44e183a5fc1345a04742c5ff9e2a6
parentdb25f29d62b64de9a1f2bf1bbd71bd08c5347c98 (diff)
downloadgdb-c593ac0e2369c486dc92648bdb0ed266e9d7271b.zip
gdb-c593ac0e2369c486dc92648bdb0ed266e9d7271b.tar.gz
gdb-c593ac0e2369c486dc92648bdb0ed266e9d7271b.tar.bz2
* gdb.base/bigcore.exp: Reset increased timeout.
* gdb.base/interrupt.exp: Match unexpected gdb prompt.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.base/bigcore.exp1
-rw-r--r--gdb/testsuite/gdb.base/interrupt.exp1
3 files changed, 7 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b0e7ea9..53a956a 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2010-02-01 Daniel Jacobowitz <dan@codesourcery.com>
+ * gdb.base/bigcore.exp: Reset increased timeout.
+ * gdb.base/interrupt.exp: Match unexpected gdb prompt.
+
+2010-02-01 Daniel Jacobowitz <dan@codesourcery.com>
+
* gdb.base/gcore.exp (capture_command_output): Use
gdb_test_multiple.
diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp
index bc1ff94..9bdd7c0 100644
--- a/gdb/testsuite/gdb.base/bigcore.exp
+++ b/gdb/testsuite/gdb.base/bigcore.exp
@@ -147,6 +147,7 @@ gdb_test_multiple "info program" $test {
set oldtimeout $timeout
set timeout 600
gdb_test "signal SIGABRT" "Program terminated with signal SIGABRT, .*"
+set timeout $oldtimeout
# Find the corefile
set file ""
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index a0df58f..c907896 100644
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -167,6 +167,7 @@ if ![file exists $binfile] then {
# here.
gdb_expect {
-re "^(\r\n|)data\r\n(|data\r\n)$" { pass "echo data" }
+ -re "Undefined command.*$gdb_prompt " { fail "echo data" }
timeout { fail "echo data (timeout)" }
eof { fail "echo data (eof)" }
}