Merge GDB 7.5.1

gdb/testsuite/gdb.trace/collection.exp

 # Copyright 1998, 2005, 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/>.
 
 load_lib "trace-support.exp"
 
-if $tracelevel then {
-        strace $tracelevel
-}
 
+standard_testfile
+set executable $testfile
 
-set testfile "collection"
-set srcfile ${testfile}.c
-set executable $testfile
-set binfile $objdir/$subdir/$executable
-
-if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-        executable {debug nowarnings}] != "" } {
-    untested collection.exp
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} {
     return -1
 }
 
 # Tests: 
 # 1) $args
 # 2) function args by name
 # 3) $locs
 # 4) function locals by name
 # 5) $regs
 # 6) registers by name ($sp, $fp?)
@@ skipping 732 matching lines @@
     gdb_collect_return_test
 
     gdb_collect_strings_test strings_test_func "locstr" "abcdef" "" \
             "local string"
 
     gdb_collect_strings_test strings_test_func "longloc" "how now brown c" 15 \
             "long local string"
 
 }
 
-clean_restart $executable
 runto_main
 
-# We generously give ourselves one "pass" if we successfully
-# detect that this test cannot be run on this target!
 if { ![gdb_target_supports_trace] } then {
-    pass "Current target does not support trace"
+    unsupported "Current target does not support trace"
     return 1;
 }
 
 # Body of test encased in a proc so we can return prematurely.
 gdb_trace_collection_test
 
 # Finished!
 gdb_test "tfind none" ".*" ""