Merge GDB 7.5.1

gdb/testsuite/gdb.trace/tfile.exp

Index: gdb/testsuite/gdb.trace/tfile.exp
diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp
index 7e996a4d97986b6357a9a9ffde87dac3116563fb..a2c5c1d4ea3a7d40a0984d918f7357eefc47b351 100644
--- a/gdb/testsuite/gdb.trace/tfile.exp
+++ b/gdb/testsuite/gdb.trace/tfile.exp
@@ -27,16 +27,10 @@ if [target_info exists gdb,nofileio] {
     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