From a45eac6c9fd80e783ff5996d8d73993a724a27e6 Mon Sep 17 00:00:00 2001
From: chastain <chastain>
Date: Mon, 30 Jun 2003 00:12:09 +0000
Subject: [PATCH] 2003-06-29  Michael Chastain  <mec@shout.net>

	* gdb.c++/inherit.exp (test_print_svi_classes): Accept gdb
	output of '<VTT for class>' for virtual base classes.
---
 gdb/testsuite/ChangeLog           |  5 +++++
 gdb/testsuite/gdb.c++/inherit.exp | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3dd9b3cb56..fbd9483f72 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-29  Michael Chastain  <mec@shout.net>
+
+	* gdb.c++/inherit.exp (test_print_svi_classes): Accept gdb
+	output of '<VTT for class>' for virtual base classes.
+
 2003-06-29  Daniel Jacobowitz  <drow@mvista.com>
 
 	* gdb.base/completion.exp: Tab-complete "complet" instead of
diff --git a/gdb/testsuite/gdb.c++/inherit.exp b/gdb/testsuite/gdb.c++/inherit.exp
index 86c1f834f1..993bfb159c 100644
--- a/gdb/testsuite/gdb.c++/inherit.exp
+++ b/gdb/testsuite/gdb.c++/inherit.exp
@@ -704,6 +704,14 @@ proc test_print_svi_classes {} {
 	-re ".* = \{\<vA\> = \{va = 3, vx = 4\}, _vptr.vB = $hex, vb = 5, vx = 6\}$nl$gdb_prompt $" {
 	    pass "print g_vB (FIXME v3 vtbl ptr)"
 	}
+	-re ".* = \{\<vA\> = \{va = 3, vx = 4\}, _vptr.vB = $hex <VTT for vB>, vb = 5, vx = 6\}$nl$gdb_prompt $" {
+	    # Happens with gcc 3.3 -gstabs+
+	    # Does not happen with gcc 3.2.3 -gstabs+.
+	    # Does not happen gcc HEAD%20030624 (pre-3.4) -gstabs+.
+	    # -- chastain 2003-06-29
+	    pass "print g_vB"
+	}
+
 	-re ".*invalid address 0x0.*$gdb_prompt $" {
 	    # Does not happen with gcc cygnus-2.4.5-930828
 	    fail "print g_vB (known bug with gcc cygnus-2.4.5-930417)"
@@ -730,6 +738,13 @@ proc test_print_svi_classes {} {
 	-re ".* = \{\<vA\> = \{va = 7, vx = 8\}, _vptr.vC = $hex, vc = 9, vx = 10\}$nl$gdb_prompt $" {
 	    pass "print g_vC (FIXME v3 vtbl ptr)"
 	}
+	-re ".* = \{\<vA\> = \{va = 7, vx = 8\}, _vptr.vC = $hex <VTT for vC>, vc = 9, vx = 10\}$nl$gdb_prompt $" {
+	    # Happens with gcc 3.3 -gstabs+
+	    # Does not happen with gcc 3.2.3 -gstabs+.
+	    # Does not happen gcc HEAD%20030624 (pre-3.4) -gstabs+.
+	    # -- chastain 2003-06-29
+	    pass "print g_vC"
+	}
 	-re ".*$gdb_prompt $" { fail "print g_vC" }
 	timeout { fail "print g_vC (timeout)" }
     }
@@ -906,6 +921,13 @@ proc test_print_mvi_classes {} {
 	-re ".* = \{\<vB\> = \{\<vA\> = \{va = 19, vx = 20\}, _vptr.vB = $hex, vb = 21, vx = 22\}, \<vC\> = \{_vptr.vC = $hex, vc = 23, vx = 24\}, _vptr.vD = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" {
 	    pass "print g_vD (FIXME v3 vtbl ptr)"
 	}
+	-re ".* = \{\<vB\> = \{\<vA\> = \{va = 19, vx = 20\}, _vptr.vB = $hex, vb = 21, vx = 22\}, \<vC\> = \{_vptr.vC = $hex <VTT for vD>, vc = 23, vx = 24\}, _vptr.vD = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" {
+	    # Happens with gcc 3.3 -gstabs+
+	    # Does not happen with gcc 3.2.3 -gstabs+.
+	    # Does not happen gcc HEAD%20030624 (pre-3.4) -gstabs+.
+	    # -- chastain 2003-06-29
+	    pass "print g_vD"
+	}
 	-re ".*invalid address 0x0.*$gdb_prompt $" {
 	    # Does not happen with gcc cygnus-2.4.5-930828
 	    fail "print g_vD (known bug with gcc cygnus-2.4.5-930417)"
-- 
2.11.0