From 1aca8eb7fa344f6ebb2bd039307113012da7de4f Mon Sep 17 00:00:00 2001
From: Nicholas Duffek <nsd@redhat.com>
Date: Fri, 17 Nov 2000 17:13:33 +0000
Subject: [PATCH] 	* gdb.base/display.exp: Don't kill running stub.  Add
 "again" to 	the second kill and detach messages.

---
 gdb/testsuite/ChangeLog            |  5 +++++
 gdb/testsuite/gdb.base/display.exp | 27 ++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 71af354e3c5..6be7ded5338 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-17  Nick Duffek  <nsd@redhat.com>
+
+	* gdb.base/display.exp: Don't kill running stub.  Add "again" to
+	the second kill and detach messages.
+
 2000-11-17  Nick Duffek  <nsd@redhat.com>
 
 	* configure.in: Add AC_EXEEXT.
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index 37007487b06..e7f131bc95a 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -49,22 +49,23 @@ gdb_load ${binfile}
 
 # Some coverage stuff
 #
-gdb_test "kill" ".*The program is not being run.*"
-gdb_test "detach" ".*"
-gdb_test "run" ".*"
-
-gdb_load ${binfile}
-gdb_test "kill" ".*"
-gdb_test "detach" ".*"
+if ![target_info exists use_gdb_stub] {
+    gdb_test "kill" ".*The program is not being run.*"
+    gdb_test "detach" ".*"
+    gdb_test "run" ".*"
+
+    gdb_load ${binfile}
+    gdb_test "kill" ".*" "kill again"
+    gdb_test "detach" ".*" "detach again"
+
+    gdb_exit
+    gdb_start
+    gdb_reinitialize_dir $srcdir/$subdir
+    gdb_load ${binfile}
+}
 
 # Ok, on to real life
 #
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 if ![runto_main] then {
     fail "Could not run to main - other tests will fail."
     continue
-- 
2.30.2