* tests/convenience.at (Java convenience archives): Skip test if

gcj cannot compile a .java file.
Report by Nelson H. F. Beebe.

diff --git a/ChangeLog b/ChangeLog
index 082dea531938f3dc380d6350e39b0325fbba33b9..bf0b8aa2fddec1bfffe26705711b609595b1991a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * tests/convenience.at (Java convenience archives): Skip test if
+       gcj cannot compile a .java file.
+       Report by Nelson H. F. Beebe.
+
 2008-03-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * libltdl/config/ltmain.m4sh (func_lalib_unsafe_p): redirect

diff --git a/tests/convenience.at b/tests/convenience.at
index f49a910720b3a1068c387ecc82e2cee1d6499788..c1efa0a429db325e37d3eed6b971833e4d31e994 100644 (file)
--- a/tests/convenience.at
+++ b/tests/convenience.at
@@ -1,6 +1,6 @@
 # convenience.at -- testing C convenience archives            -*- Autotest -*-
 
-#   Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2005
 #
 #   This file is part of GNU Libtool.
@@ -258,6 +258,14 @@ public class A$i {
   public A$i () { a = 0; }
 };
 EOF
+
+  # There are just too many broken gcj installations out there, either missing
+  # libgcj.spec or unable to find it.  Skip this test for them.
+  if test $i -eq 1; then
+    AT_CHECK[($GCJ $GCJFLAGS -c foo1.java || exit 77], [], [ignore], [ignore])
+    rm -f foo1.o foo1.obj
+  fi
+
   $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c foo$i.java
   $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c A$i.java
   $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba$i.la A$i.lo