Merge GDB 7.5.1

gdb/testsuite/gdb.cp/hang.exp

 #   Copyright 2002, 2004, 2007-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/>.
 
-if $tracelevel then {
-        strace $tracelevel
-}
-
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile hang
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile hang1.cc hang2.cc hang3.cc
 
-foreach file {hang1 hang2 hang3} {
-    if {[gdb_compile "${srcdir}/${subdir}/${file}.cc" "${file}.o" object {c++ debug}] != ""} {
-        untested hang.exp
-        return -1
-    }
+if {[prepare_for_testing $testfile.exp $testfile \
+         [list $srcfile $srcfile2 $srcfile3] {debug c++}]} {
+    return -1
 }
 
-if {[gdb_compile "hang1.o hang2.o hang3.o" ${binfile} executable {c++ debug}] != "" } {
-     untested hang.exp
-     return -1
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
 # As of May 1, 2002, GDB hangs trying to read the debug info for the
 # `hang2.o' compilation unit from the executable `hang', when compiled
 # by g++ 2.96 with STABS debugging info.  Here's what's going on, as
 # best as I can tell.
 #
 # The definition of `struct A' in `hang.H' refers to `struct B' as an
 # incomplete type.  The stabs declare type number (1,3) to be a cross-
 # reference type, `xsB:'.
 #
 # The definition of `struct C' contains a nested definition for
@@ skipping 60 matching lines @@
 # a separate compilation unit, whose psymtab depends on hang1.o's
 # psymtab.  Otherwise, GDB won't call cleanup_undefined_types (as it
 # finishes hang1.o's symbols) before it calls make_cv_type (while
 # reading hang3.o's symbols).
 #
 # The bug only happens when you compile with -gstabs+; Otherwise, GCC
 # won't include the `const' qualifier on `const_B_ptr' in `hang3.o''s
 # STABS, so GDB won't try to create a const variant of the smashed
 # struct type, and get caught by the corrupted cv_type chain.
 gdb_test "print var_in_hang3" " = 42" "doesn't corrupt cv_type chain"