Merge GDB 7.5.1

gdb/testsuite/gdb.threads/non-ldr-exc-4.exp

Index: gdb/testsuite/gdb.threads/non-ldr-exc-4.exp
diff --git a/gdb/testsuite/gdb.threads/non-ldr-exc-4.exp b/gdb/testsuite/gdb.threads/non-ldr-exc-4.exp
index 943b07704adfec29a4eb98366f0924ec81a1c038..7543e20ed936d1f0b989528b77d9d346f6046939 100644
--- a/gdb/testsuite/gdb.threads/non-ldr-exc-4.exp
+++ b/gdb/testsuite/gdb.threads/non-ldr-exc-4.exp
@@ -23,26 +23,19 @@ if { [is_remote target] } then {
     continue
 }
 
-set testfile "non-ldr-exc-4"
-set srcfile ${testfile}.c
+standard_testfile
 set executable ${testfile}
-set binfile ${objdir}/${subdir}/${executable}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     return -1
 }
 
-proc do_test { lock_sched } {
-    global pf_prefix
+proc do_test { lock_sched } { with_test_prefix "lock-sched$lock_sched" {
     global executable
 
-    set save_pf_prefix $pf_prefix
-    lappend pf_prefix "lock-sched$lock_sched:"
-
     clean_restart ${executable}
 
     if ![runto_main] {
-	set pf_prefix $save_pf_prefix
 	return -1
     }
 
@@ -59,9 +52,7 @@ proc do_test { lock_sched } {
     gdb_test "continue" \
 	".*is executing new program.*Breakpoint 1, main.* at .*" \
 	"continue over exec"
-
-    set pf_prefix $save_pf_prefix
-}
+}}
 
 do_test 0
 do_test 1