Merge GDB 7.5.1

gdb/testsuite/gdb.mi/mi2-watch.exp

 # Copyright 1999-2004, 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
@@ skipping 14 matching lines @@
 #
 
 load_lib mi-support.exp
 set MIFLAGS "-i=mi2"
 
 gdb_exit
 if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-watch
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
+standard_testfile basics.c
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-watch.exp
      return -1
 }
 
 proc test_watchpoint_creation_and_listing {type} {
     global mi_gdb_prompt
     global srcfile
     global hex
 
     set line_callee4_head [gdb_get_line_number "callee4 ("]
@@ skipping 90 matching lines @@
     if { $type == "sw" } {
       setup_xfail *-*-*
     }
     mi_execute_to "exec-continue" "watchpoint-scope" "callee3" ".*" \
         ".*basics.c" $line_callee3_close_brace \
         {"" "wpnum=\"2\""} \
         "watchpoint trigger"
     clear_xfail *-*-*
 }
 
-proc test_watchpoint_all {type} {
-    global pf_prefix
+proc test_watchpoint_all {type} { with_test_prefix "$type" {
     upvar srcdir srcdir
     upvar subdir subdir
     upvar binfile binfile
 
-    set old_prefix $pf_prefix
-    lappend pf_prefix "$type:"
-
     mi_delete_breakpoints
     mi_gdb_reinitialize_dir $srcdir/$subdir
     mi_gdb_load ${binfile}
 
     mi_runto callee4
     test_watchpoint_creation_and_listing $type
     #test_rwatch_creation_and_listing $type
     #test_awatch_creation_and_listing $type
     test_watchpoint_triggering $type
-
-    set pf_prefix $old_prefix
-}
+}}
 
 # Run the tests twice, once using software watchpoints...
 mi_gdb_test "567-gdb-set can-use-hw-watchpoints 0" \
         "567\\^done" \
         "hw watchpoints toggle (1)"
 test_watchpoint_all sw
 
 mi_gdb_exit
 
 # ... and unless requested otherwise...
 if [target_info exists gdb,no_hardware_watchpoints] {
     return 0
 }
 
 mi_gdb_start
 
 # ... once using hardware watchpoints (if available).
 mi_gdb_test "890-gdb-set can-use-hw-watchpoints 1" \
         "890\\^done" \
         "hw watchpoints toggle (2)"
 test_watchpoint_all hw
 
 mi_gdb_exit
 return 0