From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun, 17 Mar 2013 20:38:50 +0000 (+0000)
Subject: gdb/testsuite/
X-Git-Tag: gdb_7_6-2013-04-26-release~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6b806b3b78588a7b8d5cd5cc869755724f6b29e;p=thirdparty%2Fbinutils-gdb.git

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 8488ca7f471..6de3c0d384c 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-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 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 $" {