Merge GDB 7.5.1

gdb/testsuite/gdb.cp/gdb1355.exp

 # Copyright 2003, 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/>.
 
 # Tests for PR gdb/1355, which is a reference to PR gcc/12066.
 # 2003-08-26  Michael Chastain <mec@shout.net>
 
 # This file is part of the gdb testsuite.
 
 set ws "\[\r\n\t \]*"
 set nl "\[\r\n\]+"
 
-if $tracelevel then {
-    strace $tracelevel
-    }
-
 if { [skip_cplus_tests] } { continue }
 
 #
 # test running programs
 #
 
-set testfile "gdb1355"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested gdb1355.exp
-     return -1
-}
-
-if [get_compiler_info ${binfile} "c++"] {
+if [get_compiler_info "c++"] {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
+}
 
 if ![runto_main] then {
     perror "couldn't run to main"
     continue
 } 
 
 # See http://sources.redhat.com/gdb/bugs/1355
 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12066
 #
 # g++ -gstabs+ does not emit stabs for fundamental types.
@@ skipping 47 matching lines @@
     -re "$decimal = \{m_int = 117, m_char = 97 'a', m_long_int = 118, m_unsigned_int = 119, m_long_unsigned_int = 120, m_short_int = 123, m_short_unsigned_int = 124, m_unsigned_char = 98 'b', m_float = 125, m_double = 126, m_long_double = 127, m_bool = 117\}$nl$gdb_prompt $" {
         # This pattern is very picky, but if more different output
         # shows up, I can just add more arms.  -- chastain 2003-08-26
         #
         # This happened with gcc HEAD 2003-08-20 08:00:00 UTC, -gstabs+.
         # Look at the value of m_bool.  It looks like gdb latched onto
         # random int type and then used the data at structure offset 0.
         kfail "gdb/1355" "print s1"
     }
 }