From 33e8c5aedbcb397954455761bee62715737a309a Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 23 Apr 2011 19:10:15 +0200 Subject: [PATCH] java tests: tweak and make stricter a couple of tests * tests/javasubst.test: Use proper m4 quoting. Add trailing `:' command. Enable `errexit' shell flag, and related changes. Prefer cat + here-doc over echo to append to configure.in. Make grepping of Makefile.in stricter. Add debugging output. Improve heading comments. * tests/javaprim.test: Likewise. --- ChangeLog | 10 ++++++++++ tests/javaprim.test | 13 ++++++++++--- tests/javasubst.test | 17 ++++++++++++----- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 051886898..50dfd1653 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-04-23 Stefano Lattarini + + java tests: tweak and make stricter a couple of tests + * tests/javasubst.test: Use proper m4 quoting. Add trailing `:' + command. Enable `errexit' shell flag, and related changes. + Prefer cat + here-doc over echo to append to configure.in. + Make grepping of Makefile.in stricter. Add debugging output. + Improve heading comments. + * tests/javaprim.test: Likewise. + 2011-04-23 Stefano Lattarini java coverage: add test on uninstall with JAVA primary diff --git a/tests/javaprim.test b/tests/javaprim.test index aa1506bb6..53d7ac218 100755 --- a/tests/javaprim.test +++ b/tests/javaprim.test @@ -14,16 +14,23 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Test to make sure JAVA variable can be defined. +# Test to make sure JAVA variable can be defined by AC_SUBST. . ./defs || Exit 1 -echo 'AC_SUBST(JAVA)' >> configure.in +cat >> configure.in << 'END' +AC_SUBST([JAVA]) +END cat > Makefile.am << 'END' javadir = $(datadir)/java java_JAVA = a.java b.java c.java END -$ACLOCAL || Exit 1 +$ACLOCAL $AUTOMAKE + +grep -i java Makefile.in # For debugging. +grep '^JAVA = *@JAVA@ *$' Makefile.in + +: diff --git a/tests/javasubst.test b/tests/javasubst.test index d0186452c..483da8162 100755 --- a/tests/javasubst.test +++ b/tests/javasubst.test @@ -14,18 +14,25 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Test to make sure redefining JAVAC works. +# Test to make sure redefining JAVAC with AC_SUBST works. . ./defs || Exit 1 -echo 'AC_SUBST(JAVAC)' >> configure.in +set -e + +cat >> configure.in << 'END' +AC_SUBST([JAVAC]) +END cat > Makefile.am << 'END' javadir = $(datadir)/java java_JAVA = a.java b.java c.java END -$ACLOCAL || Exit 1 -$AUTOMAKE || Exit 1 +$ACLOCAL +$AUTOMAKE + +grep -i java Makefile.in # For debugging. +grep '^JAVAC = *@JAVAC@ *$' Makefile.in -grep 'JAVAC.*@JAVAC@' Makefile.in +: -- 2.47.2