Merge GDB 7.5.1

gdb/testsuite/gdb.cp/bs15503.exp

 # Copyright 1992, 2004-2005, 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/>.  */
 
 # Test case for CLLbs15503
 # This file was written by Sue Kimura (sue_kimura@hp.com)
 # Rewritten by Michael Chastain (mec.gnu@mindspring.com)
 
-if $tracelevel {
-    strace $tracelevel
-}
-
 if { [skip_stl_tests] } { continue }
 
 # On SPU this test fails because the executable exceeds local storage size.
 if { [istarget "spu*-*-*"] } {
         return 0
 }
 
-set testfile "bs15503"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }
 
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "debug c++"] != "" } {
-    untested bs15503.exp
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
     continue
 }
 
 # Set breakpoint on template function
 
 gdb_test "break StringTest<wchar_t>::testFunction" \
     "Breakpoint $decimal at $hex: file .*${srcfile}, line $decimal."
 
@@ skipping 38 matching lines @@
 gdb_test "print (const char *) (s=s.substr(0,4))" \
     "\\$\[0-9\]+ = $hex \"I am\""
 
 # TODO: cannot call overloaded non-member operator again.
 # -- chastain 2004-01-07
 # 
 # gdb_test "print (const char *) (s + s)" \
 #    "\\$\[0-9\]+ = $hex \"I amI am\""
 # gdb_test "print (const char *) (s + \" \" + s)" \
 #    "\\$\[0-9\]+ = $hex \"I am I am\""