From: Stefano Lattarini Date: Mon, 19 Sep 2011 16:21:25 +0000 (+0200) Subject: tests: fix spurious failure in 'primary-prefix-valid-couples.test' X-Git-Tag: v1.11.1b~17^2~12^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5ebf21cccd0597f53e7b3c4063dff4704e454a6;p=thirdparty%2Fautomake.git tests: fix spurious failure in 'primary-prefix-valid-couples.test' * tests/primary-prefix-valid-couples.test: After commit v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary combination by default anymore: one has to explicitly define $(javadir) to make it so. So just drop `java_JAVA' from our Makefile.am Also, since we are at it, ... (configure.in): ... remove AM_PROG_GCJ from here, as it's not really required. --- diff --git a/ChangeLog b/ChangeLog index 8a697e672..6c66f9e0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-09-19 Stefano Lattarini + + tests: fix spurious failure in 'primary-prefix-valid-couples.test' + * tests/primary-prefix-valid-couples.test: After commit + v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary + combination by default anymore: one has to explicitly define + $(javadir) to make it so. So just drop `java_JAVA' from our + Makefile.am Also, since we are at it, ... + (configure.in): ... remove AM_PROG_GCJ from here, as it's not + really required. + 2011-09-18 Stefano Lattarini java: complain if java_JAVA is used but $(javadir) is undefined diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test index f326808ff..36ff5d888 100755 --- a/tests/primary-prefix-valid-couples.test +++ b/tests/primary-prefix-valid-couples.test @@ -25,7 +25,6 @@ cat >> configure.in <<'END' AC_PROG_CC AC_PROG_RANLIB AC_PROG_LIBTOOL -AM_PROG_GCJ AM_PATH_PYTHON AM_PATH_LISPDIR END @@ -78,7 +77,6 @@ done echo "info_TEXINFOS = foo.texi" >> Makefile.am echo "lisp_LISP = foo.el" >> Makefile.am echo "python_PYTHON = foo.py" >> Makefile.am -echo "java_JAVA = foo.java" >> Makefile.am awk '{print NR ":" $0}' Makefile.am # For debugging.