Merge GDB 7.5.1

gdb/testsuite/gdb.threads/schedlock.exp

 # Copyright (C) 1996-1997, 2002-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/>.
 
 # This file was written by Daniel Jacobowitz <drow@mvista.com>
 # (parts based on pthreads.exp by Fred Fish (fnf@cygnus.com).
 #
 # This test covers the various forms of "set scheduler-locking".
 
-if $tracelevel then {
-        strace $tracelevel
-}
 
-
-set testfile "schedlock"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
 # The number of threads, including the main thread.
 set NUM 2
 
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
     return -1
 }
 
 # Now we can proceed with the real testing.
 
 proc get_args { } {
     global list_count
     global gdb_prompt
     global NUM
 
@@ skipping 261 matching lines @@
     }
   }
 }
 if {$num_other_threads > 0} {
   fail "other threads didn't run - step locked"
 } else {
   pass "other threads didn't run - step locked"
 }
 
 return 0