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

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

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 620d487..723a1f2 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2004-07-12  Andrew Cagney  <cagney@gnu.org>
 
+       * gdb.base/annota1.exp: Cleanup corefile test name.
+       * gdb.base/annota3.exp: Ditto.
+
+2004-07-12  Andrew Cagney  <cagney@gnu.org>
+
        * gdb.base/signals.exp: Clean up copyright, re-indent.
 
        * gdb.base/attach.exp: Replace send_gdb and gdb_expect with

diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index dc8ba29..0c894df 100644 (file)
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -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

diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
index 93086ef..27c0960 100644 (file)
--- a/gdb/testsuite/gdb.base/annota3.exp
+++ b/gdb/testsuite/gdb.base/annota3.exp
@@ -387,20 +387,20 @@ gdb_expect_list "signal sent" "$gdb_prompt$" {
 }
 
 
-# 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