Merge GDB 7.5.1

gdb/testsuite/gdb.arch/altivec-abi.exp

 # Copyright (C) 2002-2003, 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/>.
 #
 
 # Tests for Powerpc AltiVec ABI
 
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 #
 # This file uses altivec-abi.c for input.
 #
 
 if {![istarget "powerpc*"] || [skip_altivec_tests]} then {
     verbose "Skipping altivec abi tests."
     return
 }
 
 set testfile "altivec-abi"
 set binfile ${objdir}/${subdir}/${testfile}
 set srcfile ${testfile}.c
 
-if [get_compiler_info $binfile] {
+if [get_compiler_info] {
     warning "get_compiler failed"
     return -1
 }
 
 proc altivec_abi_tests { extra_flags force_abi } {
     global testfile binfile srcfile srcdir subdir
     global gdb_prompt
 
     set compile_flags "debug nowarnings $extra_flags"
 
@@ skipping 95 matching lines @@
         "back to main (2)"
 
     gdb_test "step" "" "step into array_of_vector_func"
     gdb_test "p matrix\[0\]" ".*= .1, 2, 3, 4, 5, 6, 7, 8." "print first vector"
     gdb_test "p matrix\[1\]" ".*= .11, 12, 13, 14, 15, 16, 17, 18." "print second vector"
     gdb_test "p matrix\[2\]" ".*= .21, 22, 23, 24, 25, 26, 27, 28." "print third vector"
     gdb_test "p matrix\[3\]" ".*= .31, 32, 33, 34, 35, 36, 37, 38." "print fourth vector"
 }
 
 if [test_compiler_info gcc*] {
-    set saved_prefix $pf_prefix
-
-    set pf_prefix "${saved_prefix} default ABI, auto:"
-    altivec_abi_tests "additional_flags=-maltivec" "auto"
+    with_test_prefix "default ABI, auto" {
+        altivec_abi_tests  "additional_flags=-maltivec" "auto"
+    }
 
     # On GNU/Linux, we can mix -mabi=no-altivec and -mabi=altivec.
     # So test some combinations.
     if { [istarget "powerpc*-linux*"] } {
         # On 64-bit GNU/Linux with GCC 4.1 and 4.2, -mabi=no-altivec
         # was broken, so skip those tests there.
         if { ![is_lp64_target] || ![test_compiler_info "gcc-4-\[12\]-*"] } {
             set binfile ${objdir}/${subdir}/${testfile}-ge-ge
-            set pf_prefix "${saved_prefix} generic ABI, forced:"
-            altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=no-altivec" "generic"
+            with_test_prefix "generic ABI, forced" {
+                altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=no-altivec" "generic"
+            }
 
             set binfile ${objdir}/${subdir}/${testfile}-ge-auto
-            set pf_prefix "${saved_prefix} generic ABI, auto:"
-            altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=no-altivec" "auto"
+            with_test_prefix "generic ABI, auto" {
+                altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=no-altivec" "auto"
+            }
         }
 
         set binfile ${objdir}/${subdir}/${testfile}-av-av
-        set pf_prefix "${saved_prefix} AltiVec ABI, forced:"
-        altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=altivec" "altivec"
+        with_test_prefix "AltiVec ABI, forced" {
+            altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=altivec" "altivec"
+        }
 
         set binfile ${objdir}/${subdir}/${testfile}-av-auto
-        set pf_prefix "${saved_prefix} AltiVec ABI, auto:"
-        altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=altivec" "auto"
+        with_test_prefix "AltiVec ABI, auto" {
+            altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=altivec" "auto"
+        }
     }
 } elseif [test_compiler_info xlc*] {
     altivec_abi_tests "additional_flags=-qaltivec" "auto"
 } else {
     warning "unknown compiler"
     return -1
 }