Merge GDB 7.5.1

gdb/testsuite/gdb.cp/ovsrch.exp

 # Copyright 2011-2012 Free Software Foundation, Inc.
 #
 # Contributed by Red Hat, originally written by Keith Seitz.
 #
 # 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 37 matching lines @@
     }
 
     # Test whether open parentheses are correctly identified as overload
     # information or conditional.
     gdb_test "break ${class}::hibob if (a_param == 3)" "Breakpoint (\[0-9\]).*"
 }
 
 if { [skip_cplus_tests] } { continue }
 
 # Test for c++/11734
-set testfile "ovsrch"
-set binfile [file join $objdir $subdir $testfile]
+standard_testfile ovsrch1.cc ovsrch2.cc ovsrch3.cc ovsrch4.cc
 
-set srcfiles {}
-for {set i 1} {$i < 5} {incr i} {
-    lappend srcfiles $testfile$i.cc
-}
-
-if {[prepare_for_testing $testfile $testfile $srcfiles {c++ debug}]} {
+if {[prepare_for_testing $testfile $testfile \
+         [list $srcfile $srcfile2 $srcfile3 $srcfile4] {c++ debug}]} {
     return -1
 }
 
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
     continue
 }
 
 # Break in A::stop_here and run tests.
 if {[gdb_breakpoint "A::stop_here"]} {
@@ skipping 14 matching lines @@
 
 if {[gdb_breakpoint "'A::B::stop_here_too'"]} {
     pass "break 'A::B::stop_here_too'"
 }
 
 gdb_continue_to_breakpoint "stop_here_too"
 test_class A::B::inner
 
 gdb_exit
 return 0