* gdb.base/display.exp: Don't kill running stub. Add "again" to

	the second kill and detach messages.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 71af354e3c5611421c1cb85a5b5659304829bb8a..6be7ded533840a12fd62d07546a6cc3a8386dc80 100644 (file)
--- 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 37007487b06a893794cbec4e204f9e8e6d267ba1..e7f131bc95a062a650bfbe144a92c3b845d03555 100644 (file)
--- 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