4 files changed, 9 insertions, 16 deletions
diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp
index 6b62708..79cb1dd 100644
--- a/gdb/testsuite/gdb.java/jmain.exp
+++ b/gdb/testsuite/gdb.java/jmain.exp
@@ -23,13 +23,12 @@ if $tracelevel then {
 
 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"] != ""} {
-    continue
+if  { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } {
+    untested "Couldn't compile ${srcfile}"
+    return -1
 }
 
 set prms_id 0
diff --git a/gdb/testsuite/gdb.java/jmisc.exp b/gdb/testsuite/gdb.java/jmisc.exp
index 74557bd..1901cec 100644
--- a/gdb/testsuite/gdb.java/jmisc.exp
+++ b/gdb/testsuite/gdb.java/jmisc.exp
@@ -26,13 +26,12 @@ if $tracelevel then {
 
 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"] != ""} {
-    continue
+if  { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } {
+    untested "Couldn't compile ${srcfile}"
+    return -1
 }
 
 # Set the current language to java.  This counts as a test.  If it
diff --git a/gdb/testsuite/gdb.java/jprint.exp b/gdb/testsuite/gdb.java/jprint.exp
index 4926babc..73c422f 100644
--- a/gdb/testsuite/gdb.java/jprint.exp
+++ b/gdb/testsuite/gdb.java/jprint.exp
@@ -23,13 +23,12 @@ if $tracelevel then {
 
 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"] != ""} {
-    continue
+if  { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } {
+    untested "Couldn't compile ${srcfile}"
+    return -1
 }
 
 # Set the current language to java.  This counts as a test.  If it
diff --git a/gdb/testsuite/gdb.java/jv-print.exp b/gdb/testsuite/gdb.java/jv-print.exp
index c31fbf7..26e7495 100644
--- a/gdb/testsuite/gdb.java/jv-print.exp
+++ b/gdb/testsuite/gdb.java/jv-print.exp
@@ -21,10 +21,6 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
-load_lib "java.exp"
-
-if { [skip_java_tests] } { continue }
-
 set prms_id 0
 set bug_id 0