Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 12 insertions, 2 deletions

diff --git a/libjava/testsuite/libjava.special/special.exp b/libjava/testsuite/libjava.special/special.exp
index ab18b47bff1..8397f856792 100644
--- a/libjava/testsuite/libjava.special/special.exp
+++ b/libjava/testsuite/libjava.special/special.exp
@@ -1,5 +1,10 @@
 # Special test cases.  These require tricky build procedures.
 
+proc gcj_special_try_compiler {} {
+  global srcdir subdir
+  return [bytecompile_file ${srcdir}/${subdir}/pr21115I.java [pwd]]
+}
+
 proc gcj_special_pr21115 {} {
   global srcdir subdir env
 
@@ -94,5 +99,10 @@ proc gcj_special_lazy_illegal_access {} {
   return 1
 }
 
-gcj_special_pr21115
-gcj_special_lazy_illegal_access
+# For these tests it is simpler to require that gcj work.  So we try
+# the compiler and if it fails, we simply skip the tests.
+
+if {[gcj_special_try_compiler]} {
+  gcj_special_pr21115
+  gcj_special_lazy_illegal_access
+}