gdb/testsuite/

	* gdb.base/valgrind-infcall.exp
	(continue #$continue_count) <remote connection closed>
	(continue #$continue_count) <valgrind vgdb has terminated>: Add kill of
	$valgrind_pid.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8488ca7f4718f5a45d2850182533ca67c26b21b1..6de3c0d384c3dc128fd494dc3e344ee8f1044f53 100644 (file)
--- 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-12  Paul Hilfinger  <hilfingr@adacore.com>
 
         * gdb.ada/expr_delims.exp: New file.

diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.exp b/gdb/testsuite/gdb.base/valgrind-infcall.exp
index 5ca83d43b94b7008d0d507548a023120bf749c39..40c8464bbe83d707fa70b57fa2677196c8da34b9 100644 (file)
--- 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 $" {