Merge GDB 7.5.1

gdb/testsuite/gdb.cp/converts.exp

Index: gdb/testsuite/gdb.cp/converts.exp
diff --git a/gdb/testsuite/gdb.cp/converts.exp b/gdb/testsuite/gdb.cp/converts.exp
index bd2d84b104b3a5c59f5864031ff9af2290e9c336..9b8df58fe7e3979c54d0a4cad684df3e8a67874f 100644
--- a/gdb/testsuite/gdb.cp/converts.exp
+++ b/gdb/testsuite/gdb.cp/converts.exp
@@ -13,8 +13,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile converts
-set srcfile ${testfile}.cc
+standard_testfile .cc
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } {
      return -1
 }