* gdb.java/jmain.exp: Use standard_testfile.

	* gdb.java/jmisc.exp: Use standard_testfile.
	* gdb.java/jnpe.exp: Use standard_testfile.
	* gdb.java/jprint.exp: Use standard_testfile.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2da69ace282106b37f63bf8c9483a26ed4c29e18..2bfe39b37655bdde13636950442ada48a9401371 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-22  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.java/jmain.exp: Use standard_testfile.
+       * gdb.java/jmisc.exp: Use standard_testfile.
+       * gdb.java/jnpe.exp: Use standard_testfile.
+       * gdb.java/jprint.exp: Use standard_testfile.
+
 2012-06-22  Tom Tromey  <tromey@redhat.com>
 
        * lib/gdb.exp (default_gdb_init): Set gdb_test_file_name.

diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp
index 8bb82b15e306b3e20e6ece80259f782dacd54c28..aba1e5ae63d7191a81526a15815b7318cbd4c141 100644 (file)
--- a/gdb/testsuite/gdb.java/jmain.exp
+++ b/gdb/testsuite/gdb.java/jmain.exp
@@ -20,10 +20,8 @@ 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
 }
 

diff --git a/gdb/testsuite/gdb.java/jmisc.exp b/gdb/testsuite/gdb.java/jmisc.exp
index 9ca35b8f3504ddebb95767f78d67ef22b04bb3d7..72158613eadfaa762382d7af1eb36684ef6b90a4 100644 (file)
--- a/gdb/testsuite/gdb.java/jmisc.exp
+++ b/gdb/testsuite/gdb.java/jmisc.exp
@@ -20,10 +20,8 @@ load_lib "java.exp"
 
 if { [skip_java_tests] } { continue }
 
-set testfile "jmisc"
-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
 }
 

diff --git a/gdb/testsuite/gdb.java/jnpe.exp b/gdb/testsuite/gdb.java/jnpe.exp
index dc76bc82c18aefb34dbe3aa7b2b8ed9ca7d0eaa7..f7225d80dff994f90af525a20dab649d25dd83ab 100644 (file)
--- a/gdb/testsuite/gdb.java/jnpe.exp
+++ b/gdb/testsuite/gdb.java/jnpe.exp
@@ -15,10 +15,8 @@
 
 load_lib "java.exp"
 
-set testfile "jnpe"
-set srcfile ${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [compile_java_from_source ${srcdir}/$subdir/${srcfile} ${binfile} "-g"] != "" } {
+standard_testfile .java
+if  { [compile_java_from_source $srcdir/$subdir/$srcfile $binfile "-g"] != "" } {
     untested "Couldn't compile ${srcdir}/$subdir/${srcfile}"
     return -1
 }

diff --git a/gdb/testsuite/gdb.java/jprint.exp b/gdb/testsuite/gdb.java/jprint.exp
index 131dd47cd99052bde8d6228666be6c1b82becf06..b2d5d310cc34c78b5def973ba55636ad9ace9c80 100644 (file)
--- a/gdb/testsuite/gdb.java/jprint.exp
+++ b/gdb/testsuite/gdb.java/jprint.exp
@@ -20,10 +20,8 @@ load_lib "java.exp"
 
 if { [skip_java_tests] } { continue }
 
-set testfile "jprint"
-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
 }