summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog7
-rw-r--r--gdb/testsuite/gdb.base/valgrind-infcall.exp4
2 files changed, 11 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9d0a7c473c3..8888313f247 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-17 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * gdb.base/valgrind-infcall.exp
+ (continue #$continue_count) <remote connection closed>
+ (continue #$continue_count) <valgrind vgdb has terminated>: Add kill of
+ $valgrind_pid.
+
2013-03-15 Tom Tromey <tromey@redhat.com>
* gdb.cp/overload.cc (intintfunc): New.
diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.exp b/gdb/testsuite/gdb.base/valgrind-infcall.exp
index 5ca83d43b94..40c8464bbe8 100644
--- a/gdb/testsuite/gdb.base/valgrind-infcall.exp
+++ b/gdb/testsuite/gdb.base/valgrind-infcall.exp
@@ -101,10 +101,14 @@ while {$loop && $continue_count < 100} {
}
-re "Remote connection closed.*\r\n$gdb_prompt $" {
fail "$test (remote connection closed)"
+ # Only if valgrind got stuck.
+ remote_exec host "kill -9 ${valgrind_pid}"
return -1
}
-re "The program is not being run\\.\r\n$gdb_prompt $" {
fail "$test (valgrind vgdb has terminated)"
+ # Only if valgrind got stuck.
+ remote_exec host "kill -9 ${valgrind_pid}"
return -1
}
-re "\r\n$gdb_prompt $" {