Merge GDB 7.5.1

gdb/testsuite/gdb.trace/deltrace.exp

 #   Copyright 1998-1999, 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 Michael Snyder (msnyder@cygnus.com)
 
 load_lib "trace-support.exp";
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 
 gdb_exit
 gdb_start
 
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/deltrace
+standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
           executable {debug nowarnings}] != "" } {
     untested deltrace.exp
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
 
 # If testing on a remote host, download the source file.
 # remote_download host $srcdir/$subdir/$srcfile
 
@@ skipping 145 matching lines @@
                         "3.4: delete invalid tracepoint number"
 
 # 3.5 delete tracepoint number zero
 gdb_test "delete tracepoint 0" "bad breakpoint number at or near '0'" \
                         "3.5: delete tracepoint number zero"
 
 # 3.6 help delete tracepoints
 gdb_test "help delete tracepoints" \
     "Delete specified tracepoints.*" \
                         "3.6: help delete tracepoints"