FYI: fix up gdb.java

Tom Tromey tromey@redhat.com
Fri Jun 22 16:44:00 GMT 2012


I'm checking this in.

This fixes the gdb.java tests to use standard_testfile.
Also, now nothing in this directory refers directly to $objdir.

Tom

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.

Index: gdb.java/jmain.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.java/jmain.exp,v
retrieving revision 1.17
diff -u -r1.17 jmain.exp
--- gdb.java/jmain.exp	16 Jan 2012 16:21:50 -0000	1.17
+++ gdb.java/jmain.exp	22 Jun 2012 16:40:48 -0000
@@ -20,10 +20,8 @@
 
 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
 }
 
Index: gdb.java/jmisc.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.java/jmisc.exp,v
retrieving revision 1.24
diff -u -r1.24 jmisc.exp
--- gdb.java/jmisc.exp	16 Jan 2012 16:21:50 -0000	1.24
+++ gdb.java/jmisc.exp	22 Jun 2012 16:40:48 -0000
@@ -20,10 +20,8 @@
 
 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
 }
 
Index: gdb.java/jnpe.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.java/jnpe.exp,v
retrieving revision 1.4
diff -u -r1.4 jnpe.exp
--- gdb.java/jnpe.exp	16 Jan 2012 16:21:50 -0000	1.4
+++ gdb.java/jnpe.exp	22 Jun 2012 16:40:48 -0000
@@ -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
 }
Index: gdb.java/jprint.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.java/jprint.exp,v
retrieving revision 1.22
diff -u -r1.22 jprint.exp
--- gdb.java/jprint.exp	19 Jan 2012 12:37:28 -0000	1.22
+++ gdb.java/jprint.exp	22 Jun 2012 16:40:48 -0000
@@ -20,10 +20,8 @@
 
 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
 }
 



More information about the Gdb-patches mailing list