Merge GDB 7.5.1

gdb/testsuite/gdb.cp/ovsrch.exp

Index: gdb/testsuite/gdb.cp/ovsrch.exp
diff --git a/gdb/testsuite/gdb.cp/ovsrch.exp b/gdb/testsuite/gdb.cp/ovsrch.exp
index 5af536860a1fa85e83be6978f06447fc1da7ff77..b31c65578ab9a80c5fd8898b4aae5a54c69f87d3 100644
--- a/gdb/testsuite/gdb.cp/ovsrch.exp
+++ b/gdb/testsuite/gdb.cp/ovsrch.exp
@@ -55,15 +55,10 @@ proc test_class {class} {
 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
 }