aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2012-06-22 16:44:15 +0000
committerTom Tromey <tromey@redhat.com>2012-06-22 16:44:15 +0000
commitc24ccbcea9fbbd866f17e8934105830dae0810fc (patch)
treeeeb0b95746625dd88d307003f5458ae56718ca85
parent29c048b696d4e93fe9f595d59fcb6239270e5a29 (diff)
downloadgdb-c24ccbcea9fbbd866f17e8934105830dae0810fc.zip
gdb-c24ccbcea9fbbd866f17e8934105830dae0810fc.tar.gz
gdb-c24ccbcea9fbbd866f17e8934105830dae0810fc.tar.bz2
* 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.
-rw-r--r--gdb/testsuite/ChangeLog7
-rw-r--r--gdb/testsuite/gdb.java/jmain.exp6
-rw-r--r--gdb/testsuite/gdb.java/jmisc.exp6
-rw-r--r--gdb/testsuite/gdb.java/jnpe.exp6
-rw-r--r--gdb/testsuite/gdb.java/jprint.exp6
5 files changed, 15 insertions, 16 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2da69ac..2bfe39b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,12 @@
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.
(standard_output_file, standard_testfile): New procs.
(build_executable, clean_restart): Use standard_output_file.
diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp
index 8bb82b1..aba1e5a 100644
--- 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 9ca35b8..7215861 100644
--- 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 dc76bc8..f7225d8 100644
--- 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 131dd47..b2d5d31 100644
--- 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
}