Fix gdb.dwarf2/staticvirtual.exp regexp.

2015-10-02  Sandra Loosemore  <sandra@codesourcery.com>

	gdb/testsuite/
	* gdb.dwarf2/staticvirtual.exp: Generalize regexp so it can match
	whether or not address 0x1000 is mapped on the target.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7e7e8f61b0547e88ebfa6f5ed7920d4668300f34..2f0779383563393d67bfd56c0a8d719c2913b46b 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-02  Sandra Loosemore  <sandra@codesourcery.com>
+
+       * gdb.dwarf2/staticvirtual.exp: Generalize regexp so it can match
+       whether or not address 0x1000 is mapped on the target.
+
 2015-09-30  Simon Marchi  <simon.marchi@ericsson.com>
 
        * gdb.python/py-type.exp: Do not run tests if binaries fail to

diff --git a/gdb/testsuite/gdb.dwarf2/staticvirtual.exp b/gdb/testsuite/gdb.dwarf2/staticvirtual.exp
index 06d46e15b1b60723f5ee210c2c39049cddbb331b..dd85b7ea793edcdcaa352dac272542ad60d0d192 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/staticvirtual.exp
+++ b/gdb/testsuite/gdb.dwarf2/staticvirtual.exp
@@ -51,4 +51,9 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} \
 }
 
 # gdb/18021: The test below would cause GDB to crash.
-gdb_test "p S::~S" "0x1000"
+# Depending on whether the target maps memory at address 0x1000,
+# on success this may either print something like
+#   $1 = {void (void)} 0x1000 <.*>
+# or
+#   Cannot access memory at address 0x1000
+gdb_test "p S::~S" "0x1000.*"