[PATCH] {maint} test defs: new requirement for the default java compiler

[Stefano Lattarini]

Hello automakers.

IMHO having a proper requirement for the java compiler in `tests/defs'
would be better than the current behaviour running the check for the
availability of javac in the generated configure script in each
relevant test.   And it would also be faster for systems that lack
a java compiler (which are then to skip the test).

The usefulness of this patch will be further increased if we add more
tests on java support in the future.

So, OK to apply the attached patch to maint?  I will push in 72 hours
if there is no objection.

Regards,
  Stefano

From 142d184bc0dd63b8087e8f64b51059bd72960f5e Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Sun, 10 Apr 2011 09:01:37 +0200
Subject: [PATCH] test defs: new requirement for the default java compiler

* tests/defs.in (for tool in $required): New requirement 'javac'.
* tests/java.test: Use it instead of ad-hoc configure check.
* tests/java-check.test: Likewise.
---
 ChangeLog             |    7 +++++++
 tests/defs.in         |    4 ++++
 tests/java-check.test |    3 +--
 tests/java.test       |    3 +--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d82d363..366d295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-10  Stefano Lattarini  <address@hidden>
+
+       test defs: new requirement for the default java compiler
+       * tests/defs.in (for tool in $required): New requirement 'javac'.
+       * tests/java.test: Use it instead of ad-hoc configure check.
+       * tests/java-check.test: Likewise.
+
 2011-04-09  Stefano Lattarini  <address@hidden>
 
        java: check_JAVA does not cause compilation by "make all" anymore
diff --git a/tests/defs.in b/tests/defs.in
index fb57dfd..cd2284c 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -165,6 +165,10 @@ do
       echo "$me: running $CC -V -help"
       ( $CC -V -help ) || exit 77
       ;;
+    javac)
+      echo "$me: running javac -version"
+      javac -version || exit 77
+      ;;
     makedepend)
       echo "$me: running makedepend -f-"
       ( makedepend -f- ) || exit 77
diff --git a/tests/java-check.test b/tests/java-check.test
index fd3fc96..a67b4e8 100755
--- a/tests/java-check.test
+++ b/tests/java-check.test
@@ -18,13 +18,12 @@
 # "make check", and not also with "make all".
 # See automake bug#8234.
 
+required=javac
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
-AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
-($HAS_JAVAC 77); $HAS_JAVAC 77
 AC_OUTPUT
 END
 
diff --git a/tests/java.test b/tests/java.test
index d5210cd..cae56dc 100755
--- a/tests/java.test
+++ b/tests/java.test
@@ -16,13 +16,12 @@
 
 # Minimal test of Java functionality.
 
+required=javac
 . ./defs || Exit 1
 
 set -e
 
 cat >>configure.in <<'EOF'
-AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
-($HAS_JAVAC 77); $HAS_JAVAC 77
 AC_OUTPUT
 EOF
 
-- 
1.7.2.3