[commit] cleanup annota*.exp ``cleanup core file'' messages

[Andrew Cagney <cagney@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

Hello,

Dependant on your system, and how other tests went, the annota[13].exp 
tests output different ``cleanup core file'' messages.  This fixes that.

committed,
Andrew

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 2323 bytes --]

2004-07-12  Andrew Cagney  <cagney@gnu.org>

	* gdb.base/annota1.exp: Cleanup corefile test name.
	* gdb.base/annota3.exp: Ditto.

Index: gdb.base/annota1.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota1.exp,v
retrieving revision 1.13
diff -p -u -r1.13 annota1.exp
--- gdb.base/annota1.exp	6 Nov 2003 20:50:47 -0000	1.13
+++ gdb.base/annota1.exp	12 Jul 2004 21:37:52 -0000
@@ -459,20 +459,20 @@ gdb_expect {
 }
 
 
-# Check for production of a core file
-# and remove it!
+# Check for production of a core file and remove it!
 
 set exec_output [remote_exec build "ls core"]
 
+set test "cleanup core file"
 if [ regexp "core not found" $exec_output]  {
-    pass "No core dumped"
+    pass "$test (not dumped)"
 } else {
-  if [ regexp "No such file or directory" $exec_output] {
-      pass "No core dumped"
-  } else {
-      remote_exec build "rm -f core"
-      pass "Core dumped and removed"
-  }
+    if [ regexp "No such file or directory" $exec_output] {
+	pass "$test (not dumped)"
+    } else {
+	remote_exec build "rm -f core"
+	pass "$test (removed)"
+    }
 }
 
 # restore the original prompt for the rest of the testsuite
Index: gdb.base/annota3.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota3.exp,v
retrieving revision 1.2
diff -p -u -r1.2 annota3.exp
--- gdb.base/annota3.exp	17 Aug 2003 16:50:59 -0000	1.2
+++ gdb.base/annota3.exp	12 Jul 2004 21:37:52 -0000
@@ -387,20 +387,20 @@ gdb_expect_list "signal sent" "$gdb_prom
 }
 
 
-# Check for production of a core file
-# and remove it!
+# Check for production of a core file and remove it!
 
 set exec_output [remote_exec build "ls core"]
 
+set test "cleanup core file"
 if [ regexp "core not found" $exec_output]  {
-    pass "No core dumped"
+    pass "$test (not dumped)"
 } else {
-  if [ regexp "No such file or directory" $exec_output] {
-      pass "No core dumped"
-  } else {
-      remote_exec build "rm -f core"
-      pass "Core dumped and removed"
-  }
+    if [ regexp "No such file or directory" $exec_output] {
+	pass "$test (not dumped)"
+    } else {
+	remote_exec build "rm -f core"
+	pass "$test (removed)"
+    }
 }
 
 # restore the original prompt for the rest of the testsuite