From: Alexandre Duret-Lutz Date: Thu, 21 Mar 2002 09:11:56 +0000 (+0000) Subject: * Makefile.am (maintainer-check): Check for misuses of make, X-Git-Tag: branchpoint-1-6~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfa9415ffe5ce0f6fd96af21a6264aa4db6f6f8a;p=thirdparty%2Fautomake.git * Makefile.am (maintainer-check): Check for misuses of make, autoconf, automake, aclocal, and perl in the testsuite. Suggest using $MAKE, $AUTOCONF, $AUTOMAKE, $ACLOCAL, and $PERL instead. * tests/confsub.test: Use $AUTOCONF and $MAKE. * tests/extra5.test, tests/extra6.test, tests/lex5.test, tests/nobase.test, tests/nodist2.test, tests/pr204.test, tests/pr224.test, tests/pr287.test, tests/strip.test, tests/yacc8.test: Use $MAKE. --- diff --git a/ChangeLog b/ChangeLog index 060971e53..c61b4280c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2002-03-21 Alexandre Duret-Lutz + + * Makefile.am (maintainer-check): Check for misuses of make, + autoconf, automake, aclocal, and perl in the testsuite. Suggest + using $MAKE, $AUTOCONF, $AUTOMAKE, $ACLOCAL, and $PERL instead. + * tests/confsub.test: Use $AUTOCONF and $MAKE. + * tests/extra5.test, tests/extra6.test, tests/lex5.test, + tests/nobase.test, tests/nodist2.test, tests/pr204.test, + tests/pr224.test, tests/pr287.test, tests/strip.test, + tests/yacc8.test: Use $MAKE. + 2002-03-20 Alexandre Duret-Lutz Add support for two-dot versions. diff --git a/Makefile.am b/Makefile.am index 473b00c85..51977c7db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,6 +145,31 @@ maintainer-check: automake aclocal echo "Don't put AMDEP_TRUE substitution in automake.in" 1>&2; \ exit 1; \ fi +## Tests should never call make directly. + @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*make'; then \ + echo 'Do not run "make" in the above tests. Use "$$MAKE" instead.' \ + exit 1; \ + fi +## Tests should never call autoconf directly. + @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*autoconf'; then \ + echo 'Do not run "autoconf" in the above tests. Use "$$AUTOCONF" instead.' \ + exit 1; \ + fi +## Tests should never call automake directly. + @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*automake'; then \ + echo 'Do not run "automake" in the above tests. Use "$$AUTOMAKE" instead.' \ + exit 1; \ + fi +## Tests should never call aclocal directly. + @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*aclocal'; then \ + echo 'Do not run "aclocal" in the above tests. Use "$$ACLOCAL" instead.' \ + exit 1; \ + fi +## Tests should never call perl directly. + @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*perl'; then \ + echo 'Do not run "perl" in the above tests. Use "$$PERL" instead.' \ + exit 1; \ + fi # Tag before making distribution. Also, don't make a distribution if # checks fail. Also, make sure the NEWS file is up-to-date. diff --git a/Makefile.in b/Makefile.in index dd2f7866a..5cc11e216 100644 --- a/Makefile.in +++ b/Makefile.in @@ -654,6 +654,26 @@ maintainer-check: automake aclocal echo "Don't put AMDEP_TRUE substitution in automake.in" 1>&2; \ exit 1; \ fi + @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*make'; then \ + echo 'Do not run "make" in the above tests. Use "$$MAKE" instead.' \ + exit 1; \ + fi + @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*autoconf'; then \ + echo 'Do not run "autoconf" in the above tests. Use "$$AUTOCONF" instead.' \ + exit 1; \ + fi + @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*automake'; then \ + echo 'Do not run "automake" in the above tests. Use "$$AUTOMAKE" instead.' \ + exit 1; \ + fi + @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*aclocal'; then \ + echo 'Do not run "aclocal" in the above tests. Use "$$ACLOCAL" instead.' \ + exit 1; \ + fi + @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*perl'; then \ + echo 'Do not run "perl" in the above tests. Use "$$PERL" instead.' \ + exit 1; \ + fi # Tag before making distribution. Also, don't make a distribution if # checks fail. Also, make sure the NEWS file is up-to-date. diff --git a/tests/Makefile.in b/tests/Makefile.in index aeb66e015..76dc869e1 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -65,30 +65,16 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ AWK = @AWK@ -DEFS = @DEFS@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ +DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBS = @LIBS@ -MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ PERL = @PERL@ -SET_MAKE = @SET_MAKE@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_STRIP = @ac_ct_STRIP@ -build_alias = @build_alias@ -host_alias = @host_alias@ +am__include = @am__include@ +am__quote = @am__quote@ install_sh = @install_sh@ pkgvdatadir = @pkgvdatadir@ -program_transform_name = @program_transform_name@ -target_alias = @target_alias@ XFAIL_TESTS = condd.test subdir5.test auxdir2.test cond17.test @@ -439,6 +425,7 @@ version.test \ version2.test \ version3.test \ version4.test \ +version5.test \ vpath.test \ vtexi.test \ vtexi2.test \ diff --git a/tests/confsub.test b/tests/confsub.test index 4796965d8..ed6663b68 100755 --- a/tests/confsub.test +++ b/tests/confsub.test @@ -32,13 +32,13 @@ $AUTOMAKE || exit 1 (fgrep 'subdir/config.h' subdir/Makefile.in | fgrep -v 'cd $(top_builddir)') && exit 1 -autoconf || exit 1 +$AUTOCONF || exit 1 ./configure || exit 1 fgrep 'Before.' subdir/config.h sleep 1 echo 'After.' > subdir/config.hin -make || exit 1 +$MAKE || exit 1 fgrep 'After.' subdir/config.h || exit 1 exit 0 diff --git a/tests/extra5.test b/tests/extra5.test index 58f7b99e3..0b994b8c2 100755 --- a/tests/extra5.test +++ b/tests/extra5.test @@ -23,4 +23,4 @@ $AUTOCONF mkdir build cd build ../configure -make distdir +$MAKE distdir diff --git a/tests/extra6.test b/tests/extra6.test index 73a68e714..0380dec4c 100755 --- a/tests/extra6.test +++ b/tests/extra6.test @@ -40,4 +40,4 @@ touch foo2/bar2/baz2 mkdir baz2 touch baz2/foo2 -make check +$MAKE check diff --git a/tests/lex5.test b/tests/lex5.test index 62410ef8f..8b17e0084 100755 --- a/tests/lex5.test +++ b/tests/lex5.test @@ -66,7 +66,7 @@ $AUTOMAKE -a test -f ./ylwrap cd sub -make foo/foo2.o +$MAKE foo/foo2.o test -f foo/foo2.c test -f foo/foo2.o diff --git a/tests/nobase.test b/tests/nobase.test index 888f340d4..a9bf79bf3 100755 --- a/tests/nobase.test +++ b/tests/nobase.test @@ -21,5 +21,5 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a ./configure --prefix `pwd`/install -make install-data +$MAKE install-data test -f install/foo/bar/baz.h diff --git a/tests/nodist2.test b/tests/nodist2.test index fae8462f2..5c940eab9 100755 --- a/tests/nodist2.test +++ b/tests/nodist2.test @@ -20,4 +20,4 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a ./configure --prefix `pwd`/install -make install-data +$MAKE install-data diff --git a/tests/pr204.test b/tests/pr204.test index 394590ae0..151832dba 100755 --- a/tests/pr204.test +++ b/tests/pr204.test @@ -51,4 +51,4 @@ test -f pr204-0.1/parse.y && exit 1 test -f pr204-0.1/parse2.c && exit 1 test -f pr204-0.1/parse2.y && exit 1 # Make sure parse.c and parse2.c are still targets. -make parse.c parse2.c +$MAKE parse.c parse2.c diff --git a/tests/pr224.test b/tests/pr224.test index c986c965e..2f965bc0b 100755 --- a/tests/pr224.test +++ b/tests/pr224.test @@ -41,6 +41,6 @@ CC='gcc' ../configure $MAKE test -d foo/.deps -make distclean +$MAKE distclean test -d foo/.deps && exit 1 : diff --git a/tests/pr287.test b/tests/pr287.test index a827a3b14..19006305d 100755 --- a/tests/pr287.test +++ b/tests/pr287.test @@ -32,5 +32,5 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a ./configure --prefix=`cd install && pwd` -make -make distdir +$MAKE +$MAKE distdir diff --git a/tests/strip.test b/tests/strip.test index 154db6642..767aaa33b 100755 --- a/tests/strip.test +++ b/tests/strip.test @@ -32,5 +32,5 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a ./configure --prefix=`cd install && pwd` -make -make install-strip +$MAKE +$MAKE install-strip diff --git a/tests/yacc8.test b/tests/yacc8.test index 39c8c155c..4958fe8fa 100755 --- a/tests/yacc8.test +++ b/tests/yacc8.test @@ -61,7 +61,7 @@ $AUTOMAKE -a test -f ./ylwrap || exit 1 cd sub -make foo/parse2.o +$MAKE foo/parse2.o test -f foo/parse2.c test -f foo/parse2.o