From a09ae1c1e873dca08128d8c9cc225a67efd74870 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun, 17 Mar 2013 20:37:32 +0000
Subject: [PATCH] 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.

---
 gdb/testsuite/ChangeLog                     | 7 +++++++
 gdb/testsuite/gdb.base/valgrind-infcall.exp | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9d0a7c473c..8888313f24 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 5ca83d43b9..40c8464bbe 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 $" {