From 744705d420e809cc3da27a253892aa69defec4ce Mon Sep 17 00:00:00 2001 From: Stefano Lattarini 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. * tests/instfail-java.test: Likewise. * tests/instdir-java.test: Likewise. --- ChangeLog | 9 +++++++++ tests/defs.in | 4 ++++ tests/instdir-java.test | 3 +-- tests/instfail-java.test | 3 +-- tests/java-check.test | 3 +-- tests/java.test | 3 +-- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d82d363..a605aa8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-04-10 Stefano Lattarini + + 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. + * tests/instfail-java.test: Likewise. + * tests/instdir-java.test: Likewise. + 2011-04-09 Stefano Lattarini 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/instdir-java.test b/tests/instdir-java.test index 6adc82e..9d9a03c 100755 --- a/tests/instdir-java.test +++ b/tests/instdir-java.test @@ -16,13 +16,12 @@ # If $(javadir) is the empty string, then nothing should be installed there. +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/instfail-java.test b/tests/instfail-java.test index 2cb8afb..8f527cf 100755 --- a/tests/instfail-java.test +++ b/tests/instfail-java.test @@ -19,13 +19,12 @@ # This is the java sister test of instfail.test. +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-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 -- 2.7.4