Merge GDB 7.5.1

gdb/testsuite/gdb.java/jmain.exp

Index: gdb/testsuite/gdb.java/jmain.exp
diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp
index 8e9d7c62ad077bbdf26e9056d471c9788034d801..aba1e5ae63d7191a81526a15815b7318cbd4c141 100644
--- a/gdb/testsuite/gdb.java/jmain.exp
+++ b/gdb/testsuite/gdb.java/jmain.exp
@@ -16,18 +16,12 @@
 # This file was based on jmisc.exp which in turn was written by
 # Anthony Green. (green@redhat.com)
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
 load_lib "java.exp"
 
 if { [skip_java_tests] } { continue }
 
-set testfile "jmain"
-set srcfile ${srcdir}/$subdir/${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if {[compile_java_from_source ${srcfile} ${binfile} "-g"] != ""} {
+standard_testfile .java
+if {[compile_java_from_source $srcdir/$subdir/$srcfile $binfile "-g"] != ""} {
     continue
 }