Merge GDB 7.5.1

gdb/testsuite/gdb.trace/tfile.exp

 #   Copyright 2010-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 of trace file support.
 
 # Note that unlike most of the tracing tests, this can be run on
 # targets lacking tracepoint support; the program tfile.c has the
 # ability to generate synthetic trace files directly, and the tfile
 # target is available to all GDB configs.
 
 load_lib "trace-support.exp";
 
 if [target_info exists gdb,nofileio] {
     verbose "Skipping tfile.exp because of no fileio capabilities."
     continue
 }
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 
 gdb_exit
 gdb_start
-set testfile "tfile"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/$testfile
+standard_testfile
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
           executable {debug nowarnings}] != "" } {
     untested ${testfile}.exp
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
 
 # Make sure we are starting fresh.
 remote_file host delete basic.tf
 remote_file host delete error.tf
@@ skipping 64 matching lines @@
 Trace stopped by an error \\(made-up error, tracepoint 1\\).*
 Collected 0 trace frame.*
 Trace buffer has 256 bytes of 4096 bytes free \\(93% full\\).*
 Not looking at any trace frame.*" \
     "tstatus on error trace file"
 
 # Make sure we can reopen without error.
 gdb_test \
     "interpreter-exec mi \"-target-select tfile basic.tf\"" \
     "\\^connected.*"