Merge GDB 7.5.1

gdb/testsuite/gdb.stabs/weird.exp

 # Copyright 1997-1999, 2001, 2003-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/>.
 
 # Test that GDB properly ignores invalid stabs.
 # Also test that GDB can debug a .o file, and that it doesn't mind
 # a file that's more minimal than what a compiler normally puts out.
-if $tracelevel then {
-        strace $tracelevel
-}
-
-# If the test directory was not created by configure then skip
-# this test.
-if ![file isdirectory ${objdir}/${subdir}] then {
-    return 0
-}
-
 
 set testfile weird
-set srcfile ${objdir}/${subdir}/weird.s
-set binfile ${objdir}/${subdir}/weirdx.o
+set srcfile [standard_output_file weird.s]
+set binfile [standard_output_file weirdx.o]
 
-if { [ get_compiler_info "$binfile" ] } {
+if { [ get_compiler_info ] } {
     return -1
 }
 
 if { $hp_cc_compiler || $hp_aCC_compiler } {
     # The native hp-ux assembler does not support stabs at all.
     # If the compiler is native hp-ux, of course the assembler is too.
     # But if someone builds gcc with the native assembler (not recommended)
     # rather than the gnu assembler, then this logic will not suppress it.
     # -- chastain 2004-01-07
     unsupported "stabs with hp-ux assembler"
@@ skipping 285 matching lines @@
         return -1
     }
     eof { fail "(eof) cannot read weirdx.o" }
 }
 
 do_tests
 
 remote_file host delete ${binfile}
 
 return 0