Merge GDB 7.5.1

gdb/testsuite/gdb.threads/watchthreads-reorder.exp

 # This testcase is part of GDB, the GNU debugger.
 
 # 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,
@@ skipping 13 matching lines @@
 # "show breakpoint always-inserted" being "off".  Formerly the remembered hit
 # could be assigned during continuation of a thread with pending SIGTRAP to the
 # different/new watchpoint, just based on the watchpoint/debug register number.
 
 if {[skip_hw_watchpoint_access_tests]
     || [skip_hw_watchpoint_multi_tests]
     || ![istarget *-*-linux*]} {
     return 0
 }
 
-set testfile "watchthreads-reorder"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" ${binfile} executable [list debug additional_flags=-lrt]] != "" } {
     return -1
 }
 
-foreach reorder {0 1} {
-
-    global pf_prefix
-    set prefix_test $pf_prefix
-    lappend pf_prefix "reorder$reorder:"
+foreach reorder {0 1} { with_test_prefix "reorder$reorder" {
 
     clean_restart $testfile
 
     gdb_test "set can-use-hw-watchpoints 1"
 
     if ![runto_main] {
         return -1
     }
 
     # Use "rwatch" as "watch" would report the watchpoint changed just based on its
@@ skipping 34 matching lines @@
 
     gdb_test "continue" \
              "Hardware read watchpoint \[0-9\]+: thread\[12\]_rwatch\r\n\r\nValue = 0\r\n0x\[0-9a-f\]+ in thread\[12\]_func .*" \
              "continue b"
 
     # While the debug output itself is not checked in this testcase one bug was
     # found in the DEBUG_INFRUN code path.
     gdb_test "set debug infrun 1"
 
     gdb_continue_to_breakpoint "break-at-exit" ".*break-at-exit.*"
-
-    set pf_prefix $prefix_test
-}
+}}