From 29a3db493f8d5400ae65b5ee62aa60698702d950 Mon Sep 17 00:00:00 2001
From: "J.T. Conklin" <jtc@acorntoolworks.com>
Date: Tue, 12 Jul 1994 19:33:37 +0000
Subject: [PATCH] * gdb.base/Makefile.in: Added support for systems that name
 core   files by appending "core" to the program name. *
 gdb.base/a1-selftest.exp: Likewise.

---
 gdb/testsuite/ChangeLog                |  6 ++++++
 gdb/testsuite/gdb.base/a1-selftest.exp | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c65eba4d9bb..132cc9e673b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 12 12:22:32 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
+
+	* gdb.base/Makefile.in: Added support for systems that name core
+	  files by appending "core" to the program name.
+	* gdb.base/a1-selftest.exp: Likewise.
+
 Mon Jul 11 23:59:18 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* gdb.base/return.exp:  Add comment and message for `return double'
diff --git a/gdb/testsuite/gdb.base/a1-selftest.exp b/gdb/testsuite/gdb.base/a1-selftest.exp
index af9d836d2af..a6f4656b94b 100644
--- a/gdb/testsuite/gdb.base/a1-selftest.exp
+++ b/gdb/testsuite/gdb.base/a1-selftest.exp
@@ -429,8 +429,10 @@ GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$prompt $"\
     # force GDB to dump core.  On Solaris expect seems to not see the
     # final message, even if gdb did dump core, so we check for the
     # core dump explicitly if we time out.
-    # bsd 386 systems append the name of the program to the corefile name.
-    system rm -f core core.gdb
+    #
+    # Some systems append "core" to the name of the program; others 
+    # append the name of the program to "core".
+    system rm -f core core.gdb gdb.core
     send "maint dump-me\n"
     expect {
 	-re "maint dump-me.*Should GDB dump core.*y or n. $" {
@@ -446,7 +448,7 @@ GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$prompt $"\
 		}
 		-re "$prompt $" { fail "GDB dumped core" }
 		default { 
-		    if {[file exists core] || [file exists core.gdb]} then {
+		    if {[file exists core] || [file exists core.gdb] || [file exists gdb.core]} then {
 			pass "GDB dumped core"
 		    } else {
 			fail "GDB dumped core"
@@ -457,7 +459,7 @@ GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$prompt $"\
 	-re ".*$prompt $"       { fail "GDB dumped core" }
 	timeout	            { fail "(timeout) GDB dumped core" }
     }
-    system rm -f core core.gdb
+    system rm -f core core.gdb gdb.core
 
     # Set the timeout back to the value it had when we were called.
     set timeout $oldtimeout
-- 
2.30.2