2012-02-21 Pedro Alves <palves@redhat.com>

	* gdb.arch/altivec-abi.exp (altivec_abi_tests): Don't do
	with_test_prefix here.
	(top level): Do it here instead.  Remove `:' from the
	with_test_prefix string.
	* gdb.base/attach-pie-misread.exp: Remove the leading space the
	the suffix `:' from the with_test_prefix prefix string.
	* gdb.base/break-interp.exp: Ditto.
	* gdb.base/catch-load.exp: Ditto.
	* gdb.base/disp-step-syscall.exp: Ditto.
	* gdb.base/jit-so.exp: Ditto.
	* gdb.base/jit.exp: Ditto.
	* gdb.base/sepdebug.exp: Ditto.
	* gdb.base/solib-display.exp: Ditto.
	* gdb.base/solib-overlap.exp: Ditto.
	* gdb.base/watch-cond-infcall.exp: Ditto.
	* gdb.base/watchpoint.exp: Ditto.
	* gdb.dwarf2/dw2-noloc.exp: Ditto.
	* gdb.mi/mi-watch.exp: Ditto.
	* gdb.mi/mi2-watch.exp: Ditto.
	* gdb.threads/non-ldr-exc-1.exp: Ditto.
	* gdb.threads/non-ldr-exc-2.exp: Ditto.
	* gdb.threads/non-ldr-exc-3.exp: Ditto.
	* gdb.threads/non-ldr-exc-4.exp: Ditto.
	* gdb.threads/watchpoint-fork.exp: Ditto.
	* gdb.threads/watchthreads-reorder.exp: Ditto.
	* gdb.trace/change-loc.exp: Ditto.
	* gdb.trace/pending.exp: Ditto.
	* gdb.trace/status-stop.exp: Ditto.
	* gdb.trace/strace.exp: Ditto.
	* gdb.trace/trace-break.exp: Ditto.
	* gdb.trace/unavailable.exp: Ditto.
	* lib/gdb.exp (with_test_prefix): Always prefix with space and
	suffix with colon.  Adjust leading comments.

1 files changed, 18 insertions, 12 deletions

diff --git a/gdb/testsuite/gdb.arch/altivec-abi.exp b/gdb/testsuite/gdb.arch/altivec-abi.exp
index fd069b2..718018d 100644
--- a/gdb/testsuite/gdb.arch/altivec-abi.exp
+++ b/gdb/testsuite/gdb.arch/altivec-abi.exp
@@ -36,7 +36,7 @@ if [get_compiler_info $binfile] {
     return -1
 }
 
-proc altivec_abi_tests { prefix extra_flags force_abi } { with_test_prefix $prefix {
+proc altivec_abi_tests { prefix extra_flags force_abi } {
     global testfile binfile srcfile srcdir subdir
     global gdb_prompt
 
@@ -144,10 +144,12 @@ proc altivec_abi_tests { prefix extra_flags force_abi } { with_test_prefix $pref
     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*] {
-    altivec_abi_tests " default ABI, auto:" "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.
@@ -156,24 +158,28 @@ if [test_compiler_info gcc*] {
 	# was broken, so skip those tests there.
 	if { ![is_lp64_target] || ![test_compiler_info "gcc-4-\[12\]-*"] } {
 	    set binfile ${objdir}/${subdir}/${testfile}-ge-ge
-	    altivec_abi_tests " generic ABI, forced:" \
-		"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
-	    altivec_abi_tests " generic ABI, auto:" \
-		"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
-	altivec_abi_tests " AltiVec ABI, forced:" \
-	    "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
-	altivec_abi_tests " AltiVec ABI, auto:" \
-	    "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"
+    altivec_abi_tests "additional_flags=-qaltivec" "auto"
 } else {
     warning "unknown compiler"
     return -1