Merge GDB 7.5.1

gdb/testsuite/gdb.trace/tsv.exp

 #   Copyright 2009-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/>.
 
 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/tsv
+standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
           executable {debug nowarnings}] != "" } {
     untested tsv.exp
     return -1
 }
 gdb_load $binfile
 
 gdb_test "tvariable \$tvar1" \
   "Trace state variable \\\$tvar1 created, with initial value 0." \
   "Create a trace state variable"
@@ skipping 51 matching lines @@
   "No trace state variables.*" \
   "List tvariables after deleting all"
 
 # Now try running a trace.
 
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
 # The rest of the testing needs actual tracing to work.
 if { ![gdb_target_supports_trace] } then {
-    pass "Current target does not support trace"
+    unsupported "Current target does not support trace"
     return 1;
 }
 
 # define relative source line numbers:
 # all subsequent line numbers are relative to this first one (baseline)
 
 set baseline  [gdb_find_recursion_test_baseline $srcfile];
 if { $baseline == -1 } then {
     fail "Could not find gdb_recursion_test function"
     return;
@@ skipping 31 matching lines @@
 
 gdb_test "print \$tvar5" " = 16" \
     "Print a trace state variable during run"
 
 gdb_test "tstop" ".*" ""
 
 gdb_test "print \$tvar5" " = 16" \
     "Print a trace state variable after run"