2004-02-24 Andrew Cagney <cagney@redhat.com>

	* gdb.base/corefile.exp: Use gdb_test_multiple, make "accessing
	mmapped data in core file" PASS and FAIL messages consistent.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index cb36a05..d2d78fc 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-24  Andrew Cagney  <cagney@redhat.com>
 
+       * gdb.base/corefile.exp: Use gdb_test_multiple, make "accessing
+       mmapped data in core file" PASS and FAIL messages consistent.
+
        * gdb.java/jmisc.exp: Use the fully quallified name of "main" when
        setting a breakpoint.  Work around PR java/1565.
 

diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
index d41ea7e..eb58ed2 100644 (file)
--- a/gdb/testsuite/gdb.base/corefile.exp
+++ b/gdb/testsuite/gdb.base/corefile.exp
@@ -222,22 +222,16 @@ gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up in corefile.exp"
 
 gdb_test "x/8bd buf1" ".*:.*0.*1.*2.*3.*4.*5.*6.*7" "accessing original mmap data in core file"
 setup_xfail "*-*-sunos*" "*-*-ultrix*" "*-*-aix*"
-send_gdb "x/8bd buf2\n"
-gdb_expect {
+set test "accessing mmapped data in core file"
+gdb_test_multiple "x/8bd buf2" "$test" {
     -re ".*:.*0.*1.*2.*3.*4.*5.*6.*7.*$gdb_prompt $" {
-       pass "accessing mmapped data in core file"
+       pass "$test"
     }
     -re "0x\[f\]*:.*Cannot access memory at address 0x\[f\]*.*$gdb_prompt $" {
-       fail "accessing mmapped data (mapping failed at runtime)"
+       fail "$test (mapping failed at runtime)"
     }
     -re "0x.*:.*Cannot access memory at address 0x.*$gdb_prompt $" {
-       fail "accessing mmapped data (mapping address not found in core file)"
-    }
-    -re ".*$gdb_prompt $" {
-       fail "accessing mmapped data (incorrect data found in core file)"
-    }
-    timeout {
-       fail "accessing mmapped data (timeout)"
+       fail "$test (mapping address not found in core file)"
     }
 }