Merge GDB 7.5.1

gdb/testsuite/gdb.cp/exception.exp

 # Copyright 1997-1998, 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
@@ skipping 16 matching lines @@
 # The interesting compiler flags are: "aCC +A -Wl,-a,-archive" .
 # Static-linked executables use a different mechanism to get the
 # address of the notification hook in the C++ support library.
 
 # TODO: this file has many absolute line numbers.
 # Replace them with gdb_get_line_number.
 
 set ws  "\[\r\n\t \]+"
 set nl  "\[\r\n\]+"
 
-if $tracelevel then {
-    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 "exception"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
  
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested exception.exp
-     return -1
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
 }
 
-# Start with a fresh gdb
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 # Set a catch catchpoint
 
 gdb_test "catch catch" "Catchpoint \[0-9\]+ \\(catch\\)" \
     "catch catch (before inferior run)"
 
 # Set a throw catchpoint
 
 gdb_test "catch throw" "Catchpoint \[0-9\]+ \\(throw\\)" \
     "catch throw (before inferior run)"
 
@@ skipping 156 matching lines @@
 #
 #    continue to re-throw ; backtrace
 #    continue to catch    ; backtrace
 #    continue to throw out of main
 #
 # The problem is that "re-throw" does not show a throw; only a catch.
 # I do not know if this is because of a bug, or because the generated
 # code is optimized for a throw into the same function.
 #
 # -- chastain 2004-01-09