Merge GDB 7.5.1

gdb/testsuite/gdb.trace/save-trace.exp

 #   Copyright 1998, 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/save-trace
+standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
           executable {debug nowarnings}] != "" } {
     untested save-trace.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 92 matching lines @@
 gdb_test_no_output "set default-collect" "10.2: clear default-collect"
 gdb_test "info tracepoints" "No tracepoints." "10.2: delete tracepoints"
 gdb_test "source savetrace.tr" \
         "Tracepoint \[0-9\]+ at .*" \
         "10.2: read back saved tracepoints"
 gdb_verify_tracepoints "10.2: verify recovered tracepoints";
 remote_file host delete savetrace.tr
 
 # 10.3 repeat with a path to the file
 
-set escapedfilename [string_to_regexp $objdir/savetrace.tr]
-remote_file host delete $objdir/savetrace.tr
-gdb_test "save-tracepoints $objdir/savetrace.tr" \
+set trace_file_name [standard_output_file savetrace.tr]
+set escapedfilename [string_to_regexp $trace_file_name]
+remote_file host delete $trace_file_name
+gdb_test "save-tracepoints $trace_file_name" \
         "Saved to file '${escapedfilename}'." \
         "10.3: save tracepoint definitions, full path"
 
 gdb_delete_tracepoints
 gdb_test_no_output "set default-collect" "10.3: clear default-collect"
 gdb_test "info tracepoints" "No tracepoints." "10.3: delete tracepoints"
-gdb_test "source $objdir/savetrace.tr" \
+gdb_test "source $trace_file_name" \
         "Tracepoint \[0-9\]+ at .*" \
         "10.4: read saved tracepoints, full path"
 gdb_verify_tracepoints "10.3: verify recovered tracepoints, full path";
-remote_file host delete $objdir/savetrace.tr
+remote_file host delete $trace_file_name
 
 # 10.5 invalid filename
 #      [deferred -- not sure what a good invalid filename would be]
 
 # 10.6 save-trace (file already exists)
 #      [expect it to clobber the old one]
 
 # 10.7 help save-tracepoints
 
 gdb_test "help save-tracepoints" \
         "Save current tracepoint definitions as a script.*" \
         "10.7: help save-tracepoints"