From c593ac0e2369c486dc92648bdb0ed266e9d7271b Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Mon, 1 Feb 2010 17:51:18 +0000 Subject: [PATCH] * gdb.base/bigcore.exp: Reset increased timeout. * gdb.base/interrupt.exp: Match unexpected gdb prompt. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/bigcore.exp | 1 + gdb/testsuite/gdb.base/interrupt.exp | 1 + 3 files changed, 7 insertions(+) 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 + * gdb.base/bigcore.exp: Reset increased timeout. + * gdb.base/interrupt.exp: Match unexpected gdb prompt. + +2010-02-01 Daniel Jacobowitz + * 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)" } } -- 2.7.4