2002-05-19 Michael Chastain <mec@shout.net>

	* gdb.c++/inherit.exp: Accept "VTT for ..." in output strings.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 37fab7958e6e0206e6f9b03346fb043ece694f65..1b4401bab644366b8e40b78c32956e854102f1f7 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-19  Michael Chastain  <mec@shout.net>
+
+       * gdb.c++/inherit.exp: Accept "VTT for ..." in output strings.
+
 2002-05-19  Elena Zannoni  <ezannoni@redhat.com>
 
         * configure.in (configdirs): Add gdb.arch.

diff --git a/gdb/testsuite/gdb.c++/inherit.exp b/gdb/testsuite/gdb.c++/inherit.exp
index e24b7f5885a864c304a274b8e2517ce0eaa80952..286c27b09f3741e5fb8aa47346a3c69aa4c678c6 100644 (file)
--- a/gdb/testsuite/gdb.c++/inherit.exp
+++ b/gdb/testsuite/gdb.c++/inherit.exp
@@ -993,7 +993,7 @@ proc test_print_mvi_classes {} {
        -re ".* = \{\<vD\> = \{\<vB\> = \{\<vA\> = \{va = 0, vx = 0\}, ${vbptr}vA = $hex, vb = 0, vx = 0\}, \<vC\> = \{${vbptr}vA = $hex, vc = 0, vx = 0\}, ${vbptr}vC = $hex, ${vbptr}vB = $hex, vd = 0, vx = 0\}, ${vbptr}vD = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" {
            pass "print g_vE"
        }
-       -re ".* = \{\<vD\> = \{\<vB\> = \{\<vA\> = \{va = 0, vx = 0\}, _vptr.vB = $hex, vb = 0, vx = 0\}, \<vC\> = \{_vptr.vC = $hex, vc = 0, vx = 0\}, _vptr.vD = $hex, vd = 0, vx = 0\}, _vptr.vE = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" {
+       -re ".* = \{\<vD\> = \{\<vB\> = \{\<vA\> = \{va = 0, vx = 0\}, _vptr.vB = $hex *(\<VTT for vD\>)?, vb = 0, vx = 0\}, \<vC\> = \{_vptr.vC = $hex *(\<VTT for vD\>)?, vc = 0, vx = 0\}, _vptr.vD = $hex, vd = 0, vx = 0\}, _vptr.vE = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" {
            pass "print g_vE (FIXME v3 vtbl ptr)"
        }
        -re ".*$gdb_prompt $" { fail "print g_vE" }