Merge GDB 7.5.1

gdb/testsuite/gdb.cp/readnow-language.exp

Index: gdb/testsuite/gdb.cp/readnow-language.exp
diff --git a/gdb/testsuite/gdb.cp/readnow-language.exp b/gdb/testsuite/gdb.cp/readnow-language.exp
index 66141126ec2ed2759b3097b6936f52c090522e4f..a85b97006c9b65a07970d4f8fc858646d54be064 100644
--- a/gdb/testsuite/gdb.cp/readnow-language.exp
+++ b/gdb/testsuite/gdb.cp/readnow-language.exp
@@ -13,16 +13,15 @@
 # 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 readnow-language
-set srcfile ${testfile}.cc
-set executable ${testfile}
-if {[build_executable ${testfile}.exp $executable ${testfile}.cc {c++ debug}] == -1} {
+standard_testfile .cc
+
+if {[build_executable ${testfile}.exp $testfile ${testfile}.cc {c++ debug}] == -1} {
     return -1
 }
 
 set old_gdbflags $GDBFLAGS
 set GDBFLAGS "$GDBFLAGS -readnow"
-clean_restart $executable
+clean_restart $testfile
 set GDBFLAGS $old_gdbflags
 
 gdb_test "show language" {The current source language is "auto; currently c\+\+"\.}