This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch/testsuite/cp] inherit.exp: rewrite


Here is another overhaul in gdb.cp.  This time it's gdb.cp/inherit.exp.

I got interested in this file because the anonymous union test
crashes gdb on hp-ux with the hp-ux c++ compiler.

I tested this on native i686-pc-linux-gnu, gcc 2.95.3 3.3.2 HEAD,
dwarf-2 and stabs+.  All results are identical to the previous version.

I also tested on native hppa2.0w-hp-hpux11.11 with hp acc A.03.45.
All results are identical to the previous version up to the point
where gdb crashes.  After the first "ERROR: process no longer exists",
the test script wigs out a little differently than it used to.

Later on, someone can rip out the quaint "(obsolete gcc or gdb)"
and "(aCC)" decorations.

I will give this 24 hours for comment and then commit it.

Michael C

2004-01-27  Michael Chastain  <mec.gnu@mindspring.com>

	* gdb.cp/inherit.exp: Rewrite.  Use gdb_test_multiple and gdb
	for all tests.  Remove old hp-ux and cygnus xfail cases.

Index: inherit.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/inherit.exp,v
retrieving revision 1.1
diff -c -3 -p -r1.1 inherit.exp
*** inherit.exp	23 Aug 2003 03:55:59 -0000	1.1
--- inherit.exp	28 Jan 2004 04:39:30 -0000
***************
*** 1,5 ****
! # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
! # Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,5 ----
! # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
! # 2004 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 19,965 ****
  # bug-gdb@prep.ai.mit.edu
  
  # This file was written by Fred Fish. (fnf@cygnus.com)
  
! set ws "\[\r\n\t \]+"
! set nl "\[\r\n\]+"
! 
! # The format of a g++ virtual base pointer.
! set vbptr "(_vb\[$.\]|__vb_)\[0-9\]?"
  
  if $tracelevel then {
! 	strace $tracelevel
  }
  
  if { [skip_cplus_tests] } { continue }
  
- # Note - create separate "inherit" executable from misc.cc
- 
  set testfile "inherit"
  set srcfile misc.cc
  set binfile ${objdir}/${subdir}/${testfile}
  
- 
- # Create and source the file that provides information about the compiler
- # used to compile the test case.
- 
- if [get_compiler_info ${binfile} "c++"] {
-     return -1
- }
- 
  if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
       gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
  }
  
- #
- # Single inheritance, print individual members.
- #
- 
- proc test_print_si_members {} {
-     # Print all members of g_A using fully qualified form.
- 
-     gdb_test "print g_A.A::a" ".* = 1" "print g_A.A::a"
- 
-     gdb_test "print g_A.A::x" ".* = 2" "print g_A.A::x"
- 
-     # Print members of g_A using nonambiguous compact form.
- 
-     gdb_test "print g_A.a" ".* = 1" "print g_A.a"
- 
-     gdb_test "print g_A.x" ".* = 2" "print g_A.x"
- 
-     # Print all members of g_B using fully qualified form.
- 
-     gdb_test "print g_B.A::a" ".* = 3" "print g_B.A::a"
- 
-     gdb_test "print g_B.A::x" ".* = 4" "print g_B.A::x"
- 
-     gdb_test "print g_B.B::b" ".* = 5" "print g_B.B::b"
- 
-     gdb_test "print g_B.B::x" ".* = 6" "print g_B.B::x"
- 
-     # Print members of g_B using nonambiguous compact form.
- 
-     gdb_test "print g_B.a" ".* = 3" "print g_B.a"
- 
-     gdb_test "print g_B.b" ".* = 5" "print g_B.b"
- 
-     gdb_test "print g_B.x" ".* = 6" "print g_B.x"
- 
-     # Print all members of g_C using fully qualified form.
- 
-     gdb_test "print g_C.A::a" ".* = 7" "print g_C.A::a"
- 
-     gdb_test "print g_C.A::x" ".* = 8" "print g_C.A::x"
- 
-     gdb_test "print g_C.C::c" ".* = 9" "print g_C.C::c"
- 
-     gdb_test "print g_C.C::x" ".* = 10" "print g_C.C::x"
- 
-     # Print members of g_C using nonambiguous compact form.
- 
-     gdb_test "print g_C.a" ".* = 7" "print g_C.a"
- 
-     gdb_test "print g_C.c" ".* = 9" "print g_C.c"
- 
-     gdb_test "print g_C.x" ".* = 10" "print g_C.x"
- }
- 
- #
  # Single inheritance, print type definitions.
- #
  
! proc test_ptype_si {} {
      global gdb_prompt
      global ws
      global nl
-     global hp_aCC_compiler
  
      # Print class A as a type.
  
!     send_gdb "ptype A\n"
!     gdb_expect {
! 	-re "type = class A \{$nl.*\[ \]*int a;$nl\[ \]*int x;$nl.*\[ \]*\}$nl$gdb_prompt $" {
! 	    pass "ptype A (FIXME)"
! 	}
! 	-re "type = struct A \{$nl\[ \]*int a;$nl\[ \]*int x;$nl\[ \]*\}$nl$gdb_prompt $" {
! 	    setup_xfail "*-*-*"
! 	    fail "ptype A (FIXME)"
  	}
- 	-re ".*$gdb_prompt $" { fail "ptype A" }
- 	timeout { fail "ptype A (timeout)" ; return }
      }
  
      # Print class A as an explicit class.
  
!     send_gdb "ptype class A\n"
!     gdb_expect {
! 	-re "type = class A \{$nl.*\[ \]*int a;$nl\[ \]*int x;$nl.*\[ \]*\}$nl$gdb_prompt $" {
! 	    pass "ptype class A (FIXME)"
! 	}
! 	-re "type = struct A \{$nl\[ \]*int a;$nl\[ \]*int x;$nl\[ \]*\}$nl$gdb_prompt $" {
!             if {!$hp_aCC_compiler} {setup_xfail "*-*-*"}
! 	    fail "ptype class A (FIXME)"
  	}
- 	-re ".*$gdb_prompt $" { fail "ptype class A" }
- 	timeout { fail "ptype class A (timeout)" ; return }
      }
  
      # Print type of an object of type A.
  
!     send_gdb "ptype g_A\n"
!     gdb_expect {
! 	-re "type = class A \{$nl.*\[ \]*int a;$nl\[ \]*int x;$nl.*\[ \]*\}$nl$gdb_prompt $" {
! 	    pass "ptype g_A (FIXME)"
! 	}
! 	-re "type = struct A \{$nl\[ \]*int a;$nl\[ \]*int x;$nl\[ \]*\}$nl$gdb_prompt $" {
!             if {!$hp_aCC_compiler} {setup_xfail "*-*-*"}
! 	    fail "ptype g_A (FIXME)"
  	}
- 	-re ".*$gdb_prompt $" { fail "ptype g_A" }
- 	timeout { fail "ptype g_A (timeout)" ; return }
      }
  
      # Print class B as a type.
  
!     gdb_test "ptype B" "type = class B : public A \{$nl\[ \]*public:$nl\[ \]*int b;$nl\[ \]*int x;$nl.*\}" "ptype B"
  
      # Print class B as an explicit class.
  
!     gdb_test "ptype class B" "type = class B : public A \{$nl\[ \]*public:$nl\[ \]*int b;$nl\[ \]*int x;$nl.*\}" "ptype class B"
  
      # Print type of an object of type B.
  
!     gdb_test "ptype g_B" "type = class B : public A \{$nl\[ \]*public:$nl\[ \]*int b;$nl\[ \]*int x;$nl.*\}" "ptype g_B"
  
      # Print class C as a type.
  
!     gdb_test "ptype C" "type = class C : public A \{$nl\[ \]*public:$nl\[ \]*int c;$nl\[ \]*int x;$nl.*\}" "ptype C"
  
      # Print class C as an explicit class.
  
!     gdb_test "ptype class C" "type = class C : public A \{$nl\[ \]*public:$nl\[ \]*int c;$nl\[ \]*int x;$nl.*\}" "ptype class C"
  
      # Print type of an object of type g_C.
  
!     gdb_test "ptype g_C" "type = class C : public A \{$nl\[ \]*public:$nl\[ \]*int c;$nl\[ \]*int x;$nl.*\}" "ptype g_C"
! 
!     # gcc cygnus-2.3.3 (Q1) has this bug, but it was fixed as of
!     # cygnus-2.3.3-930417.  PR 2819.
!     send_gdb "ptype tagless_struct\n"
!     gdb_expect {
! 	-re "type = class \{${ws}public:${ws}int one;${ws}int two;${ws}tagless_struct & operator=\\(tagless_struct (const ?)?&\\);${ws}tagless_struct\\(tagless_struct (const ?)?&\\);${ws}tagless_struct\\(\\);${ws}\}$nl$gdb_prompt $" {
! 	    pass "ptype tagless struct"
! 	}
! 	-re "type = class \{${ws}public:${ws}int one;${ws}int two;;${ws}\}$nl$gdb_prompt $" {
! 	    pass "ptype tagless struct"
! 	}
! 	-re "type = (struct|class).*\{.*int one;.*int two;.*\}$nl$gdb_prompt $" {
! 	    pass "ptype tagless struct (obsolete gcc or gdb)"
! 	}
! 	-re ".*$gdb_prompt $" {
! 	    fail "ptype tagless struct"
! 	}
! 	timeout {
! 	    fail "ptype tagless struct (timeout)"
  	}
      }
  
!     send_gdb "ptype v_tagless\n"
!     gdb_expect {
! 	-re "type = class \{${ws}public:${ws}int one;${ws}int two;${ws}tagless_struct & operator=\\(tagless_struct (const ?)?&\\);${ws}tagless_struct\\(tagless_struct (const ?)?&\\);${ws}tagless_struct\\(\\);${ws}\}$nl$gdb_prompt $" {
! 	    pass "ptype variable of type tagless struct"
! 	}
! 	-re "type = class \{${ws}public:${ws}int one;${ws}int two;;${ws}\}$nl$gdb_prompt $" {
! 	    pass "ptype tagless struct"
! 	}
! 	-re "type = (struct|class).*\{.*int one;.*int two;.*\}$nl$gdb_prompt $" {
! 	    pass "ptype variable of type tagless struct (obsolete gcc or gdb)"
! 	}
! 	-re ".*$gdb_prompt $" {
! 	    fail "ptype variable of type tagless struct"
! 	}
! 	timeout {
! 	    fail "ptype variable of type tagless struct (timeout)"
  	}
      }
- }
- 
- #
- # Single inheritance, print complete classes.
- #
- 
- proc test_print_si_classes {} {
-     # Print all members of g_A.
- 
-     gdb_test "print g_A" ".* = \{a = 1, x = 2\}" "print g_A"
- 
-     # Print all members of g_B.
  
!     gdb_test "print g_B" ".* = \{\<(class |)A\> = \{a = 3, x = 4\}, b = 5, x = 6\}" "print g_B"
! 
!     # Print all members of g_C.
! 
!     gdb_test "print g_C" ".* = \{\<(class |)A\> = \{a = 7, x = 8\}, c = 9, x = 10\}" "print g_C"
  }
  
! #
! # Single inheritance, print anonymous unions.
! # GDB versions prior to 4.14 entered an infinite loop when printing
! # the type of a class containing an anonymous union, and they were also
! # incapable of printing the member of an anonymous union.
! # We test the printing of the member first, and perform the other tests
! # only if the test succeeds, to avoid the infinite loop.
! #
  
! proc test_print_anon_union {} {
      global gdb_prompt
      global ws
      global nl
  
!     gdb_test "print g_anon_union.a" ".* = 2" "print anonymous union member"
!     send_gdb "print g_anon_union\n"
!     gdb_expect {
! 	-re ".* = \{one = 1, ( = |)\{a = 2, b = 2\}\}$nl$gdb_prompt $" {
! 	    pass "print variable of type anonymous union"
  	}
! 	-re ".* = .*\{one = 1, ( = |)\{a = 2, b = .*\}\}$nl$gdb_prompt $" {
! 	    pass "print variable of type anonymous union (obsolete gcc or gdb)"
  	}
! 	-re ".*$nl$gdb_prompt $" {
! 	    fail "print variable of type anonymous union"
  	}
! 	timeout {
! 	    fail "print variableof type anonymous union (timeout)"
  	}
      }
!     send_gdb "ptype g_anon_union\n"
!     gdb_expect {
! 	-re "type = class class_with_anon_union \{${ws}public:${ws}int one;${ws}union \{${ws}public:${ws}int a;${ws}long int b;${ws}union \{\.\.\.\} & operator=\\(union \{\.\.\.\} &\\);${ws}\\\$_0 \\(union \{\.\.\.\} &\\);${ws}\\\$_0 \\(\\);${ws}\};${ws}class_with_anon_union & operator=\\(class_with_anon_union const &\\);${ws}class_with_anon_union\\(class_with_anon_union const &\\);${ws}class_with_anon_union\\(void\\);${ws}\}$nl$gdb_prompt $" {
! 	    pass "print type of anonymous union"
  	}
! 	-re "type = class class_with_anon_union \{${ws}public:${ws}int one;${ws}union \{${ws}int a;${ws}long int b;${ws}\};${ws}class_with_anon_union & operator=\\(class_with_anon_union const ?&\\);${ws}class_with_anon_union\\(class_with_anon_union const ?&\\);${ws}class_with_anon_union\\((void|)\\);${ws}\}$nl$gdb_prompt $" {
! 	    pass "print type of anonymous union"
  	}
! 	-re "type = class class_with_anon_union \{${ws}public:${ws}int one;${ws}union \{${ws}int a;${ws}long int b;${ws}\};${ws}\}$nl$gdb_prompt $" {
! 	    pass "print type of anonymous union"
  	}
! 	-re "type = (struct|class).*\{.*int one;.*union \{.*int a;.*(long|long int|int) b;.*\};.*\}$nl$gdb_prompt $" {
! 	    pass "print type of anonymous union (obsolete gcc or gdb)"
  	}
! 	-re ".*$nl$gdb_prompt $" {
! 	    fail "print type of anonymous union"
  	}
! 	timeout {
! 	    fail "print type of anonymous union (timeout)"
  	}
      }
  }
  
! #
! # Multiple inheritance, print individual members.
! #
  
! proc test_print_mi_members {} {
      global gdb_prompt
      global nl
-     global hp_aCC_compiler
- 
-     # Print all members of g_A.
  
!     gdb_test "print g_A.A::a" ".* = 1" "print g_A.A::a"
!     
!     gdb_test "print g_A.A::x" ".* = 2" "print g_A.A::x"
  
!     # Print all members of g_B.
  
!     gdb_test "print g_B.A::a" ".* = 3" "print g_B.A::a"
  
!     gdb_test "print g_B.A::x" ".* = 4" "print g_B.A::x"
  
!     gdb_test "print g_B.B::b" ".* = 5" "print g_B.B::b"
  
!     gdb_test "print g_B.B::x" ".* = 6" "print g_B.B::x"
  
!     # Print all members of g_C.
  
!     gdb_test "print g_C.A::a" ".* = 7" "print g_C.A::a"
  
!     gdb_test "print g_C.A::x" ".* = 8" "print g_C.A::x"
  
!     gdb_test "print g_C.C::c" ".* = 9" "print g_C.C::c"
  
!     gdb_test "print g_C.C::x" ".* = 10" "print g_C.C::x"
  
!     # Print all members of g_D.
  
!     # The following is ambiguous, and gdb should detect this.
!     # For now, accept gdb's behavior as an expected failure if it
!     # simply prints either member correctly.
! 
!     send_gdb "print g_D.A::a\n"
!     gdb_expect {	
! 	-re "warning: A ambiguous; using D::C::A. Use a cast to disambiguate.$nl\\$\[0-9\]* = 15$nl$gdb_prompt $" {
! 	    pass "print g_D.A::a"
  	}
! 	-re "warning: A ambiguous; using D::B::A. Use a cast to disambiguate.$nl\\$\[0-9\]* = 11$nl$gdb_prompt $" {
! 	    pass "print g_D.A::a (using B)"
  	}
! 	-re ".* = 15$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_D.A::a"
  	}
! 	-re ".* = 11$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_D.A::a"
  	}
- 	-re ".*$gdb_prompt $" { fail "print g_D.A::a" }
- 	timeout { fail "print g_D.A::a (timeout)" ; return }
      }
  
!     # The following is ambiguous, and gdb should detect this.
!     # For now, accept gdb's behavior as an expected failure if it
!     # simply prints either member correctly.
! 
!     send_gdb "print g_D.A::x\n"
!     gdb_expect {
! 	-re "warning: A ambiguous; using D::C::A. Use a cast to disambiguate.$nl\\$\[0-9\]* = 16$nl$gdb_prompt $" {
! 	    pass "print g_D.A::x"
  	}
! 	-re "warning: A ambiguous; using D::B::A. Use a cast to disambiguate.$nl\\$\[0-9\]* = 12$nl$gdb_prompt $" {
! 	    pass "print g_D.A::x (using B)"
  	}
! 	-re ".* = 16$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_D.A::x"
  	}
! 	-re ".* = 12$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_D.A::x"
  	}
- 	-re ".*$gdb_prompt $" { fail "print g_D.A::x" }
- 	timeout { fail "print g_D.A::x (timeout)" ; return }
      }
  
!     gdb_test "print g_D.B::b" ".* = 13" "print g_D.B::b"
! 
!     gdb_test "print g_D.B::x" ".* = 14" "print g_D.B::x"
! 
!     gdb_test "print g_D.C::c" ".* = 17" "print g_D.C::c"
  
!     gdb_test "print g_D.C::x" ".* = 18" "print g_D.C::x"
  
!     gdb_test "print g_D.D::d" ".* = 19" "print g_D.D::d"
  
!     gdb_test "print g_D.D::x" ".* = 20" "print g_D.D::x"
  
!     # Print all members of g_E.
  
!     # The following is ambiguous, and gdb should detect this.
!     # For now, accept gdb's behavior as an expected failure if it
!     # simply prints either member correctly.
! 
!     send_gdb "print g_E.A::a\n"
!     gdb_expect {
! 	-re ".* = 21$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_E.A::a"
  	}
! 	-re ".* = 25$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_E.A::a"
  	}
- 	-re ".*$gdb_prompt $" { fail "print g_E.A::a" }
- 	timeout { fail "print g_E.A::a (timeout)" ; return }
      }
  
!     # The following is ambiguous, and gdb should detect this.
!     # For now, accept gdb's behavior as an expected failure if it
!     # simply prints either member correctly.
! 
!     send_gdb "print g_E.A::x\n"
!     gdb_expect {
! 	-re "warning: A ambiguous; using E::D::C::A. Use a cast to disambiguate.$nl\\$\[0-9\]* = 26$nl$gdb_prompt $" {
! 	    pass "print g_E.A::x"
  	}
! 	-re "warning: A ambiguous; using E::D::B::A. Use a cast to disambiguate.$nl\\$\[0-9\]* = 22$nl$gdb_prompt $" {
! 	    pass "print g_E.A::x (using B)"
  	}
! 	-re ".* = 26$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_E.A::x"
  	}
! 	-re ".* = 22$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_E.A::x"
  	}
- 	-re ".*$gdb_prompt $" { fail "print g_E.A::x" }
- 	timeout { fail "print g_E.A::x (timeout)" ; return }
      }
  
!     gdb_test "print g_E.B::b" ".* = 23" "print g_E.B::b"
! 
!     gdb_test "print g_E.B::x" ".* = 24" "print g_E.B::x"
! 
!     gdb_test "print g_E.C::c" ".* = 27" "print g_E.C::c"
  
!     gdb_test "print g_E.C::x" ".* = 28" "print g_E.C::x"
  
!     gdb_test "print g_E.D::d" ".* = 29" "print g_E.D::d"
  
!     gdb_test "print g_E.D::x" ".* = 30" "print g_E.D::x"
  
!     gdb_test "print g_E.E::e" ".* = 31" "print g_E.E::e"
  
!     gdb_test "print g_E.E::x" ".* = 32" "print g_E.E::x"
  }
  
! #
! # Multiple inheritance, print type definitions.
! #
  
! proc test_ptype_mi {} {
!     global nl
  
!     gdb_test "ptype D" "type = class D : public B, public C \{$nl\[ \]*public:$nl\[ \]*int d;$nl\[ \]*int x;$nl.*\}" "ptype D"
  
!     gdb_test "ptype class D" "type = class D : public B, public C \{$nl\[ \]*public:$nl\[ \]*int d;$nl\[ \]*int x;$nl.*\}" "ptype class D"
  
!     gdb_test "ptype g_D" "type = class D : public B, public C \{$nl\[ \]*public:$nl\[ \]*int d;$nl\[ \]*int x;$nl.*\}" "ptype g_D"
  
!     gdb_test "ptype E" "type = class E : public D \{$nl\[ \]*public:$nl\[ \]*int e;$nl\[ \]*int x;$nl.*\}" "ptype E"
  
!     gdb_test "ptype class E" "type = class E : public D \{$nl\[ \]*public:$nl\[ \]*int e;$nl\[ \]*int x;$nl.*\}" "ptype class E"
  
!     gdb_test "ptype g_E" "type = class E : public D \{$nl\[ \]*public:$nl\[ \]*int e;$nl\[ \]*int x;$nl.*\}" "ptype g_E"
  }
  
! #
! # Multiple inheritance, print complete classes.
! #
! 
! proc test_print_mi_classes {} {
!     # Print all members of g_D.
! 
!     gdb_test "print g_D" ".* = \{\<(class |)B\> = \{\<(class |)A\> = \{a = 11, x = 12\}, b = 13, x = 14\}, \<(class |)C\> = \{\<(class |)A\> = \{a = 15, x = 16\}, c = 17, x = 18\}, d = 19, x = 20\}" "print g_D"
  
!     # Print all members of g_E.
  
!     gdb_test "print g_E" ".* = \{\<(class |)D\> = \{\<(class |)B\> = \{\<(class |)A\> = \{a = 21, x = 22\}, b = 23, x = 24\}, \<(class |)C\> = \{\<(class |)A\> = \{a = 25, x = 26\}, c = 27, x = 28\}, d = 29, x = 30\}, e = 31, x = 32\}" "print g_E"
  }
  
! #
! # Single virtual inheritance, print individual members.
! #
  
! proc test_print_svi_members {} {
      global gdb_prompt
-     global decimal
      global nl
  
!     # Print all members of g_vA.
! 
!     gdb_test "print g_vA.vA::va" ".* = 1" "print g_vA.vA::va"
! 
!     gdb_test "print g_vA.vA::vx" ".* = 2" "print g_vA.vA::vx"
! 
!     # Print members of g_vA using compact form.
! 
!     gdb_test "print g_vA.va" ".* = 1" "print g_vA.va"
  
!     gdb_test "print g_vA.vx" ".* = 2" "print g_vA.vx"
  
!     # Print all members of g_vB.
  
!     send_gdb "print g_vB.vA::va\n"
!     gdb_expect {
! 	-re ".* = 3$nl$gdb_prompt $" { pass "print g_vB.vA::va" }
! 	-re ".*virtual baseclass botch.*$gdb_prompt $" {
! 	    # Does not happen with gcc cygnus-2.4.5-930828
! 	    fail "print g_vB.vA::va (known bug with gcc cygnus-2.4.5-930417)"
! 	    # Many of the rest of these tests have the same problem.
! 	    return 0
  	}
- 	-re ".*$gdb_prompt $" { fail "print g_vB.vA::va" }
- 	timeout { fail "print g_vB.vA::va (timeout)" ; return }
      }
  
!     gdb_test "print g_vB.vA::vx" ".* = 4" "print g_vB.vA::vx"
! 
!     gdb_test "print g_vB.vB::vb" ".* = 5" "print g_vB.vB::vb"
! 
!     gdb_test "print g_vB.vB::vx" ".* = 6" "print g_vB.vB::vx"
! 
!     # Print members of g_vB using compact form.
! 
!     gdb_test "print g_vB.va" ".* = 3" "print g_vB.va"
! 
!     gdb_test "print g_vB.vb" ".* = 5" "print g_vB.vb"
! 
!     gdb_test "print g_vB.vx" ".* = 6" "print g_vB.vx"
  
!     # Print all members of g_vC.
  
!     gdb_test "print g_vC.vA::va" ".* = 7" "print g_vC.vA::va"
  
!     gdb_test "print g_vC.vA::vx" ".* = 8" "print g_vC.vA::vx"
  
!     gdb_test "print g_vC.vC::vc" ".* = 9" "print g_vC.vC::vc"
  
!     gdb_test "print g_vC.vC::vx" ".* = 10" "print g_vC.vC::vx"
  
!     # Print members of g_vC using compact form.
  
!     gdb_test "print g_vC.va" ".* = 7" "print g_vC.va"
  
!     gdb_test "print g_vC.vc" ".* = 9" "print g_vC.vc"
  
!     gdb_test "print g_vC.vx" ".* = 10" "print g_vC.vx"
  }
  
  #
! # Single virtual inheritance, print type definitions.
! #
  
! proc test_ptype_vi {} {
      global gdb_prompt
      global ws
      global nl
!     global vbptr
  
!     # This class does not use any C++-specific features, so it's fine for
!     # it to print as "struct".
!     send_gdb "ptype vA\n"
!     gdb_expect {
! 	-re "type = class vA \{$nl\[ \]*public:$nl\[ \]*int va;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
! 	    pass "ptype vA"
! 	}
! 	-re "type = struct vA \{$nl\[ \]*int va;$nl\[ \]*int vx;$nl\}$nl$gdb_prompt $" {
! 	    pass "ptype vA"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype vA" }
! 	timeout { fail "ptype vA (timeout)" ; return }
!     }
  
!     # This class does not use any C++-specific features, so it's fine for
!     # it to print as "struct".
!     send_gdb "ptype class vA\n"
!     gdb_expect {
! 	-re "type = class vA \{$nl\[ \]*public:$nl\[ \]*int va;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
! 	    pass "ptype class vA"
! 	}
! 	-re "type = struct vA \{$nl\[ \]*int va;$nl\[ \]*int vx;$nl\}$nl$gdb_prompt $" {
! 	    pass "ptype class vA"
  	}
- 	-re ".*$gdb_prompt $" { fail "ptype class vA" }
- 	timeout { fail "ptype class vA (timeout)" ; return }
      }
  
!     # This class does not use any C++-specific features, so it's fine for
!     # it to print as "struct".
!     send_gdb "ptype g_vA\n"
!     gdb_expect {
! 	-re "type = class vA \{$nl\[ \]*public:$nl\[ \]*int va;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
! 	    pass "ptype g_vA"
! 	}
! 	-re "type = struct vA \{$nl\[ \]*int va;$nl\[ \]*int vx;$nl\}$nl$gdb_prompt $" {
! 	    pass "ptype g_vA"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype g_vA" }
! 	timeout { fail "ptype g_vA (timeout)" ; return }
!     }
  
!     send_gdb "ptype vB\n"
!     gdb_expect {
! 	-re "ptype vB${nl}type = class vB : public virtual vA \{$nl  private:${ws}vA \\*${vbptr}vA;$nl  public:${ws}int vb;${ws}int vx;$nl.*\}$nl$gdb_prompt $" {
! 	    pass "ptype vB"
  	}
! 	-re "ptype vB${nl}type = class vB : public virtual vA \{$nl  public:${ws}int vb;${ws}int vx;$nl.*\}$nl$gdb_prompt $" {
! 	    pass "ptype vB (aCC)"
  	}
- 	-re ".*$gdb_prompt $" { fail "ptype vB" }
- 	timeout { fail "ptype vB (timeout)" }
      }
  
-     send_gdb "ptype class vB\n"
-     gdb_expect {
- 	-re "type = class vB : public virtual vA \{$nl\[ \]*private:$nl\[ \]*vA \\*${vbptr}vA;$nl\[ \]*public:$nl\[ \]*int vb;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
- 	    pass "ptype class vB"
- 	}
- 	-re "type = class vB : public virtual vA \{$nl\[ \]*public:$nl\[ \]*int vb;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
- 	    pass "ptype class vB (aCC)"
- 	}
- 	-re ".*$gdb_prompt $" { fail "ptype class vB" }
- 	timeout { fail "ptype class vB (timeout)" }
-     }
  
!     send_gdb "ptype g_vB\n"
!     gdb_expect {
! 	-re "type = class vB : public virtual vA \{$nl\[ \]*private:$nl\[ \]*vA \\*${vbptr}vA;$nl\[ \]*public:$nl\[ \]*int vb;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
! 	    pass "ptype g_vB"
! 	}
! 	-re "type = class vB : public virtual vA \{$nl\[ \]*public:$nl\[ \]*int vb;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
! 	    pass "ptype g_vB (aCC)"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype g_vB" }
! 	timeout { fail "ptype g_vB (timeout)" }
!     }
  
!     send_gdb "ptype vC\n"
!     gdb_expect {
! 	-re "type = class vC : public virtual vA \{$nl\[ \]*private:$nl\[ \]*vA \\*${vbptr}vA;$nl\[ \]*public:$nl\[ \]*int vc;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
!             pass "ptype vC"
! 	}
! 	-re "type = class vC : public virtual vA \{$nl\[ \]*public:$nl\[ \]*int vc;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
!             pass "ptype vC (aCC)"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype vC" }
! 	timeout { fail "ptype vC (timeout)" }
!     }
  
!     send_gdb "ptype class vC\n"
!     gdb_expect {
! 	-re "type = class vC : public virtual vA \{$nl\[ \]*private:$nl\[ \]*vA \\*${vbptr}vA;$nl\[ \]*public:$nl\[ \]*int vc;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
!             pass "ptype class vC"
! 	}
! 	-re "type = class vC : public virtual vA \{$nl\[ \]*public:$nl\[ \]*int vc;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
!             pass "ptype class vC (aCC)"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype class vC" }
! 	timeout { fail "ptype class vC (timeout)" }
!     }
  
!     send_gdb "ptype g_vC\n"
!     gdb_expect {
! 	-re "type = class vC : public virtual vA \{$nl\[ \]*private:$nl\[ \]*vA \\*${vbptr}vA;$nl\[ \]*public:$nl\[ \]*int vc;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
!             pass "ptype g_vC"
! 	}
! 	-re "type = class vC : public virtual vA \{$nl\[ \]*public:$nl\[ \]*int vc;$nl\[ \]*int vx;$nl.*\}$nl$gdb_prompt $" {
!             pass "ptype g_vC (aCC)"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype g_vC" }
! 	timeout { fail "ptype g_vC (timeout)" }
!     }
  }
  
- #
  # Single virtual inheritance, print complete classes.
- #
  
! proc test_print_svi_classes {} {
      global gdb_prompt
      global hex
-     global decimal
      global nl
!     global vbptr
  
      # Print all members of g_vA.
! 
!     gdb_test "print g_vA" ".* = \{va = 1, vx = 2\}" "print g_vA"
  
      # Print all members of g_vB.
  
!     send_gdb "print g_vB\n"
!     gdb_expect {
! 	-re ".* = \{\<class vA\> = \{va = 3, vx = 4\}, vb = 5, vx = 6, Virtual table at $hex\}$nl$gdb_prompt $" {
!            pass "print g_vB (aCC)"
! 	}
! 	-re ".* = \{\<class vA\> = \{va = 3, vx = 4\}, vb = 5, vx = 6, __vfp = $hex\}$nl$gdb_prompt $" {
! 	    pass "print g_vB (aCC)"
! 	}
! 	-re ".* = \{\<vA\> = \{va = 3, vx = 4\}, ${vbptr}vA = $hex, vb = 5, vx = 6\}$nl$gdb_prompt $" {
! 	    pass "print g_vB"
! 	}
! 	-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)"
! 	    # Many of the rest of these tests have the same problem.
! 	    return 0
  	}
- 	-re ".*$gdb_prompt $" { fail "print g_vB" }
- 	timeout { fail "print g_vB (timeout)" ; return }
      }
  
      # Print all members of g_vC.
  
!     send_gdb "print g_vC\n"
!     gdb_expect {
! 	-re ".* = \{\<class vA\> = \{va = 7, vx = 8\}, vc = 9, vx = 10, Virtual table at $hex\}$nl$gdb_prompt $" {
! 	    pass "print g_vC (aCC)"
! 	}
! 	-re ".* = \{\<class vA\> = \{va = 7, vx = 8\}, vc = 9, vx = 10, __vfp = $hex\}$nl$gdb_prompt $" {
! 	    pass "print g_vC (aCC)"
! 	}
! 	-re ".* = \{\<vA\> = \{va = 7, vx = 8\}, ${vbptr}vA = $hex, vc = 9, vx = 10\}$nl$gdb_prompt $" {
! 	    pass "print g_vC"
! 	}
! 	-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)" }
      }
  }
  
- #
  # Multiple virtual inheritance, print individual members.
- #
  
! proc test_print_mvi_members {} {
!     global gdb_prompt
!     global decimal
!     global nl
  
      # Print all members of g_vD.
! 
!     send_gdb "print g_vD.vA::va\n"
!     gdb_expect {
! 	-re ".* = 19$nl$gdb_prompt $" { pass "print g_vD.vA::va" }
! 	-re ".*virtual baseclass botch.*$gdb_prompt $" {
! 	    # Does not happen with gcc cygnus-2.4.5-930828
! 	    fail "print g_vD.vA::va (known bug with gcc cygnus-2.4.5-930417)"
! 	    # Many of the rest of these tests have the same problem.
! 	    return 0
! 	}
! 	-re ".*$gdb_prompt $" { fail "print g_vD.vA::va" }
! 	timeout { fail "print g_vD.vA::va (timeout)" ; return }
!     }
! 
!     gdb_test "print g_vD.vA::vx" ".* = 20" "print g_vD.vA::vx"
! 
!     gdb_test "print g_vD.vB::vb" ".* = 21" "print g_vD.vB::vb"
! 
!     gdb_test "print g_vD.vB::vx" ".* = 22" "print g_vD.vB::vx"
! 
!     gdb_test "print g_vD.vC::vc" ".* = 23" "print g_vD.vC::vc"
! 
!     gdb_test "print g_vD.vC::vx" ".* = 24" "print g_vD.vC::vx"
! 
!     gdb_test "print g_vD.vD::vd" ".* = 25" "print g_vD.vD::vd"
! 
!     gdb_test "print g_vD.vD::vx" ".* = 26" "print g_vD.vD::vx"
  
      # Print all members of g_vE.
! 
!     gdb_test "print g_vE.vA::va" ".* = 0" "print g_vE.vA::va"
! 
!     gdb_test "print g_vE.vA::vx" ".* = 0" "print g_vE.vA::vx"
! 
!     gdb_test "print g_vE.vB::vb" ".* = 0" "print g_vE.vB::vb"
! 
!     gdb_test "print g_vE.vB::vx" ".* = 0" "print g_vE.vB::vx"
! 
!     gdb_test "print g_vE.vC::vc" ".* = 0" "print g_vE.vC::vc"
! 
!     gdb_test "print g_vE.vC::vx" ".* = 0" "print g_vE.vC::vx"
! 
!     gdb_test "print g_vE.vD::vd" ".* = 0" "print g_vE.vD::vd"
! 
!     gdb_test "print g_vE.vD::vx" ".* = 0" "print g_vE.vD::vx"
! 
!     gdb_test "print g_vE.vE::ve" ".* = 27" "print g_vE.vE::ve"
! 
!     gdb_test "print g_vE.vE::vx" ".* = 28" "print g_vE.vE::vx"
  }
  
! #
! # Multiple virtual inheritance, print type definitions.
! #
  
! proc test_ptype_mvi {} {
      global gdb_prompt
      global ws
      global nl
!     global vbptr
  
!     send_gdb "ptype vD\n"
!     gdb_expect {
! 	-re "type = class vD : public virtual vB, public virtual vC \{${ws}private:${ws}vC \\*${vbptr}vC;${ws}vB \\*${vbptr}vB;${ws}public:${ws}int vd;${ws}int vx;$nl.*\}.*$gdb_prompt $" {
! 	    pass "ptype vD"
! 	}
!         -re ".*class vD : public virtual vB, public virtual vC \{${ws}public:${ws}int vd;${ws}int vx;.*\}.*$gdb_prompt $" {
! 	    pass "ptype vD"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype vD" }
! 	timeout { fail "(timeout) ptype vD" }
!     }
  
!     send_gdb "ptype class vD\n"
!     gdb_expect {
! 	-re "type = class vD : public virtual vB, public virtual vC \{${ws}private:${ws}vC \\*${vbptr}vC;${ws}vB \\*${vbptr}vB;${ws}public:${ws}int vd;${ws}int vx;$nl.*\}.*$gdb_prompt $" {
! 	    pass "ptype class vD"
! 	}
! 	-re ".*class vD : public virtual vB, public virtual vC \{${ws}public:${ws}int vd;${ws}int vx;.*\}.*$gdb_prompt $" {
! 	    pass "ptype class vD"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype class vD" }
! 	timeout { fail "(timeout) ptype class vD" }
!     }
! 
!     send_gdb "ptype g_vD\n"
!     gdb_expect {
! 	-re "type = class vD : public virtual vB, public virtual vC \{${ws}private:${ws}vC \\*${vbptr}vC;${ws}vB \\*${vbptr}vB;${ws}public:${ws}int vd;${ws}int vx;$nl.*\}.*$gdb_prompt $" {
! 	    pass "ptype g_vD"
! 	}
! 	-re ".*class vD : public virtual vB, public virtual vC \{${ws}public:${ws}int vd;${ws}int vx;\r\n.*\}.*$gdb_prompt $" {
! 	    pass "ptype g_vD"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype g_vD" }
! 	timeout { fail "(timeout) ptype g_vD" }
!     }
! 
!     send_gdb "ptype vE\n"
!     gdb_expect {
! 	-re "type = class vE : public virtual vD \{${ws}private:${ws}vD \\*${vbptr}vD;${ws}public:${ws}int ve;${ws}int vx;$nl.*\}.*$gdb_prompt $" {
! 	    pass "ptype vE"
! 	}
! 	-re ".*class vE : public virtual vD \{${ws}public:${ws}int ve;${ws}int vx;\r\n.*\}.*$gdb_prompt $" {
! 	    pass "ptype vE"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype vE" }
! 	timeout { fail "(timeout) ptype vE" }
!     }
! 
!     send_gdb "ptype class vE\n"
!     gdb_expect {
! 	-re "type = class vE : public virtual vD \{${ws}private:${ws}vD \\*${vbptr}vD;${ws}public:${ws}int ve;${ws}int vx;$nl.*\}.*$gdb_prompt $" {
! 	    pass "ptype class vE"
! 	}
! 	-re "type = class vE : public virtual vD \{${ws}public:${ws}int ve;${ws}int vx;\r\n.*\}.*$gdb_prompt $" {
! 	    pass "ptype class vE"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype class vE" }
! 	timeout { fail "(timeout) ptype class vE" }
!     }
! 
!     send_gdb "ptype g_vE\n"
!     gdb_expect {
! 	-re "type = class vE : public virtual vD \{${ws}private:${ws}vD \\*${vbptr}vD;${ws}public:${ws}int ve;${ws}int vx;$nl.*\}.*$gdb_prompt $" {
! 	    pass "ptype g_vE"
! 	}
! 	-re "type = class vE : public virtual vD \{${ws}public:${ws}int ve;${ws}int vx;\r\n.*\}.*$gdb_prompt $" {
! 	    pass "ptype g_vE"
! 	}
! 	-re ".*$gdb_prompt $" { fail "ptype g_vE" }
! 	timeout { fail "(timeout) ptype g_vE" }
!     }
! }
! 
! #
! # Multiple virtual inheritance, print complete classes.
! #
! 
! proc test_print_mvi_classes {} {
!     global gdb_prompt
!     global hex
!     global decimal
!     global nl
!     global vbptr
  
      # Print all members of g_vD.
  
!     send_gdb "print g_vD\n"
!     gdb_expect {
! 	-re ".* = \{\<class vB\> = \{\<class vA\> = \{va = 19, vx = 20\}, vb = 21, vx = 22, Virtual table at $hex\}, \<class vC\> = \{vc = 23, vx = 24, Virtual table at $hex\}, vd = 25, vx = 26, Virtual table at $hex\}$nl$gdb_prompt $" {
! 	    pass "print g_vD (aCC)"
! 	}
! 	-re ".* = \{\<class vB\> = \{\<class vA\> = \{va = 19, vx = 20\}, vb = 21, vx = 22, __vfp = $hex\}, \<class vC\> = \{vc = 23, vx = 24, __vfp = $hex\}, vd = 25, vx = 26, __vfp = $hex\}$nl$gdb_prompt $" {
! 	    pass "print g_vD (aCC)"
! 	}
! 	-re ".* = \{\<vB\> = \{\<vA\> = \{va = 19, vx = 20\}, ${vbptr}vA = $hex, vb = 21, vx = 22\}, \<vC\> = \{${vbptr}vA = $hex, vc = 23, vx = 24\}, ${vbptr}vC = $hex, ${vbptr}vB = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" {
! 	    pass "print g_vD"
! 	}
! 	-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)"
! 	    # Many of the rest of these tests have the same problem.
! 	    return 0
  	}
- 	-re ".*$gdb_prompt $" { fail "print g_vD" }
- 	timeout { fail "print g_vD (timeout)" ; return }
      }
  
      # Print all members of g_vE.
  
!     send_gdb "print g_vE\n"
!     gdb_expect {
! 	-re ".* = \{\<class vD\> = \{\<class vB\> = \{\<class vA\> = \{va = 0, vx = 0\}, vb = 0, vx = 0, Virtual table at $hex\}, \<class vC\> = \{vc = 0, vx = 0, Virtual table at $hex\}, vd = 0, vx = 0, Virtual table at $hex\}, ve = 27, vx = 28, Virtual table at $hex\}$nl$gdb_prompt $" {
! 	    pass "print g_vE (aCC)"
  	}
- 	-re ".* = \{\<class vD\> = \{\<class vB\> = \{\<class vA\> = \{va = 0, vx = 0\}, vb = 0, vx = 0, __vfp = $hex\}, \<class vC\> = \{vc = 0, vx = 0, __vfp = $hex\}, vd = 0, vx = 0, __vfp = $hex\}, ve = 27, vx = 28, __vfp = $hex\}$nl$gdb_prompt $" {
- 	    pass "print g_vE (aCC)"
- 	}
- 	-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 *(\<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" }
- 	timeout { fail "print g_vE (timeout)" }
      }
  }
  
! proc do_tests {} {
      global prms_id
      global bug_id
      global subdir
--- 19,1021 ----
  # bug-gdb@prep.ai.mit.edu
  
  # This file was written by Fred Fish. (fnf@cygnus.com)
+ # And rewritten by Michael Chastain. (mec.gnu@mindspring.com)
  
! set ws  "\[\r\n\t \]+"
! set nl  "\[\r\n\]+"
! set vhn "\\$\[0-9\]+"
  
  if $tracelevel then {
!     strace $tracelevel
  }
  
  if { [skip_cplus_tests] } { continue }
  
  set testfile "inherit"
  set srcfile misc.cc
  set binfile ${objdir}/${subdir}/${testfile}
  
  if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
       gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
  }
  
  # Single inheritance, print type definitions.
  
! proc test_ptype_si { } {
      global gdb_prompt
      global ws
      global nl
  
      # Print class A as a type.
  
!     set re_class	"class A \{${ws}public:"
!     set re_fields	"int a;${ws}int x;"
!     set re_synth_gcc_23	"A & operator=\\(A const ?&\\);${ws}A\\(A const ?&\\);${ws}A\\((void|)\\);"
! 
!     set name "ptype A (FIXME)"
!     gdb_test_multiple "ptype A" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
      }
  
      # Print class A as an explicit class.
  
!     set name "ptype class A (FIXME)"
!     gdb_test_multiple "ptype class A" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
      }
  
      # Print type of an object of type A.
  
!     set name "ptype g_A (FIXME)"
!     gdb_test_multiple "ptype g_A" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
      }
  
      # Print class B as a type.
  
!     set re_class	"class B : public A \{${ws}public:"
!     set re_fields	"int b;${ws}int x;"
!     set re_synth_gcc_23	"B & operator=\\(B const ?&\\);${ws}B\\(B const ?&\\);${ws}B\\((void|)\\);"
! 
!     set name "ptype B"
!     gdb_test_multiple "ptype B" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
!     }
  
      # Print class B as an explicit class.
  
!     set name "ptype class B"
!     gdb_test_multiple "ptype class B" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
!     }
  
      # Print type of an object of type B.
  
!     set name "ptype g_B"
!     gdb_test_multiple "ptype g_B" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
!     }
  
      # Print class C as a type.
  
!     set re_class	"class C : public A \{${ws}public:"
!     set re_fields	"int c;${ws}int x;"
!     set re_synth_gcc_23	"C & operator=\\(C const ?&\\);${ws}C\\(C const ?&\\);${ws}C\\((void|)\\);"
! 
!     set name "ptype C"
!     gdb_test_multiple "ptype C" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
!     }
  
      # Print class C as an explicit class.
  
!     set name "ptype class C"
!     gdb_test_multiple "ptype class C" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
!     }
  
      # Print type of an object of type g_C.
  
!     set name "ptype g_C"
!     gdb_test_multiple "ptype g_C" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
      }
  
!     # Print a structure with no tag.
! 
!     set re_tag		"tagless_struct"
!     set XX_tag		"\\._1"
!     set re_class	"(class $re_tag \{${ws}public:|class \{${ws}public:|struct $re_tag \{|struct \{)"
!     set XX_class	"(class $XX_tag \{${ws}public:|struct $XX_tag \{)"
!     set re_fields	"int one;${ws}int two;"
!     set re_synth_gcc_23	"$re_tag & operator=\\($re_tag const ?&\\);${ws}$re_tag\\($re_tag const ?&\\);${ws}$re_tag\\((void|)\\);"
!     set XX_synth_gcc_23	"($re_tag|$XX_tag) & operator=\\($XX_tag const ?&\\);${ws}$XX_tag\\($XX_tag const ?&\\);${ws}$XX_tag\\((void|)\\);"
! 
!     set name "ptype tagless struct"
!     gdb_test_multiple "ptype tagless_struct" $name {
! 	-re "type = $XX_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass "$name (obsolete gcc or gdb)"
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$XX_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass "$name (obsolete gcc or gdb)"
! 	}
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name (obsolete gcc or gdb)"
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name"
  	}
      }
  
!     set name "ptype variable of type tagless struct"
!     gdb_test_multiple "ptype v_tagless" $name {
! 	-re "type = $XX_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass "$name (obsolete gcc or gdb)"
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$XX_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass "$name (obsolete gcc or gdb)"
! 	}
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name (obsolete gcc or gdb)"
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name"
! 	}
!     }
  }
  
! # Multiple inheritance, print type definitions.
  
! proc test_ptype_mi { } {
      global gdb_prompt
      global ws
      global nl
  
!     set re_class	"class D : public B, public C \{${ws}public:"
!     set re_fields	"int d;${ws}int x;"
!     set re_synth_gcc_23	"D & operator=\\(D const ?&\\);${ws}D\\(D const ?&\\);${ws}D\\((void|)\\);"
! 
!     # ptype D: type, class, object.
! 
!     set name "ptype D"
!     gdb_test_multiple "ptype D" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
!     }
! 
!     set name "ptype class D"
!     gdb_test_multiple "ptype class D" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
      }
! 
!     set name "ptype g_D"
!     gdb_test_multiple "ptype g_D" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
!     }
! 
!     set re_class	"class E : public D \{${ws}public:"
!     set re_fields	"int e;${ws}int x;"
!     set re_synth_gcc_23	"E & operator=\\(E const ?&\\);${ws}E\\(E const ?&\\);${ws}E\\((void|)\\);"
! 
!     # ptype E: type, class, object.
! 
!     set name "ptype E"
!     gdb_test_multiple "ptype E" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
!     }
! 
!     set name "ptype class E"
!     gdb_test_multiple "ptype class E" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
!     }
! 
!     set name "ptype g_E"
!     gdb_test_multiple "ptype g_E" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
      }
  }
  
! # Single virtual inheritance, print type definitions.
  
! proc test_ptype_vi { } {
      global gdb_prompt
+     global ws
      global nl
  
!     # ptype vA: type, class, object.
  
!     set re_class	"class vA \{${ws}public:"
!     set re_fields	"int va;${ws}int vx;"
!     set re_synth_gcc_23	"vA & operator=\\(vA const ?&\\);${ws}vA\\(vA const ?&\\);${ws}vA\\((void|)\\);"
  
!     set name "ptype vA"
!     gdb_test_multiple "ptype vA" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
!     }
  
!     set name "ptype class vA"
!     gdb_test_multiple "ptype class vA" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
!     }
  
!     set name "ptype g_vA"
!     gdb_test_multiple "ptype g_vA" $name {
! 	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
! 	}
!     }
  
!     # ptype vB: type, class, object.
  
!     set re_class	"class vB : public virtual vA \{(${ws}private:|)"
!     set re_vbptr	"vA \\*(_vb.2vA|_vb.vA);${ws}"
!     set re_access	"public:"
!     set re_fields	"int vb;${ws}int vx;"
!     set re_synth_gcc_2	"vB & operator=\\(vB const ?&\\);${ws}vB\\(int, vB const ?&\\);${ws}vB\\(int\\);"
!     set re_synth_gcc_3	"vB & operator=\\(vB const ?&\\);${ws}vB\\(vB const ?&\\);${ws}vB\\(\\);"
  
!     set name "ptype vB"
!     gdb_test_multiple "ptype vB" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name (aCC)"
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name (aCC)"
! 	}
!     }
  
!     set name "ptype class vB"
!     gdb_test_multiple "ptype class vB" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name (aCC)"
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name (aCC)"
! 	}
!     }
  
!     set name "ptype g_vB"
!     gdb_test_multiple "ptype g_vB" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name (aCC)"
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name (aCC)"
! 	}
!     }
  
!     # ptype vC: type, class, object.
  
!     set re_class	"class vC : public virtual vA \{(${ws}private:|)"
!     set re_vbptr	"vA \\*(_vb.2vA|_vb.vA);${ws}"
!     set re_access	"public:"
!     set re_fields	"int vc;${ws}int vx;"
!     set re_synth_gcc_2	"vC & operator=\\(vC const ?&\\);${ws}vC\\(int, vC const ?&\\);${ws}vC\\(int\\);"
!     set re_synth_gcc_3	"vC & operator=\\(vC const ?&\\);${ws}vC\\(vC const ?&\\);${ws}vC\\(\\);"
  
!     set name "ptype vC"
!     gdb_test_multiple "ptype vC" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name (aCC)"
  	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name (aCC)"
  	}
      }
  
!     set name "ptype class vC"
!     gdb_test_multiple "ptype class vC" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name (aCC)"
  	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name (aCC)"
  	}
      }
  
!     set name "ptype g_vC"
!     gdb_test_multiple "ptype g_vC" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name (aCC)"
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name (aCC)"
! 	}
!     }
! }
  
! # Multiple virtual inheritance, print type definitions.
  
! proc test_ptype_mvi { } {
!     global gdb_prompt
!     global ws
!     global nl
  
!     # ptype vD: type, class, object.
  
!     set re_class	"class vD : public virtual vB, public virtual vC \{(${ws}private:|)"
!     set re_vbptr	"vC \\*(_vb.2vC|_vb.vC);${ws}vB \\*(_vb.2vB|_vb.vB);"
!     set re_access	"public:"
!     set re_fields	"int vd;${ws}int vx;"
!     set re_synth_gcc_2	"vD & operator=\\(vD const ?&\\);${ws}vD\\(int, vD const ?&\\);${ws}vD\\(int\\);"
!     set re_synth_gcc_3	"vD & operator=\\(vD const ?&\\);${ws}vD\\(vD const ?&\\);${ws}vD\\(\\);"
  
!     set name "ptype vD"
!     gdb_test_multiple "ptype vD" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name"
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name"
  	}
      }
  
!     set name "ptype class vD"
!     gdb_test_multiple "ptype class vD" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name"
  	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name"
  	}
      }
  
!     set name "ptype g_vD"
!     gdb_test_multiple "ptype g_vD" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name"
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name"
! 	}
!     }
  
!     # ptype vE: type, class, object.
  
!     set re_class	"class vE : public virtual vD \{(${ws}private:|)"
!     set re_vbptr	"vD \\*(_vb.2vD|_vb.vD);"
!     set re_access	"public:"
!     set re_fields	"int ve;${ws}int vx;"
!     set re_synth_gcc_2	"vE & operator=\\(vE const ?&\\);${ws}vE\\(int, vE const ?&\\);${ws}vE\\(int\\);"
!     set re_synth_gcc_3	"vE & operator=\\(vE const ?&\\);${ws}vE\\(vE const ?&\\);${ws}vE\\(\\);"
  
!     set name "ptype vE"
!     gdb_test_multiple "ptype vE" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name"
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name"
! 	}
!     }
  
!     set name "ptype class vE"
!     gdb_test_multiple "ptype class vE" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name"
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name"
! 	}
!     }
  
!     set name "ptype g_vE"
!     gdb_test_multiple "ptype g_vE" $name {
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_vbptr${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_2$nl\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    pass "$name"
! 	}
! 	-re "type = $re_class${ws}$re_access${ws}$re_fields${ws}$re_synth_gcc_3$nl\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name"
! 	}
!     }
  }
  
! # Single inheritance, print individual members.
  
! proc test_print_si_members { } {
!     global vhn
  
!     # Print all members of g_A using fully qualified form.
!     gdb_test "print g_A.A::a" "$vhn = 1"
!     gdb_test "print g_A.A::x" "$vhn = 2"
  
!     # Print members of g_A using nonambiguous compact form.
!     gdb_test "print g_A.a" "$vhn = 1"
!     gdb_test "print g_A.x" "$vhn = 2"
  
!     # Print all members of g_B using fully qualified form.
!     gdb_test "print g_B.A::a" "$vhn = 3"
!     gdb_test "print g_B.A::x" "$vhn = 4"
!     gdb_test "print g_B.B::b" "$vhn = 5"
!     gdb_test "print g_B.B::x" "$vhn = 6"
  
!     # Print members of g_B using nonambiguous compact form.
!     gdb_test "print g_B.a" "$vhn = 3"
!     gdb_test "print g_B.b" "$vhn = 5"
!     gdb_test "print g_B.x" "$vhn = 6"
  
!     # Print all members of g_C using fully qualified form.
!     gdb_test "print g_C.A::a" "$vhn = 7"
!     gdb_test "print g_C.A::x" "$vhn = 8"
!     gdb_test "print g_C.C::c" "$vhn = 9"
!     gdb_test "print g_C.C::x" "$vhn = 10"
  
!     # Print members of g_C using nonambiguous compact form.
!     gdb_test "print g_C.a" "$vhn = 7"
!     gdb_test "print g_C.c" "$vhn = 9"
!     gdb_test "print g_C.x" "$vhn = 10"
  }
  
! # Single inheritance, print complete classes.
  
! proc test_print_si_classes { } {
!     global vhn
  
!     # Print all members of g_A, g_B, g_C.
!     gdb_test "print g_A" "$vhn = \{a = 1, x = 2\}"
!     gdb_test "print g_B" "$vhn = \{<(class A|A)> = \{a = 3, x = 4\}, b = 5, x = 6\}"
!     gdb_test "print g_C" "$vhn = \{<(class A|A)> = \{a = 7, x = 8\}, c = 9, x = 10\}"
  }
  
! # Multiple inheritance, print individual members.
  
! proc test_print_mi_members {} {
      global gdb_prompt
      global nl
+     global vhn
  
!     # Print all members of g_A.
!     gdb_test "print g_A.A::a" "$vhn = 1"
!     gdb_test "print g_A.A::x" "$vhn = 2"
  
!     # Print all members of g_B.
!     gdb_test "print g_B.A::a" "$vhn = 3"
!     gdb_test "print g_B.A::x" "$vhn = 4"
!     gdb_test "print g_B.B::b" "$vhn = 5"
!     gdb_test "print g_B.B::x" "$vhn = 6"
  
!     # Print all members of g_C.
!     gdb_test "print g_C.A::a" "$vhn = 7"
!     gdb_test "print g_C.A::x" "$vhn = 8"
!     gdb_test "print g_C.C::c" "$vhn = 9"
!     gdb_test "print g_C.C::x" "$vhn = 10"
  
!     # Print all members of g_D.
!     #
!     # g_D.A::a and g_D.A::x are ambiguous member accesses, and gdb
!     # should detect these.  There are no ways to PASS these tests
!     # because I don't know what the gdb message will be.  -- chastain
!     # 2004-01-27.
! 
!     set name "print g_D.A::a"
!     gdb_test_multiple "print g_D.A::a" $name {
! 	-re "$vhn = (15|11)$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_D.A::a"
  	}
      }
  
!     set name "print g_D.A::x"
!     gdb_test_multiple "print g_D.A::x" $name {
! 	-re "$vhn = (16|12)$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_D.A::x"
! 	}
!     }
  
!     gdb_test "print g_D.B::b" "$vhn = 13"
!     gdb_test "print g_D.B::x" "$vhn = 14"
!     gdb_test "print g_D.C::c" "$vhn = 17"
!     gdb_test "print g_D.C::x" "$vhn = 18"
!     gdb_test "print g_D.D::d" "$vhn = 19"
!     gdb_test "print g_D.D::x" "$vhn = 20"
  
!     # Print all members of g_E.
!     # g_E.A::a and g_E.A::x are ambiguous.
  
!     set name "print g_E.A::a"
!     gdb_test_multiple "print g_E.A::a" $name {
! 	-re "$vhn = (21|25)$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_E.A::a"
! 	}
!     }
  
!     set name "print g_E.A::x"
!     gdb_test_multiple "print g_E.A::x" $name {
! 	-re "$vhn = (26|22)$nl$gdb_prompt $" {
! 	    kfail "gdb/68" "print g_E.A::x"
! 	}
!     }
  
!     gdb_test "print g_E.B::b" "$vhn = 23"
!     gdb_test "print g_E.B::x" "$vhn = 24"
!     gdb_test "print g_E.C::c" "$vhn = 27"
!     gdb_test "print g_E.C::x" "$vhn = 28"
!     gdb_test "print g_E.D::d" "$vhn = 29"
!     gdb_test "print g_E.D::x" "$vhn = 30"
!     gdb_test "print g_E.E::e" "$vhn = 31"
!     gdb_test "print g_E.E::x" "$vhn = 32"
! }
  
! # Multiple inheritance, print complete classes.
  
! proc test_print_mi_classes { } {
!     global vhn
  
!     # Print all members of g_D.
!     gdb_test "print g_D" "$vhn = \{\<(class |)B\> = \{\<(class |)A\> = \{a = 11, x = 12\}, b = 13, x = 14\}, \<(class |)C\> = \{\<(class |)A\> = \{a = 15, x = 16\}, c = 17, x = 18\}, d = 19, x = 20\}"
  
!     # Print all members of g_E.
!     gdb_test "print g_E" "$vhn = \{\<(class |)D\> = \{\<(class |)B\> = \{\<(class |)A\> = \{a = 21, x = 22\}, b = 23, x = 24\}, \<(class |)C\> = \{\<(class |)A\> = \{a = 25, x = 26\}, c = 27, x = 28\}, d = 29, x = 30\}, e = 31, x = 32\}"
  }
  
+ # Single inheritance, print anonymous unions.
+ # GDB versions prior to 4.14 entered an infinite loop when printing
+ # the type of a class containing an anonymous union, and they were also
+ # incapable of printing the member of an anonymous union.
+ # We test the printing of the member first, and perform the other tests
+ # only if the test succeeds, to avoid the infinite loop.
  #
! # GDB HEAD 2004-01-27 with hp aCC A.03.45 crashes on the first test.
! # -- chastain 2004-01-27
  
! proc test_print_anon_union {} {
      global gdb_prompt
      global ws
      global nl
!     global vhn
  
!     gdb_test "print g_anon_union.a" "$vhn = 2" "print anonymous union member"
  
!     set name "print variable of type anonymous union"
!     gdb_test_multiple "print g_anon_union" $name {
! 	-re "$vhn = \{one = 1, \{a = 2, b = 2\}\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
      }
  
!     set re_class	"class class_with_anon_union \{${ws}public:"
!     set re_fields	"int one;${ws}"
!     set re_anon_union	"union \{${ws}int a;${ws}long int b;${ws}\};"
!     set re_synth_gcc_23	"class_with_anon_union & operator=\\(class_with_anon_union const ?&\\);${ws}class_with_anon_union\\(class_with_anon_union const ?&\\);${ws}class_with_anon_union\\((void|)\\);"
  
!     set name "print type of anonymous union"
!     gdb_test_multiple "ptype g_anon_union" $name {
! 	-re "type = $re_class${ws}$re_fields${ws}$re_anon_union$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
! 	-re "type = $re_class${ws}$re_fields${ws}$re_anon_union${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
! 	    pass $name
  	}
      }
+ }
  
  
! # Single virtual inheritance, print individual members.
  
! proc test_print_svi_members { } {
!     global vhn
  
!     # Print all members of g_vA.
!     gdb_test "print g_vA.vA::va" "$vhn = 1"
!     gdb_test "print g_vA.vA::vx" "$vhn = 2"
  
!     # Print members of g_vA using compact form.
!     gdb_test "print g_vA.va" "$vhn = 1"
!     gdb_test "print g_vA.vx" "$vhn = 2"
! 
!     # Print all members of g_vB.
!     gdb_test "print g_vB.vA::va" "$vhn = 3"
!     gdb_test "print g_vB.vA::vx" "$vhn = 4"
!     gdb_test "print g_vB.vB::vb" "$vhn = 5"
!     gdb_test "print g_vB.vB::vx" "$vhn = 6"
! 
!     # Print members of g_vB using compact form.
!     gdb_test "print g_vB.va" "$vhn = 3"
!     gdb_test "print g_vB.vb" "$vhn = 5"
!     gdb_test "print g_vB.vx" "$vhn = 6"
! 
!     # Print all members of g_vC.
!     gdb_test "print g_vC.vA::va" "$vhn = 7"
!     gdb_test "print g_vC.vA::vx" "$vhn = 8"
!     gdb_test "print g_vC.vC::vc" "$vhn = 9"
!     gdb_test "print g_vC.vC::vx" "$vhn = 10"
! 
!     # Print members of g_vC using compact form.
!     gdb_test "print g_vC.va" "$vhn = 7" "print g_vC.va"
!     gdb_test "print g_vC.vc" "$vhn = 9" "print g_vC.vc"
!     gdb_test "print g_vC.vx" "$vhn = 10" "print g_vC.vx"
  }
  
  # Single virtual inheritance, print complete classes.
  
! proc test_print_svi_classes { } {
      global gdb_prompt
      global hex
      global nl
!     global vhn
  
      # Print all members of g_vA.
!     gdb_test "print g_vA" "$vhn = \{va = 1, vx = 2\}"
  
      # Print all members of g_vB.
+     set re_vbptr_2	"(_vb.2vA|_vb.vA)"
+     set re_vbptr_3	"_vptr.vB"
  
!     set name "print g_vB"
!     gdb_test_multiple "print g_vB" $name {
! 	-re "$vhn = \{<vA> = \{va = 3, vx = 4\}, $re_vbptr_2 = $hex, vb = 5, vx = 6\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "$vhn = \{<vA> = \{va = 3, vx = 4\}, $re_vbptr_3 = $hex, vb = 5, vx = 6\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name (FIXME v3 vtbl ptr)"
! 	}
! 	-re "$vhn = \{<vA> = \{va = 3, vx = 4\}, $re_vbptr_3 = $hex <VTT for vB>, vb = 5, vx = 6\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    pass $name
  	}
      }
  
      # Print all members of g_vC.
+     set re_vbptr_2	"(_vb.2vA|_vb.vA)"
+     set re_vbptr_3	"_vptr.vC"
  
!     set name "print g_vC"
!     gdb_test_multiple "print g_vC" $name {
! 	-re "$vhn = \{<vA> = \{va = 7, vx = 8\}, $re_vbptr_2 = $hex, vc = 9, vx = 10\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "$vhn = \{<vA> = \{va = 7, vx = 8\}, $re_vbptr_3 = $hex, vc = 9, vx = 10\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name (FIXME v3 vtbl ptr)"
! 	}
! 	-re "$vhn = \{<vA> = \{va = 7, vx = 8\}, $re_vbptr_3 = $hex <VTT for vC>, vc = 9, vx = 10\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    pass $name
  	}
      }
  }
  
  # Multiple virtual inheritance, print individual members.
  
! proc test_print_mvi_members { } {
!     global vhn
  
      # Print all members of g_vD.
!     gdb_test "print g_vD.vA::va" "$vhn = 19"
!     gdb_test "print g_vD.vA::vx" "$vhn = 20"
!     gdb_test "print g_vD.vB::vb" "$vhn = 21"
!     gdb_test "print g_vD.vB::vx" "$vhn = 22"
!     gdb_test "print g_vD.vC::vc" "$vhn = 23"
!     gdb_test "print g_vD.vC::vx" "$vhn = 24"
!     gdb_test "print g_vD.vD::vd" "$vhn = 25"
!     gdb_test "print g_vD.vD::vx" "$vhn = 26"
  
      # Print all members of g_vE.
!     gdb_test "print g_vE.vA::va" "$vhn = 0"
!     gdb_test "print g_vE.vA::vx" "$vhn = 0"
!     gdb_test "print g_vE.vB::vb" "$vhn = 0"
!     gdb_test "print g_vE.vB::vx" "$vhn = 0"
!     gdb_test "print g_vE.vC::vc" "$vhn = 0"
!     gdb_test "print g_vE.vC::vx" "$vhn = 0"
!     gdb_test "print g_vE.vD::vd" "$vhn = 0"
!     gdb_test "print g_vE.vD::vx" "$vhn = 0"
!     gdb_test "print g_vE.vE::ve" "$vhn = 27"
!     gdb_test "print g_vE.vE::vx" "$vhn = 28"
  }
  
! # Multiple virtual inheritance, print complete classes.
  
! proc test_print_mvi_classes { } {
      global gdb_prompt
+     global hex
      global ws
      global nl
!     global vhn
  
!     # Virtual base pointers for everybody.
  
!     set re_vbptr_2_vA	"(_vb.2vA|_vb.vA)"
!     set re_vbptr_2_vB	"(_vb.2vB|_vb.vB)"
!     set re_vbptr_2_vC	"(_vb.2vC|_vb.vC)"
!     set re_vbptr_2_vD	"(_vb.2vD|_vb.vD)"
!     set re_vbptr_3_vA	"_vptr.vA"
!     set re_vbptr_3_vB	"_vptr.vB"
!     set re_vbptr_3_vC	"_vptr.vC"
!     set re_vbptr_3_vD	"_vptr.vD"
!     set re_vbptr_3_vE	"_vptr.vE"
  
      # Print all members of g_vD.
  
!     set name "print g_vD"
!     gdb_test_multiple "print g_vD" $name {
! 	-re "$vhn = \{<vB> = \{<vA> = \{va = 19, vx = 20\}, $re_vbptr_2_vA = $hex, vb = 21, vx = 22\}, <vC> = \{$re_vbptr_2_vA = $hex, vc = 23, vx = 24\}, $re_vbptr_2_vC = $hex, $re_vbptr_2_vB = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "$vhn = \{<vB> = \{<vA> = \{va = 19, vx = 20\}, $re_vbptr_3_vB = $hex, vb = 21, vx = 22\}, <vC> = \{$re_vbptr_3_vC = $hex, vc = 23, vx = 24\}, $re_vbptr_3_vD = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name (FIXME v3 vtbl ptr)"
! 	}
! 	-re "$vhn = \{<vB> = \{<vA> = \{va = 19, vx = 20\}, $re_vbptr_3_vB = $hex, vb = 21, vx = 22\}, <vC> = \{$re_vbptr_3_vC = $hex <VTT for vD>, vc = 23, vx = 24\}, $re_vbptr_3_vD = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gstabs+
! 	    pass "$name"
  	}
      }
  
      # Print all members of g_vE.
  
!     set name "print g_vE"
!     gdb_test_multiple "print g_vE" $name {
! 	-re "$vhn = \{<vD> = \{<vB> = \{<vA> = \{va = 0, vx = 0\}, $re_vbptr_2_vA = $hex, vb = 0, vx = 0\}, <vC> = \{$re_vbptr_2_vA = $hex, vc = 0, vx = 0\}, $re_vbptr_2_vC = $hex, $re_vbptr_2_vB = $hex, vd = 0, vx = 0\}, $re_vbptr_2_vD = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" {
! 	    # gcc 2.95.3 -gdwarf-2
! 	    # gcc 2.95.3 -gstabs+
! 	    pass $name
! 	}
! 	-re "$vhn = \{<vD> = \{<vB> = \{<vA> = \{va = 0, vx = 0\}, $re_vbptr_3_vB = $hex, vb = 0, vx = 0\}, <vC> = \{$re_vbptr_3_vC = $hex, vc = 0, vx = 0\}, $re_vbptr_3_vD = $hex, vd = 0, vx = 0\}, $re_vbptr_3_vE = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" {
! 	    # gcc 3.3.2 -gdwarf-2
! 	    # gcc 3.3.2 -gstabs+
! 	    # gcc HEAD 2004-01-21 -gdwarf-2
! 	    # gcc HEAD 2004-01-21 -gstabs+
! 	    pass "$name (FIXME v3 vtbl ptr)"
  	}
      }
  }
  
! proc do_tests { } {
      global prms_id
      global bug_id
      global subdir
*************** proc do_tests {} {
*** 980,989 ****
      gdb_test "set language c++" ""
      gdb_test "set width 0" ""
  
!     # Get the debug format for the compiled test case.
! 
!     if { ![ runto_main] } {
! 	gdb_suppress_tests;
      }
  
      test_ptype_si
--- 1036,1044 ----
      gdb_test "set language c++" ""
      gdb_test "set width 0" ""
  
!     if { ![runto_main] } then {
! 	perror "couldn't run to main"
! 	return
      }
  
      test_ptype_si
*************** proc do_tests {} {
*** 991,1000 ****
      test_ptype_vi
      test_ptype_mvi
  
!     gdb_stop_suppressing_tests;
!     
!     if { ![ runto 'inheritance2' ] } {
! 	gdb_suppress_tests;
      }
  
      test_print_si_members
--- 1046,1054 ----
      test_ptype_vi
      test_ptype_mvi
  
!     if { ![runto 'inheritance2'] } then {
! 	perror "couldn't run to inheritance2"
! 	return
      }
  
      test_print_si_members
*************** proc do_tests {} {
*** 1003,1012 ****
      test_print_mi_classes
      test_print_anon_union
  
!     gdb_stop_suppressing_tests;
! 
!     if { ![ runto 'inheritance4' ] } {
! 	gdb_suppress_tests;
      }
  
      test_print_svi_members
--- 1057,1065 ----
      test_print_mi_classes
      test_print_anon_union
  
!     if { ![runto 'inheritance4'] } {
! 	perror "couldn't run to inheritance4"
! 	return
      }
  
      test_print_svi_members


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]