Merge GDB 7.5.1

gdb/testsuite/gdb.cp/inherit.exp

 # Copyright 1992-1999, 2001-2004, 2006-2012 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
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # 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 }
 
 load_lib "cp-support.exp"
 
-set testfile "inherit"
-set srcfile misc.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile misc.cc
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested inherit.exp
-     return -1
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
 }
 
 # Single inheritance, print type definitions.
 
 proc test_ptype_si { } {
     global gdb_prompt
     global ws
     global nl
 
     # A simple class.
@@ skipping 269 matching lines @@
     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"
-        }
-    }
-
+    # g_D.A::a and g_D.A::x are ambiguous member accesses.
+    gdb_test "print g_D.A::a" "base class 'A' is ambiguous in type 'D'"
+    gdb_test "print g_D.C::a" "$vhn = 15"
+    gdb_test "print g_D.B::a" "$vhn = 11"
+    gdb_test "print g_D.A::x" "base class 'A' is ambiguous in type 'D'"
     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.A::a" "base class 'A' is ambiguous in type 'E'"
+    gdb_test "print g_E.A::x" "base class 'A' is ambiguous in type 'E'"
     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"
 }
 
@@ skipping 22 matching lines @@
     gdb_test "ptype g_B.B::x" "type = int"
 
     # Print all members of g_C.
     gdb_test "ptype g_C.A::a" "type = int"
     gdb_test "ptype g_C.A::x" "type = int"
     gdb_test "ptype g_C.C::c" "type = int"
     gdb_test "ptype g_C.C::x" "type = int"
 
     # 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.
+    # g_D.A::a and g_D.A::x are ambiguous member accesses.
 
-    set name "ptype g_D.A::a"
-    gdb_test_multiple "ptype g_D.A::a" $name {
-        -re "type = int$nl$gdb_prompt $" {
-            kfail "gdb/68" "ptype g_D.A::a"
-        }
-    }
-
-    set name "ptype g_D.A::x"
-    gdb_test_multiple "ptype g_D.A::x" $name {
-        -re "type = int$nl$gdb_prompt $" {
-            kfail "gdb/68" "ptype g_D.A::x"
-        }
-    }
-
+    gdb_test "ptype g_D.A::a" "base class 'A' is ambiguous in type 'D'"
+    gdb_test "ptype g_D.A::x" "base class 'A' is ambiguous in type 'D'"
     gdb_test "ptype g_D.B::b" "type = int"
     gdb_test "ptype g_D.B::x" "type = int"
     gdb_test "ptype g_D.C::c" "type = int"
     gdb_test "ptype g_D.C::x" "type = int"
     gdb_test "ptype g_D.D::d" "type = int"
     gdb_test "ptype g_D.D::x" "type = int"
 
     # Print all members of g_E.
     # g_E.A::a and g_E.A::x are ambiguous.
 
-    set name "ptype g_E.A::a"
-    gdb_test_multiple "ptype g_E.A::a" $name {
-        -re "type = int$nl$gdb_prompt $" {
-            kfail "gdb/68" "ptype g_E.A::a"
-        }
-    }
-
-    set name "ptype g_E.A::x"
-    gdb_test_multiple "ptype g_E.A::x" $name {
-        -re "type = int$nl$gdb_prompt $" {
-            kfail "gdb/68" "ptype g_E.A::x"
-        }
-    }
-
+    gdb_test "ptype g_E.A::a" "base class 'A' is ambiguous in type 'E'"
+    gdb_test "ptype g_E.A::x" "base class 'A' is ambiguous in type 'E'"
     gdb_test "ptype g_E.B::b" "type = int"
     gdb_test "ptype g_E.B::x" "type = int"
     gdb_test "ptype g_E.C::c" "type = int"
     gdb_test "ptype g_E.C::x" "type = int"
     gdb_test "ptype g_E.D::d" "type = int"
     gdb_test "ptype g_E.D::x" "type = int"
     gdb_test "ptype g_E.E::e" "type = int"
     gdb_test "ptype g_E.E::x" "type = int"
 }
 
@@ skipping 201 matching lines @@
 
     # 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 $" {
+        -re "$vhn = \{<vB> = \{<vA> = \{va = 19, vx = 20\}, $re_vbptr_3_vB = ${hex}( <vtable for vD.*>)?, vb = 21, vx = 22\}, <vC> = \{$re_vbptr_3_vC = ${hex}( <vtable for vC.*>)?, vc = 23, vx = 24\}, $re_vbptr_3_vD = ${hex}( <vtable for vD.*>)?, 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 $" {
+        -re "$vhn = \{<vD> = \{<vB> = \{<vA> = \{va = 0, vx = 0\}, $re_vbptr_3_vB = ${hex}( <vtable for vE.*>)?, vb = 0, vx = 0\}, <vC> = \{$re_vbptr_3_vC = ${hex}( <vtable for vE.*>)?, vc = 0, vx = 0\}, $re_vbptr_3_vD = ${hex}( <vtable for vE.*>)?, vd = 0, vx = 0\}, $re_vbptr_3_vE = ${hex}( <vtable for vE.*>)?, ve = 27, vx = 28\}$nl$gdb_prompt $" {
             # gcc 3.3.4 -gdwarf-2
             # gcc 3.3.4 -gstabs+
             # gcc 3.4.1 -gdwarf-2
             # gcc 3.4.1 -gstabs+
             # gcc HEAD 2004-07-31 -gdwarf-2
             pass "$name (FIXME v3 vtbl ptr)"
         }
         -re "$vhn = \{<vD> = \{<vB> = \{<vA> = \{va = 0, vx = 0\}, $re_vbptr_3_vB = $hex, vb = 0, vx = 0\}, <vC> = \{$re_vbptr_3_vC = $hex <VTT for vD>, 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.2.7-rh -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 <typeinfo for vE>, 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 HEAD 2004-07-31 -gstabs+
             pass $name
         }
     }
 }
 
 proc do_tests { } {
-    global subdir
-    global objdir
-    global srcdir
-    global binfile
-
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
     gdb_test_no_output "set width 0"
 
     if { ![runto_main] } then {
         perror "couldn't run to main"
         return
     }
 
     gdb_test_no_output "set language c++"
     test_ptype_si
     test_ptype_mi
@@ skipping 17 matching lines @@
         return
     }
 
     test_print_svi_members
     test_print_svi_classes
     test_print_mvi_members
     test_print_mvi_classes
 }
 
 do_tests