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

	* gdb.base/signull.exp (test_segv): Prefix all tests with
	"${name}".  Clean up test messages.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8eaf01a5442d645c972759171c84e9181cfbac1d..2550ca5bad4b9d60ca15af3c8e3b91982dbbb4f4 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-13  Andrew Cagney  <cagney@gnu.org>
 
+       * gdb.base/signull.exp (test_segv): Prefix all tests with
+       "${name}".  Clean up test messages.
+
        * gdb.base/annota3.exp, gdb.base/annota1.exp: Update copyright.
 
        * gdb.base/ena-dis-br.exp: Update copyright.

diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp
index 8dc91640cd23340a699143ff8977446f0bfdca7a..59b1a5647e6c42f97f415085d6d2b2ff3464dd32 100644 (file)
--- a/gdb/testsuite/gdb.base/signull.exp
+++ b/gdb/testsuite/gdb.base/signull.exp
@@ -101,18 +101,20 @@ gdb_test "handle SIGSEGV" "SIGSEGV.*Yes.*Yes.*Yes.*Segmentation fault"
 # through the SEGV works.
 
 proc test_segv { name tag bt_from_segv bt_from_keeper } {
-    gdb_test continue "Breakpoint.* bowler.*" "${name} starts with the bowler"
-    gdb_test "set test = $tag"
-    gdb_test continue "Program received signal SIGSEGV.*" "${name} got SEGV"
-    gdb_test backtrace $bt_from_segv "backtrace segv for ${name}"
-    gdb_test continue "Breakpoint.* keeper.*" "${name} through to keeper"
-    gdb_test backtrace $bt_from_keeper "backtrace keeper for ${name}"
+    gdb_test continue "Breakpoint.* bowler.*" "${name}; start with the bowler"
+    # NB: Don't use $tag in the testname - changes across systems.
+    gdb_test "set test = $tag" "" "${name}; select the pointer type"
+    gdb_test continue "Program received signal SIGSEGV.*" \
+       "${name}; take the SIGSEGV"
+    gdb_test backtrace $bt_from_segv "${name}; backtrace from SIGSEGV"
+    gdb_test continue "Breakpoint.* keeper.*" "${name}; continue to the keeper"
+    gdb_test backtrace $bt_from_keeper "${name}; backtrace from keeper through SIGSEGV"
 }
 
-test_segv data-read data_read \
+test_segv "data read" data_read \
     {#0 .* bowler .*#1  .* main .*} \
     {#0 .* keeper .*#1  .* handler .*#2 .* bowler .*#3  .* main .*}
-test_segv data-write data_write \
+test_segv "data write" data_write \
     {#0 .* bowler .*#1  .* main .*} \
     {#0 .* keeper .*#1  .* handler .*#2 .* bowler .*#3  .* main .*}
 test_segv code $function_pointer \