diff options
| author | Akim Demaille <akim@epita.fr> | 2001-10-20 11:17:18 +0000 |
|---|---|---|
| committer | Akim Demaille <akim@epita.fr> | 2001-10-20 11:17:18 +0000 |
| commit | 885d8e292a03dd68d8140cc06af76132804b8640 (patch) | |
| tree | df9f9c450aaf0cc290e5a45a0b0e5b23b2bb3786 | |
| parent | b49a92e0a2d51e6c560bf8a6c43cbdb620af1c85 (diff) | |
| download | automake-885d8e292a03dd68d8140cc06af76132804b8640.tar.gz | |
* tests/acoutnoq.test, tests/acoutput.test, tests/acoutput2.test,
* tests/acoutqnl.test, tests/acouttbs.test, tests/all.test,
* tests/alpha.test, tests/ansi.test, tests/asm.test,
* tests/auxdir.test, tests/auxdir2.test, tests/backsl2.test,
* tests/badline.test, tests/block.test, tests/canon2.test,
* tests/check.test, tests/checkall.test, tests/clean.test,
* tests/colneq.test, tests/colneq2.test, tests/colon.test,
* tests/colon2.test, tests/colon3.test, tests/colon4.test,
* tests/colon5.test, tests/colon6.test, tests/colon7.test,
* tests/comment.test, tests/comment3.test, tests/cond.test,
* tests/cond2.test, tests/cond6.test, tests/cond7.test,
* tests/condincl.test, tests/condincl2.test, tests/condman.test,
* tests/condman2.test, tests/confdist.test, tests/confh.test,
* tests/confh2.test, tests/confh3.test, tests/confvar.test,
* tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
* tests/cxxcpp.test, tests/dash.test, tests/dejagnu.test,
* tests/dejagnu2.test, tests/distcommon.test, tests/distdir.test,
* tests/else.test, tests/empty.test, tests/exdir.test,
* tests/exdir2.test, tests/extra3.test, tests/extra4.test,
* tests/flibs.test, tests/fnoc.test, tests/fo.test,
* tests/fonly.test, tests/fortdep.test, tests/fpinst2.test,
* tests/fpinstall.test, tests/gcj2.test, tests/gnits.test,
* tests/include.test, tests/info.test, tests/insh.test,
* tests/insh2.test, tests/install.test, tests/installsh.test,
* tests/instdata.test, tests/instdata2.test, tests/instexec.test,
* tests/insthook.test, tests/instman.test, tests/instman2.test,
* tests/java.test, tests/javaprim.test, tests/javasubst.test,
* tests/libobj3.test, tests/link_f_only.test, tests/lisp.test,
* tests/man.test, tests/mclean.test, tests/mdate.test,
* tests/mdate2.test, tests/mdate3.test, tests/mdate4.test,
* tests/mkinst2.test, tests/mkinstall.test, tests/nodepcomp.test,
* tests/noinst.test, tests/obsolete.test, tests/obsolete2.test,
* tests/outdir.test, tests/output.test, tests/output2.test,
* tests/output3.test, tests/output4.test, tests/output5.test,
* tests/package.test, tests/pluseq.test, tests/pluseq2.test,
* tests/pluseq3.test, tests/pluseq5.test, tests/pluseq6.test,
* tests/pluseq8.test, tests/ppf77.test, tests/pr2.test,
* tests/primary.test, tests/proginst.test, tests/python.test,
* tests/remake.test, tests/remake2.test, tests/remake3.test,
* tests/rulepat.test, tests/scripts.test, tests/seenc.test,
* tests/sinclude.test, tests/spell.test, tests/spell3.test,
* tests/spelling.test, tests/stamph.test, tests/subdir.test,
* tests/subdir2.test, tests/subdircond.test, tests/subst.test,
* tests/symlink.test, tests/symlink2.test, tests/symlink3.test,
* tests/syntax.test, tests/tags.test, tests/tagsub.test,
* tests/texinfo.test, tests/texinfo10.test, tests/texinfo2.test,
* tests/texinfo3.test, tests/texinfo4.test, tests/texinfo5.test,
* tests/texinfo6.test, tests/texinfo7.test, tests/texinfo8.test,
* tests/texinfo9.test, tests/vars.test, tests/vartar.test,
* tests/version.test, tests/version2.test, tests/version3.test,
* tests/version4.test, tests/vpath.test, tests/vtexi.test,
* tests/vtexi2.test, tests/werror.test: Run aclocal before automake.
156 files changed, 218 insertions, 3 deletions
@@ -1,5 +1,60 @@ 2001-10-20 Akim Demaille <akim@epita.fr> + * tests/acoutnoq.test, tests/acoutput.test, tests/acoutput2.test, + * tests/acoutqnl.test, tests/acouttbs.test, tests/all.test, + * tests/alpha.test, tests/ansi.test, tests/asm.test, + * tests/auxdir.test, tests/auxdir2.test, tests/backsl2.test, + * tests/badline.test, tests/block.test, tests/canon2.test, + * tests/check.test, tests/checkall.test, tests/clean.test, + * tests/colneq.test, tests/colneq2.test, tests/colon.test, + * tests/colon2.test, tests/colon3.test, tests/colon4.test, + * tests/colon5.test, tests/colon6.test, tests/colon7.test, + * tests/comment.test, tests/comment3.test, tests/cond.test, + * tests/cond2.test, tests/cond6.test, tests/cond7.test, + * tests/condincl.test, tests/condincl2.test, tests/condman.test, + * tests/condman2.test, tests/confdist.test, tests/confh.test, + * tests/confh2.test, tests/confh3.test, tests/confvar.test, + * tests/confvar2.test, tests/copy.test, tests/ctarget1.test, + * tests/cxxcpp.test, tests/dash.test, tests/dejagnu.test, + * tests/dejagnu2.test, tests/distcommon.test, tests/distdir.test, + * tests/else.test, tests/empty.test, tests/exdir.test, + * tests/exdir2.test, tests/extra3.test, tests/extra4.test, + * tests/flibs.test, tests/fnoc.test, tests/fo.test, + * tests/fonly.test, tests/fortdep.test, tests/fpinst2.test, + * tests/fpinstall.test, tests/gcj2.test, tests/gnits.test, + * tests/include.test, tests/info.test, tests/insh.test, + * tests/insh2.test, tests/install.test, tests/installsh.test, + * tests/instdata.test, tests/instdata2.test, tests/instexec.test, + * tests/insthook.test, tests/instman.test, tests/instman2.test, + * tests/java.test, tests/javaprim.test, tests/javasubst.test, + * tests/libobj3.test, tests/link_f_only.test, tests/lisp.test, + * tests/man.test, tests/mclean.test, tests/mdate.test, + * tests/mdate2.test, tests/mdate3.test, tests/mdate4.test, + * tests/mkinst2.test, tests/mkinstall.test, tests/nodepcomp.test, + * tests/noinst.test, tests/obsolete.test, tests/obsolete2.test, + * tests/outdir.test, tests/output.test, tests/output2.test, + * tests/output3.test, tests/output4.test, tests/output5.test, + * tests/package.test, tests/pluseq.test, tests/pluseq2.test, + * tests/pluseq3.test, tests/pluseq5.test, tests/pluseq6.test, + * tests/pluseq8.test, tests/ppf77.test, tests/pr2.test, + * tests/primary.test, tests/proginst.test, tests/python.test, + * tests/remake.test, tests/remake2.test, tests/remake3.test, + * tests/rulepat.test, tests/scripts.test, tests/seenc.test, + * tests/sinclude.test, tests/spell.test, tests/spell3.test, + * tests/spelling.test, tests/stamph.test, tests/subdir.test, + * tests/subdir2.test, tests/subdircond.test, tests/subst.test, + * tests/symlink.test, tests/symlink2.test, tests/symlink3.test, + * tests/syntax.test, tests/tags.test, tests/tagsub.test, + * tests/texinfo.test, tests/texinfo10.test, tests/texinfo2.test, + * tests/texinfo3.test, tests/texinfo4.test, tests/texinfo5.test, + * tests/texinfo6.test, tests/texinfo7.test, tests/texinfo8.test, + * tests/texinfo9.test, tests/vars.test, tests/vartar.test, + * tests/version.test, tests/version2.test, tests/version3.test, + * tests/version4.test, tests/vpath.test, tests/vtexi.test, + * tests/vtexi2.test, tests/werror.test: Run aclocal before automake. + +2001-10-20 Akim Demaille <akim@epita.fr> + * tests/acoutnoq.test, tests/acoutput.test, tests/acoutqnl.test, * tests/acouttbs.test, tests/asm.test, tests/colon.test, * tests/colon2.test, tests/colon3.test, tests/colon4.test, diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test index b281bb571..3e9cc7b88 100755 --- a/tests/acoutnoq.test +++ b/tests/acoutnoq.test @@ -18,4 +18,5 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/acoutput.test b/tests/acoutput.test index 5918a74ea..aa41caa6d 100755 --- a/tests/acoutput.test +++ b/tests/acoutput.test @@ -15,4 +15,5 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/acoutput2.test b/tests/acoutput2.test index 3c2488db2..6af5440d9 100755 --- a/tests/acoutput2.test +++ b/tests/acoutput2.test @@ -17,10 +17,12 @@ mkdir subdir : > foo.in : > subdir/foo.in +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 count=`fgrep foo.in Makefile.in | wc -l` test $count -eq 2 || exit 1 # This ought to work as well. +$ACLOCAL || exit 1 $AUTOMAKE --add-missing --force-missing diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test index 40d37f3a2..39101abcf 100755 --- a/tests/acoutqnl.test +++ b/tests/acoutqnl.test @@ -15,5 +15,6 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/acouttbs.test b/tests/acouttbs.test index a5fa37fe0..07e79c704 100755 --- a/tests/acouttbs.test +++ b/tests/acouttbs.test @@ -17,4 +17,5 @@ END : > Makefile.am : > zot.in +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/all.test b/tests/all.test index 61e129282..2387dbe76 100755 --- a/tests/all.test +++ b/tests/all.test @@ -8,7 +8,8 @@ for target in all install-exec install-data uninstall; do echo "Doing $target" echo "${target}-local:" > Makefile.am - $AUTOMAKE || exit 1 + $ACLOCAL || exit 1 +$AUTOMAKE || exit 1 fgrep "${target}-local ${target}-local" Makefile.in && exit 1 done diff --git a/tests/alpha.test b/tests/alpha.test index 4add83d19..923e0b8b6 100755 --- a/tests/alpha.test +++ b/tests/alpha.test @@ -24,6 +24,7 @@ END : > ChangeLog : > THANKS +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep README-alpha Makefile.in diff --git a/tests/ansi.test b/tests/ansi.test index 0e133c298..3b7da79e0 100755 --- a/tests/ansi.test +++ b/tests/ansi.test @@ -18,6 +18,7 @@ END : > ansi2knr.c : > ansi2knr.1 +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed diff --git a/tests/asm.test b/tests/asm.test index ee2fe3bc9..6fdbea366 100755 --- a/tests/asm.test +++ b/tests/asm.test @@ -20,6 +20,7 @@ END # Should fail because we need cc and as. echo 1 +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 cat > configure.in << 'END' @@ -32,6 +33,7 @@ END # We still need as. echo 2 +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 cat > configure.in << 'END' @@ -45,6 +47,7 @@ END # We need ASFLAGS. echo 3 +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 cat > configure.in << 'END' @@ -58,4 +61,5 @@ AC_OUTPUT(Makefile) END echo 4 +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/auxdir.test b/tests/auxdir.test index cf6872d46..8b42f689d 100755 --- a/tests/auxdir.test +++ b/tests/auxdir.test @@ -17,6 +17,7 @@ END # The "././" prefix confuses Automake into thinking it is doing a # subdir build. Yes, this is hacky. +$ACLOCAL || exit 1 $AUTOMAKE ././Makefile || exit 1 grep '/\./\./mkinstalldirs' Makefile.in diff --git a/tests/auxdir2.test b/tests/auxdir2.test index 1251fbe7a..891dc61af 100755 --- a/tests/auxdir2.test +++ b/tests/auxdir2.test @@ -12,4 +12,5 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/backsl2.test b/tests/backsl2.test index 9d3dcb2c6..ae3eaaeaa 100755 --- a/tests/backsl2.test +++ b/tests/backsl2.test @@ -10,6 +10,7 @@ SUBDIRS = \ . END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 exit 0 diff --git a/tests/badline.test b/tests/badline.test index 16ad12823..3ad0358ec 100755 --- a/tests/badline.test +++ b/tests/badline.test @@ -11,6 +11,7 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE > out 2>&1 && exit 1 grep Makefile out && exit 1 exit 0 diff --git a/tests/block.test b/tests/block.test index 8ec8c25c4..a9d230033 100755 --- a/tests/block.test +++ b/tests/block.test @@ -13,6 +13,7 @@ cat > Makefile.am << 'END' #END END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 (sed -e '/^#START/,/^#END/ !d' Makefile.in | grep -v '^#') && exit 1 diff --git a/tests/canon2.test b/tests/canon2.test index 0efe34608..ea60dda17 100755 --- a/tests/canon2.test +++ b/tests/canon2.test @@ -13,6 +13,7 @@ END echo '@setfilename zar-doz.info' > zar-doz.texi echo '@setfilename frob' > frob.texi +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep zar-doz_TEXINFOS Makefile.in && exit 1 diff --git a/tests/check.test b/tests/check.test index 2cf75083c..4f9945a3d 100755 --- a/tests/check.test +++ b/tests/check.test @@ -10,6 +10,7 @@ END : > frob.test +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^check-TESTS:' Makefile.in || exit 1 diff --git a/tests/checkall.test b/tests/checkall.test index 34b72304d..625daa8be 100755 --- a/tests/checkall.test +++ b/tests/checkall.test @@ -10,6 +10,7 @@ check-local: true END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^check-am:.*all-am' Makefile.in || exit 1 diff --git a/tests/clean.test b/tests/clean.test index e34173f6a..b0942cc20 100755 --- a/tests/clean.test +++ b/tests/clean.test @@ -6,6 +6,7 @@ : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^clean-am:.*mostlyclean-am' Makefile.in diff --git a/tests/colneq.test b/tests/colneq.test index e3db4947d..23ec0d0b7 100755 --- a/tests/colneq.test +++ b/tests/colneq.test @@ -9,4 +9,5 @@ ICONS := $(wildcard *.xbm) data_DATA = $(ICONS) END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/colneq2.test b/tests/colneq2.test index a5af04ca2..458328f72 100755 --- a/tests/colneq2.test +++ b/tests/colneq2.test @@ -13,4 +13,5 @@ END : > b.test : > c.test +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/colon.test b/tests/colon.test index 6da5ef8df..f143973a7 100755 --- a/tests/colon.test +++ b/tests/colon.test @@ -17,4 +17,5 @@ END : > foo.hin : > stamp-h.in +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/colon2.test b/tests/colon2.test index 60aa1afea..afa2bf342 100755 --- a/tests/colon2.test +++ b/tests/colon2.test @@ -14,6 +14,7 @@ END : > zardoz.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 # We actually check several things here. diff --git a/tests/colon3.test b/tests/colon3.test index 4252b24fa..29913dbb8 100755 --- a/tests/colon3.test +++ b/tests/colon3.test @@ -17,6 +17,7 @@ END : > two.in : > three.in +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 # We actually check several things here. diff --git a/tests/colon4.test b/tests/colon4.test index a041a2a17..d433c4412 100755 --- a/tests/colon4.test +++ b/tests/colon4.test @@ -19,6 +19,7 @@ END : > two : > three +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 # The rule should regenerate the file "zardoz". diff --git a/tests/colon5.test b/tests/colon5.test index e27712cd2..799d5e3a5 100755 --- a/tests/colon5.test +++ b/tests/colon5.test @@ -15,6 +15,7 @@ END : > Makefile.am : > Makefile.dep +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep 'Makefile:Makefile.in' Makefile.in diff --git a/tests/colon6.test b/tests/colon6.test index 9bc496e52..36e3cd6b1 100755 --- a/tests/colon6.test +++ b/tests/colon6.test @@ -17,4 +17,5 @@ mkdir demo : > demo/Makefile.am : > demo/version.gin +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/colon7.test b/tests/colon7.test index 3ccf811e0..a56012e6f 100755 --- a/tests/colon7.test +++ b/tests/colon7.test @@ -22,6 +22,7 @@ mkdir subdir : > subdir/Makefile.am : > subdir/foo +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 # shouldn't have any bar.in diff --git a/tests/comment.test b/tests/comment.test index 1d2b4f34e..863c0cdfc 100755 --- a/tests/comment.test +++ b/tests/comment.test @@ -9,4 +9,5 @@ cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = #no such option END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/comment3.test b/tests/comment3.test index 01d832319..017c0a7c4 100755 --- a/tests/comment3.test +++ b/tests/comment3.test @@ -12,5 +12,6 @@ install-data-local: # Tru64 Unix must die END +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/cond.test b/tests/cond.test index 348618f18..fb8b0d839 100755 --- a/tests/cond.test +++ b/tests/cond.test @@ -20,6 +20,7 @@ endif END set -e +$ACLOCAL || exit 1 $AUTOMAKE grep '^@TEST_TRUE@VAR = true$' Makefile.in diff --git a/tests/cond2.test b/tests/cond2.test index 271ae01af..7ac7fc30e 100755 --- a/tests/cond2.test +++ b/tests/cond2.test @@ -22,5 +22,6 @@ END mkdir dir1 +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/cond6.test b/tests/cond6.test index 7ea2510fb..7502e0134 100755 --- a/tests/cond6.test +++ b/tests/cond6.test @@ -23,4 +23,5 @@ help_DATA = foo endif END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/cond7.test b/tests/cond7.test index 7a257b4b4..ee3709f18 100755 --- a/tests/cond7.test +++ b/tests/cond7.test @@ -21,6 +21,7 @@ ab_HEADERS = \ endif END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '002' Makefile.in && exit 1 exit 0 diff --git a/tests/condincl.test b/tests/condincl.test index 0dfb451f1..22f0753d7 100755 --- a/tests/condincl.test +++ b/tests/condincl.test @@ -19,6 +19,7 @@ target: dependency rule END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^target' Makefile.in && exit 1 diff --git a/tests/condincl2.test b/tests/condincl2.test index 59b2a2901..3b068be65 100755 --- a/tests/condincl2.test +++ b/tests/condincl2.test @@ -20,5 +20,6 @@ target: dependency endif END +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/condman.test b/tests/condman.test index 4559c94d4..ebeaa3f87 100755 --- a/tests/condman.test +++ b/tests/condman.test @@ -18,4 +18,5 @@ END : > foo.1 : > joe.1 +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/condman2.test b/tests/condman2.test index 941b24e22..be087cddd 100755 --- a/tests/condman2.test +++ b/tests/condman2.test @@ -8,6 +8,7 @@ man_MANS = foo.1 foo.2 man5_MANS = foo.5 END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^install-man1:' Makefile.in || exit 1 diff --git a/tests/confdist.test b/tests/confdist.test index f02307e5c..76fcce125 100755 --- a/tests/confdist.test +++ b/tests/confdist.test @@ -7,6 +7,7 @@ : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^DIST_COMMON.*configure ' Makefile.in diff --git a/tests/confh.test b/tests/confh.test index 8ae200108..b19f3c0e5 100755 --- a/tests/confh.test +++ b/tests/confh.test @@ -21,6 +21,7 @@ mkdir include : > include/Makefile.am : > include/config.h.in +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 (sed -n -e '/^DIST_COMMON =.*\\$/ { @@ -37,5 +38,6 @@ grep 'stamp-h.in:.*acconfig.h' include/Makefile.in || exit 1 # Make sure re-running automake in a different way generates same # Makefile.in. mv Makefile.in save +$ACLOCAL || exit 1 $AUTOMAKE Makefile || exit 1 cmp Makefile.in save diff --git a/tests/confh2.test b/tests/confh2.test index a7daa3419..97e12a3c3 100755 --- a/tests/confh2.test +++ b/tests/confh2.test @@ -20,6 +20,7 @@ END mkdir include : > include/config.h.in +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^config.h:' Makefile.in || exit 1 diff --git a/tests/confh3.test b/tests/confh3.test index fdf9f7b40..d804cc893 100755 --- a/tests/confh3.test +++ b/tests/confh3.test @@ -23,6 +23,7 @@ mkdir d1 d2 : > d2/config.h.in +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^config.h:' d1/Makefile.in || exit 1 diff --git a/tests/confvar.test b/tests/confvar.test index fdae95f4c..9fa06aab5 100755 --- a/tests/confvar.test +++ b/tests/confvar.test @@ -10,6 +10,7 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^QBERT' Makefile.in diff --git a/tests/confvar2.test b/tests/confvar2.test index a1f5c6198..13566a49b 100755 --- a/tests/confvar2.test +++ b/tests/confvar2.test @@ -12,4 +12,5 @@ cat > Makefile.am << 'END' bin_SCRIPTS = foo END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/copy.test b/tests/copy.test index dc1de49b2..6426df950 100755 --- a/tests/copy.test +++ b/tests/copy.test @@ -7,4 +7,5 @@ : > Makefile.am rm -f install-sh +$ACLOCAL || exit 1 $AUTOMAKE -c -a diff --git a/tests/ctarget1.test b/tests/ctarget1.test index dff9bc4b0..6d32c0ef0 100755 --- a/tests/ctarget1.test +++ b/tests/ctarget1.test @@ -22,6 +22,7 @@ END set -e +$ACLOCAL || exit 1 $AUTOMAKE grep '^@TEST_TRUE@target: true' Makefile.in grep '^@TEST_TRUE@ action' Makefile.in diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test index 0a90fc78a..e15fd1131 100755 --- a/tests/cxxcpp.test +++ b/tests/cxxcpp.test @@ -11,6 +11,7 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^CXXCPP' Makefile.in diff --git a/tests/dash.test b/tests/dash.test index a3e2da699..a95112c7d 100755 --- a/tests/dash.test +++ b/tests/dash.test @@ -11,4 +11,5 @@ END : > Make-lang +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/dejagnu.test b/tests/dejagnu.test index 55459fdec..f68dbf081 100755 --- a/tests/dejagnu.test +++ b/tests/dejagnu.test @@ -11,6 +11,7 @@ END : > frob.test +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^check-TESTS' Makefile.in diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test index f99163a26..23d54d833 100755 --- a/tests/dejagnu2.test +++ b/tests/dejagnu2.test @@ -11,6 +11,7 @@ site.exp: echo foo END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep site.exp Makefile.in diff --git a/tests/distcommon.test b/tests/distcommon.test index f7297de59..4a3db7da8 100755 --- a/tests/distcommon.test +++ b/tests/distcommon.test @@ -20,6 +20,7 @@ mkdir subdir : > subdir/Makefile.am : > subdir/bar.in +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 # verify bar.in diff --git a/tests/distdir.test b/tests/distdir.test index cfc15d9f5..c63200096 100755 --- a/tests/distdir.test +++ b/tests/distdir.test @@ -9,6 +9,7 @@ cat > Makefile.am << 'END' EXTRA_DIST = foo/bar ./joe END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '\$(mkinstalldirs).*\.' Makefile.in && exit 1 diff --git a/tests/else.test b/tests/else.test index a1cd725dd..3aad8de01 100755 --- a/tests/else.test +++ b/tests/else.test @@ -18,5 +18,6 @@ SUBDIRS = c java endif END +$ACLOCAL || exit 1 $AUTOMAKE > out 2>&1 && exit 1 grep :7: out diff --git a/tests/empty.test b/tests/empty.test index 112b2c6bd..e5cd32115 100755 --- a/tests/empty.test +++ b/tests/empty.test @@ -9,6 +9,7 @@ cat > Makefile.am << 'END' data_DATA = END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 # Create configure so Makefile doesn't look out-of-date. diff --git a/tests/exdir.test b/tests/exdir.test index 0ef3cbe5a..1400b5f89 100755 --- a/tests/exdir.test +++ b/tests/exdir.test @@ -10,6 +10,7 @@ html_DATA = zot.html pkgdata_DATA = qbert EOF +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^DATA' Makefile.in | grep html diff --git a/tests/exdir2.test b/tests/exdir2.test index 7dbdfb6cd..02713878e 100755 --- a/tests/exdir2.test +++ b/tests/exdir2.test @@ -9,5 +9,6 @@ html_DATA = zot.html pkgdata_DATA = qbert EOF +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/extra3.test b/tests/extra3.test index 5c9a48553..44091885f 100755 --- a/tests/extra3.test +++ b/tests/extra3.test @@ -10,4 +10,5 @@ cat > Makefile.am << 'END' sysconf_DATA = @CODICIL@ END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/extra4.test b/tests/extra4.test index b652fba21..934bafc9e 100755 --- a/tests/extra4.test +++ b/tests/extra4.test @@ -11,4 +11,5 @@ sysconf_DATA = @CODICIL@ EXTRA_DATA = codicil.txt END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/flibs.test b/tests/flibs.test index a4978f959..f8c69fbdd 100755 --- a/tests/flibs.test +++ b/tests/flibs.test @@ -32,6 +32,7 @@ END : > zardoz.f +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '@FLIBS@' Makefile.in diff --git a/tests/fnoc.test b/tests/fnoc.test index f264d390a..445931c6e 100755 --- a/tests/fnoc.test +++ b/tests/fnoc.test @@ -18,6 +18,7 @@ END : > doe.f : > jane.f +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '[^F]CC' Makefile.in | grep -v MKDEP && exit 1 diff --git a/tests/fo.test b/tests/fo.test index 2b4b425ff..3c76e08ca 100755 --- a/tests/fo.test +++ b/tests/fo.test @@ -16,6 +16,7 @@ END : > doe.f +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 fgrep 'doe.$(OBJEXT)' Makefile.in diff --git a/tests/fonly.test b/tests/fonly.test index 392b67620..e418447d6 100755 --- a/tests/fonly.test +++ b/tests/fonly.test @@ -30,6 +30,7 @@ END : > zardoz.f +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep 'zardoz.f' Makefile.in diff --git a/tests/fortdep.test b/tests/fortdep.test index 225a75089..d751c8013 100755 --- a/tests/fortdep.test +++ b/tests/fortdep.test @@ -21,6 +21,7 @@ END : > foo.f +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep 'foo\.Po' Makefile.in && exit 1 diff --git a/tests/fpinst2.test b/tests/fpinst2.test index 1351173db..7637ccc9f 100755 --- a/tests/fpinst2.test +++ b/tests/fpinst2.test @@ -17,4 +17,5 @@ cat > Makefile.am <<'END' bin_SCRIPTS = zot END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 diff --git a/tests/fpinstall.test b/tests/fpinstall.test index 841096445..a47b736da 100755 --- a/tests/fpinstall.test +++ b/tests/fpinstall.test @@ -17,4 +17,5 @@ cat > Makefile.am <<'END' bin_SCRIPTS = zot END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 diff --git a/tests/gcj2.test b/tests/gcj2.test index 3a4320f18..11c808b2f 100755 --- a/tests/gcj2.test +++ b/tests/gcj2.test @@ -14,5 +14,6 @@ bin_PROGRAMS = convert convert_SOURCES = x/../convert.java END +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/gnits.test b/tests/gnits.test index 19471b36c..f7895ed65 100755 --- a/tests/gnits.test +++ b/tests/gnits.test @@ -23,5 +23,6 @@ END : > ChangeLog : > THANKS +$ACLOCAL || exit 1 $AUTOMAKE --gnits && exit 1 exit 0 diff --git a/tests/include.test b/tests/include.test index 179ab612b..0f0d8e5d8 100755 --- a/tests/include.test +++ b/tests/include.test @@ -11,6 +11,7 @@ END : > foo +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 len="`grep '^srcdir' Makefile.in | wc -l`" echo "len = $len" diff --git a/tests/info.test b/tests/info.test index f5c3cfa5b..77d3e9836 100755 --- a/tests/info.test +++ b/tests/info.test @@ -14,6 +14,7 @@ END echo '@setfilename foo.info' > foo.texi : > texinfo.tex +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 for i in `grep '^INFOS =' Makefile.in | sed -e 's/^INFOS = //'`; do diff --git a/tests/insh.test b/tests/insh.test index 53e6acd90..2ebf918e5 100755 --- a/tests/insh.test +++ b/tests/insh.test @@ -9,6 +9,7 @@ rm -f mkinstalldirs : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE > out 2>&1 && exit 1 grep mkinstalldirs out diff --git a/tests/insh2.test b/tests/insh2.test index 9f35a6c20..001050083 100755 --- a/tests/insh2.test +++ b/tests/insh2.test @@ -10,6 +10,7 @@ magic: @echo $(DISTFILES) END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed diff --git a/tests/install.test b/tests/install.test index 031b97c42..7bc77c566 100755 --- a/tests/install.test +++ b/tests/install.test @@ -13,7 +13,8 @@ # It isn't possible to write this test. That's because all files that # might be required are actually included in the automake # distribution. -# $AUTOMAKE --gnu --add-missing > output 2>&1 && exit 1 +# $ACLOCAL || exit 1 +$AUTOMAKE --gnu --add-missing > output 2>&1 && exit 1 # grep installing output exit 0 diff --git a/tests/installsh.test b/tests/installsh.test index e1130230b..214f822ee 100755 --- a/tests/installsh.test +++ b/tests/installsh.test @@ -28,6 +28,7 @@ esac AUTOMAKE="$PERL ../../../automake --libdir=$srcdir/../lib --foreign" # Now we proceed with the test +$ACLOCAL || exit 1 $AUTOMAKE --add-missing > output 2>&1 \ || exit 1 diff --git a/tests/instdata.test b/tests/instdata.test index 134ca1c74..6362b3870 100755 --- a/tests/instdata.test +++ b/tests/instdata.test @@ -9,6 +9,7 @@ echo 'AC_SUBST(INSTALL_DATA)' >> configure.in : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 (grep '^DATA =' Makefile.in | grep INSTALL_DATA) && exit 1 diff --git a/tests/instdata2.test b/tests/instdata2.test index 569e6c131..73dbd2ad1 100755 --- a/tests/instdata2.test +++ b/tests/instdata2.test @@ -49,6 +49,7 @@ pkgdata_SCRIPTS = script EOF set -e +$ACLOCAL || exit 1 $AUTOMAKE # install-SCRIPTS targets. diff --git a/tests/instexec.test b/tests/instexec.test index 98480a015..3361d26f4 100755 --- a/tests/instexec.test +++ b/tests/instexec.test @@ -7,6 +7,7 @@ : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^install-exec:' Makefile.in diff --git a/tests/insthook.test b/tests/insthook.test index 82876bf1d..7950bb244 100755 --- a/tests/insthook.test +++ b/tests/insthook.test @@ -10,6 +10,7 @@ install-exec-hook: @echo nothing END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 test "`grep install-exec-hook Makefile.in | wc -l`" -gt 1 || exit 1 diff --git a/tests/instman.test b/tests/instman.test index 60d231bdb..f225f5988 100755 --- a/tests/instman.test +++ b/tests/instman.test @@ -11,6 +11,7 @@ EOF : > frob.8 +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '[^(/]mkinstalldirs' Makefile.in > out || exit 1 diff --git a/tests/instman2.test b/tests/instman2.test index fb4401051..5e8f7b256 100755 --- a/tests/instman2.test +++ b/tests/instman2.test @@ -11,6 +11,7 @@ EOF : > frob.8 +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^install-man' Makefile.in diff --git a/tests/java.test b/tests/java.test index 47a2992f8..d2e1944b9 100755 --- a/tests/java.test +++ b/tests/java.test @@ -9,5 +9,6 @@ javadir = $(datadir)/java java_JAVA = a.java b.java c.java END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^all[-a-z]*:.*classjava\.stamp' Makefile.in diff --git a/tests/javaprim.test b/tests/javaprim.test index 640ce7987..d6b54a930 100755 --- a/tests/javaprim.test +++ b/tests/javaprim.test @@ -11,4 +11,5 @@ javadir = $(datadir)/java java_JAVA = a.java b.java c.java END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/javasubst.test b/tests/javasubst.test index 1743115ff..8880bbacc 100755 --- a/tests/javasubst.test +++ b/tests/javasubst.test @@ -11,6 +11,7 @@ javadir = $(datadir)/java java_JAVA = a.java b.java c.java END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep 'JAVAC.*@JAVAC@' Makefile.in diff --git a/tests/libobj3.test b/tests/libobj3.test index 3c7ca654b..f078e0e9c 100755 --- a/tests/libobj3.test +++ b/tests/libobj3.test @@ -14,5 +14,6 @@ libtu_a_SOURCES = libtu_a_LIBADD = @LIBOBJS@ END +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/link_f_only.test b/tests/link_f_only.test index ca5779340..5dfcdcdc0 100755 --- a/tests/link_f_only.test +++ b/tests/link_f_only.test @@ -16,6 +16,7 @@ END : > lamp.f +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 diff --git a/tests/lisp.test b/tests/lisp.test index fa7366f7b..ae8a6c686 100755 --- a/tests/lisp.test +++ b/tests/lisp.test @@ -15,6 +15,7 @@ END : > foo.el : > elisp-comp +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^ELCFILES.*ELCFILES' Makefile.in && exit 1 diff --git a/tests/man.test b/tests/man.test index c6a6d81f8..4e6de6931 100755 --- a/tests/man.test +++ b/tests/man.test @@ -12,5 +12,6 @@ END : > foo.1 : > bar.man +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^MANS ' Makefile.in diff --git a/tests/mclean.test b/tests/mclean.test index 78b879445..2c59ca258 100755 --- a/tests/mclean.test +++ b/tests/mclean.test @@ -11,6 +11,7 @@ END : > FOO +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep 'rm -f .*MAINTAINERCLEANFILES' Makefile.in diff --git a/tests/mdate.test b/tests/mdate.test index c0619e893..fe5ca02b0 100755 --- a/tests/mdate.test +++ b/tests/mdate.test @@ -16,4 +16,5 @@ END # Required when using Texinfo. : > texinfo.tex +$ACLOCAL || exit 1 $AUTOMAKE 2>&1 > /dev/null | grep 'required file.*mdate-sh' diff --git a/tests/mdate2.test b/tests/mdate2.test index ef1945832..d9e5b0900 100755 --- a/tests/mdate2.test +++ b/tests/mdate2.test @@ -18,6 +18,7 @@ END echo '@setfilename textutils' > textutils.texi # Use "././" to confuse Automake into thinking this is a subdir build. +$ACLOCAL || exit 1 $AUTOMAKE ././Makefile || exit 1 grep 'mdate-sh' Makefile.in | grep -v SHELL diff --git a/tests/mdate3.test b/tests/mdate3.test index 8440c5aef..693fee0b9 100755 --- a/tests/mdate3.test +++ b/tests/mdate3.test @@ -27,6 +27,7 @@ mv missing foo mv mkinstalldirs foo mv depcomp foo +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '[^/]mdate-sh' Makefile.in && exit 1 diff --git a/tests/mdate4.test b/tests/mdate4.test index f6dc86760..9cbb1100d 100755 --- a/tests/mdate4.test +++ b/tests/mdate4.test @@ -26,5 +26,6 @@ cat > sub/textutils.texi << 'END' @setfilename textutils.info END +$ACLOCAL || exit 1 $AUTOMAKE -a || exit 1 test -f sub/mdate-sh diff --git a/tests/mkinst2.test b/tests/mkinst2.test index b30e46dfc..73b0e76b8 100755 --- a/tests/mkinst2.test +++ b/tests/mkinst2.test @@ -17,6 +17,7 @@ END chmod +x mkinstalldirs +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 ($MAKE -s -f Makefile.in installdirs | grep man) && exit 1 diff --git a/tests/mkinstall.test b/tests/mkinstall.test index eed6e8fea..90a1403c8 100755 --- a/tests/mkinstall.test +++ b/tests/mkinstall.test @@ -10,6 +10,7 @@ END # The "././" prefix confuses Automake into thinking it is doing a # subdir build. Yes, this is hacky. +$ACLOCAL || exit 1 $AUTOMAKE ././Makefile || exit 1 grep ' /mkinstalldirs' Makefile.in && exit 1 diff --git a/tests/nodepcomp.test b/tests/nodepcomp.test index 8f59c4b3e..88f3882bc 100755 --- a/tests/nodepcomp.test +++ b/tests/nodepcomp.test @@ -8,4 +8,5 @@ rm -f depcomp : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/noinst.test b/tests/noinst.test index d5970a8db..1910434e1 100755 --- a/tests/noinst.test +++ b/tests/noinst.test @@ -10,6 +10,7 @@ all-local: exit 1 END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^install[-a-z]*:.* all' Makefile.in diff --git a/tests/obsolete.test b/tests/obsolete.test index 442b24716..306cf1356 100755 --- a/tests/obsolete.test +++ b/tests/obsolete.test @@ -13,5 +13,6 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/obsolete2.test b/tests/obsolete2.test index 6ea8ff8c3..4a65e8461 100755 --- a/tests/obsolete2.test +++ b/tests/obsolete2.test @@ -8,6 +8,7 @@ echo AM_FUNC_FNMATCH >> configure.in : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE 2> output && exit 1 grep AC_FUNC_FNMATCH output diff --git a/tests/outdir.test b/tests/outdir.test index c9055684f..f3da31635 100755 --- a/tests/outdir.test +++ b/tests/outdir.test @@ -11,6 +11,7 @@ END mkdir zardir +$ACLOCAL || exit 1 $AUTOMAKE --output-dir=zardir || exit 1 test -f Makefile.in && exit 1 diff --git a/tests/output.test b/tests/output.test index 9f23c67dc..b2b8c8cee 100755 --- a/tests/output.test +++ b/tests/output.test @@ -17,4 +17,5 @@ END mkdir frob : > frob/zardoz.in +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/output2.test b/tests/output2.test index 7aed3fea7..086b97448 100755 --- a/tests/output2.test +++ b/tests/output2.test @@ -19,6 +19,7 @@ mkdir intl po misc : > po/Makefile.in.am : > misc/gettextize.in +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^gettextize' Makefile.in && exit 1 diff --git a/tests/output3.test b/tests/output3.test index 139ee5f3b..f9e01a5e2 100755 --- a/tests/output3.test +++ b/tests/output3.test @@ -20,4 +20,5 @@ mkdir tests : > tests/Makefile.am : > tests/defs.in +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/output4.test b/tests/output4.test index 3ee08deb9..46695c63f 100755 --- a/tests/output4.test +++ b/tests/output4.test @@ -16,6 +16,7 @@ mkdir tests : > tests/defs.in : > tests/Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep tests/defs.in tests/Makefile.in && exit 1 diff --git a/tests/output5.test b/tests/output5.test index 2052716cd..e354db0ea 100755 --- a/tests/output5.test +++ b/tests/output5.test @@ -12,6 +12,7 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE > output 2>&1 && exit 1 grep 'found or specified' output && exit 1 exit 0 diff --git a/tests/package.test b/tests/package.test index 0d14b0670..9eb4e17d8 100755 --- a/tests/package.test +++ b/tests/package.test @@ -12,5 +12,6 @@ cat > Makefile.am << 'END' pkgdata_DATA = END +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/pluseq.test b/tests/pluseq.test index 165f4e2e4..f7673a473 100755 --- a/tests/pluseq.test +++ b/tests/pluseq.test @@ -12,5 +12,6 @@ END : > zar : > doz +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 fgrep 'zar doz' Makefile.in diff --git a/tests/pluseq2.test b/tests/pluseq2.test index 9be0a5e5b..be1e07055 100755 --- a/tests/pluseq2.test +++ b/tests/pluseq2.test @@ -24,6 +24,7 @@ END : > doz : > dog +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep 'CHECK_TRUE.*zar doz' Makefile.in || exit 1 grep 'CHECK_FALSE.*dog' Makefile.in diff --git a/tests/pluseq3.test b/tests/pluseq3.test index 71d4ccf90..58555a6ea 100755 --- a/tests/pluseq3.test +++ b/tests/pluseq3.test @@ -27,6 +27,7 @@ END set -e +$ACLOCAL || exit 1 $AUTOMAKE grep '^@CHECK_TRUE@data_DATA = zar \\$' Makefile.in diff --git a/tests/pluseq5.test b/tests/pluseq5.test index b5700b514..e1d4903d0 100755 --- a/tests/pluseq5.test +++ b/tests/pluseq5.test @@ -13,5 +13,6 @@ endif INCLUDES += def END +$ACLOCAL || exit 1 $AUTOMAKE || exit 0 exit 1 diff --git a/tests/pluseq6.test b/tests/pluseq6.test index cf4a36a0a..ae8e869ab 100755 --- a/tests/pluseq6.test +++ b/tests/pluseq6.test @@ -12,6 +12,7 @@ mandir += foo zq = zzz END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 fgrep '@mandir@ foo' Makefile.in || exit 1 diff --git a/tests/pluseq8.test b/tests/pluseq8.test index bd974bb6b..6cc60d5d0 100755 --- a/tests/pluseq8.test +++ b/tests/pluseq8.test @@ -11,6 +11,7 @@ VAR = \ VAR += three END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 sed -n -e '/^VAR =.*\\$/ { diff --git a/tests/ppf77.test b/tests/ppf77.test index 7aca16d1a..68466a757 100755 --- a/tests/ppf77.test +++ b/tests/ppf77.test @@ -17,4 +17,5 @@ END : > foo.F : > q.r +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/pr2.test b/tests/pr2.test index a03caba1a..7f8b00c5d 100755 --- a/tests/pr2.test +++ b/tests/pr2.test @@ -17,6 +17,7 @@ END mkdir templ : > templ/README.foo.in +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 # Look for mkinstalldirs invocation for the templ directory. diff --git a/tests/primary.test b/tests/primary.test index 3a561b7df..4cbe94340 100755 --- a/tests/primary.test +++ b/tests/primary.test @@ -8,5 +8,6 @@ cat > Makefile.am << 'END' bin_PROGRAMS = @programs@ END +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/proginst.test b/tests/proginst.test index 1a3d1064d..5de275f32 100755 --- a/tests/proginst.test +++ b/tests/proginst.test @@ -9,4 +9,5 @@ cat > Makefile.am << 'END' bin_SCRIPTS = zardoz qbert brownie END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/python.test b/tests/python.test index b3b52b9c7..9d06d22c3 100755 --- a/tests/python.test +++ b/tests/python.test @@ -10,6 +10,7 @@ cat > Makefile.am << 'END' python_PYTHON = foo.py END +$ACLOCAL || exit 1 $AUTOMAKE -a || exit 1 grep '^py_compile =' Makefile.in diff --git a/tests/remake.test b/tests/remake.test index 3dd7a8e00..eed132b8a 100755 --- a/tests/remake.test +++ b/tests/remake.test @@ -15,6 +15,7 @@ END mkdir sub : > sub/Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^Makefile' sub/Makefile.in diff --git a/tests/remake2.test b/tests/remake2.test index d153188c3..b57d41e5d 100755 --- a/tests/remake2.test +++ b/tests/remake2.test @@ -15,6 +15,7 @@ END mkdir sub : > sub/Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep 'AUTOMAKE.*sub/Makefile' sub/Makefile.in diff --git a/tests/remake3.test b/tests/remake3.test index b898aad7c..f3b08fd8d 100755 --- a/tests/remake3.test +++ b/tests/remake3.test @@ -17,6 +17,7 @@ END mkdir sub : > sub/foo.in +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^sub/foo' Makefile.in diff --git a/tests/rulepat.test b/tests/rulepat.test index 1a1544cea..87cdbd59c 100755 --- a/tests/rulepat.test +++ b/tests/rulepat.test @@ -8,6 +8,7 @@ cat > Makefile.am << 'END' $(srcdir)/Makefile.am: END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^$(srcdir)/Makefile\.am' Makefile.in diff --git a/tests/scripts.test b/tests/scripts.test index 995b78cd0..02052b6d2 100755 --- a/tests/scripts.test +++ b/tests/scripts.test @@ -17,4 +17,5 @@ cat > Makefile.am << 'END' noinst_SCRIPTS = foo END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/seenc.test b/tests/seenc.test index 87bfc5484..16ce89f82 100755 --- a/tests/seenc.test +++ b/tests/seenc.test @@ -17,5 +17,6 @@ END : > fsusage.c : > mountlist.c +$ACLOCAL || exit 1 $AUTOMAKE > out 2>&1 && exit 1 exit 0 diff --git a/tests/sinclude.test b/tests/sinclude.test index 96dd30dcd..684e1fb89 100755 --- a/tests/sinclude.test +++ b/tests/sinclude.test @@ -15,6 +15,7 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE --Wno-error || exit 1 grep MAGICALPIG Makefile.in diff --git a/tests/spell.test b/tests/spell.test index 493612cb0..1c4cc0490 100755 --- a/tests/spell.test +++ b/tests/spell.test @@ -10,5 +10,6 @@ zardoz_SOURCES = x.c boo_SOURCES = y.c END +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/spell3.test b/tests/spell3.test index 0f3571e46..3dc3d1bf2 100755 --- a/tests/spell3.test +++ b/tests/spell3.test @@ -11,4 +11,5 @@ TAGS_DEPENDENCIES = joe ETAGS_ARGS = joe END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/spelling.test b/tests/spelling.test index b0cf2033b..4e6c5a03b 100755 --- a/tests/spelling.test +++ b/tests/spelling.test @@ -8,7 +8,8 @@ cat > Makefile.am << 'EOF' bni_PROGRAMS = zot EOF -if $AUTOMAKE; then +if $ACLOCAL || exit 1 +$AUTOMAKE; then exit 1 fi exit 0 diff --git a/tests/stamph.test b/tests/stamph.test index f7ff20f2f..0c14c0280 100755 --- a/tests/stamph.test +++ b/tests/stamph.test @@ -12,5 +12,6 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/subdir.test b/tests/subdir.test index 3373810f2..93652442f 100755 --- a/tests/subdir.test +++ b/tests/subdir.test @@ -23,4 +23,5 @@ cat > zot/Makefile.am << 'END' pkgdata_DATA = END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/subdir2.test b/tests/subdir2.test index 4d9c8244d..50876cf70 100755 --- a/tests/subdir2.test +++ b/tests/subdir2.test @@ -35,4 +35,5 @@ cat > one/two/Makefile.am << 'END' pkgdata_DATA = END +$ACLOCAL || exit 1 $AUTOMAKE --gnu diff --git a/tests/subdircond.test b/tests/subdircond.test index 25bb5e84e..fcdd11dfa 100755 --- a/tests/subdircond.test +++ b/tests/subdircond.test @@ -21,4 +21,5 @@ SUBDIRS = endif END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/subst.test b/tests/subst.test index 42098ecbb..e9b746bcf 100755 --- a/tests/subst.test +++ b/tests/subst.test @@ -12,6 +12,7 @@ END : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^\$1' Makefile.in && exit 1 exit 0 diff --git a/tests/symlink.test b/tests/symlink.test index 789351311..9312fb310 100755 --- a/tests/symlink.test +++ b/tests/symlink.test @@ -14,5 +14,6 @@ cat >> configure.in << 'END' AC_CONFIG_AUX_DIR(sub) END +$ACLOCAL || exit 1 $AUTOMAKE --add-missing && exit 1 exit 0 diff --git a/tests/symlink2.test b/tests/symlink2.test index a83d957bc..960e4ca89 100755 --- a/tests/symlink2.test +++ b/tests/symlink2.test @@ -10,4 +10,5 @@ ln -s Zardoz mkinstalldirs : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE --add-missing diff --git a/tests/symlink3.test b/tests/symlink3.test index 40d7ebc08..807b293a3 100755 --- a/tests/symlink3.test +++ b/tests/symlink3.test @@ -12,6 +12,7 @@ echo zot > mkinstalldirs : > Makefile.am +$ACLOCAL || exit 1 $AUTOMAKE --add-missing --force-missing || exit 1 grep zot mkinstalldirs && exit 1 diff --git a/tests/syntax.test b/tests/syntax.test index 8ca03920d..f06ad1da9 100755 --- a/tests/syntax.test +++ b/tests/syntax.test @@ -10,5 +10,6 @@ foo = q \ lib_LTLIBRARIES = foo.la END +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/tags.test b/tests/tags.test index ca6a29fb1..9d9c125f1 100755 --- a/tests/tags.test +++ b/tests/tags.test @@ -11,6 +11,7 @@ END : > iguana.h +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^ID:' Makefile.in diff --git a/tests/tagsub.test b/tests/tagsub.test index 9f766f38f..174774edc 100755 --- a/tests/tagsub.test +++ b/tests/tagsub.test @@ -25,6 +25,7 @@ VERSION=nonesuch AC_OUTPUT(Makefile sub/Makefile) END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^TAGS:.*tags-recursive' Makefile.in diff --git a/tests/texinfo.test b/tests/texinfo.test index 77b1538f6..3ade53230 100755 --- a/tests/texinfo.test +++ b/tests/texinfo.test @@ -14,6 +14,7 @@ END echo '@setfilename textutils.info' > textutils.texi : > texinfo.tex +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed diff --git a/tests/texinfo10.test b/tests/texinfo10.test index f93edbce6..d6a170165 100755 --- a/tests/texinfo10.test +++ b/tests/texinfo10.test @@ -17,6 +17,7 @@ END echo '@setfilename maude.info' > sub/maude.texi : > sub/texinfo.tex +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep dvi-recursive Makefile.in diff --git a/tests/texinfo2.test b/tests/texinfo2.test index a7d9a3cd0..8e0d95ab1 100755 --- a/tests/texinfo2.test +++ b/tests/texinfo2.test @@ -15,6 +15,7 @@ END echo '@setfilename textutils.info' > textutils.texi : > textutils.info~ +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 test -z "`$MAKE -s -f Makefile.in magic | grep '~'`" diff --git a/tests/texinfo3.test b/tests/texinfo3.test index e5ae26954..ce6c68ea9 100755 --- a/tests/texinfo3.test +++ b/tests/texinfo3.test @@ -11,6 +11,7 @@ END echo '@setfilename textutils' > textutils.texi : > texinfo.tex +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^INFO_DEPS.*textutils$' Makefile.in diff --git a/tests/texinfo4.test b/tests/texinfo4.test index 17b76e570..0c2cf9027 100755 --- a/tests/texinfo4.test +++ b/tests/texinfo4.test @@ -11,5 +11,6 @@ END echo '@setfilename textutils.frob' > textutils.texi : > texinfo.tex +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/texinfo5.test b/tests/texinfo5.test index 054870907..7129fe68b 100755 --- a/tests/texinfo5.test +++ b/tests/texinfo5.test @@ -15,4 +15,5 @@ END echo '@setfilename ian.info' > ian.texi +$ACLOCAL || exit 1 $AUTOMAKE --cygnus diff --git a/tests/texinfo6.test b/tests/texinfo6.test index dd984f824..6df755629 100755 --- a/tests/texinfo6.test +++ b/tests/texinfo6.test @@ -10,6 +10,7 @@ END echo '@setfilename foo.info' > foo.txi : > texinfo.tex +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 fgrep '.txi.info' Makefile.in diff --git a/tests/texinfo7.test b/tests/texinfo7.test index b98121312..c43520294 100755 --- a/tests/texinfo7.test +++ b/tests/texinfo7.test @@ -13,6 +13,7 @@ END echo '@setfilename textutils.info' > textutils.texi +$ACLOCAL || exit 1 $AUTOMAKE -a || exit 1 test -f texinfo.tex diff --git a/tests/texinfo8.test b/tests/texinfo8.test index 7527ebcc6..5430b6e0d 100755 --- a/tests/texinfo8.test +++ b/tests/texinfo8.test @@ -28,6 +28,7 @@ magic: @echo $(DISTFILES) END +$ACLOCAL || exit 1 $AUTOMAKE -a || exit 1 fgrep -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed diff --git a/tests/texinfo9.test b/tests/texinfo9.test index 5ae8c065a..4f0666ce1 100755 --- a/tests/texinfo9.test +++ b/tests/texinfo9.test @@ -15,6 +15,7 @@ echo '@setfilename liver.info' > liver.txi echo '@setfilename heart.info' > heart.texinfo : > texinfo.tex +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 test `grep '^dist-info:' Makefile.in | wc -l` -eq 1 diff --git a/tests/vars.test b/tests/vars.test index 2f71a49f3..50c9f462a 100755 --- a/tests/vars.test +++ b/tests/vars.test @@ -12,4 +12,5 @@ MY_FLAGS_3 =-DABC=345 MY_FLAGS_4 = -DABC=345 END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/vartar.test b/tests/vartar.test index 578dbd046..8a212066c 100755 --- a/tests/vartar.test +++ b/tests/vartar.test @@ -10,6 +10,7 @@ install: $(install) install END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^install = install$' Makefile.in || exit 1 diff --git a/tests/version.test b/tests/version.test index a5241a039..a9265271e 100755 --- a/tests/version.test +++ b/tests/version.test @@ -22,4 +22,5 @@ END : > ChangeLog : > THANKS +$ACLOCAL || exit 1 $AUTOMAKE --gnits diff --git a/tests/version2.test b/tests/version2.test index cbf4e7582..6acc27309 100755 --- a/tests/version2.test +++ b/tests/version2.test @@ -22,4 +22,5 @@ END : > ChangeLog : > THANKS +$ACLOCAL || exit 1 $AUTOMAKE --gnits diff --git a/tests/version3.test b/tests/version3.test index 00fdcfb4b..c9461eba6 100755 --- a/tests/version3.test +++ b/tests/version3.test @@ -8,5 +8,6 @@ cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = 9.9x END +$ACLOCAL || exit 1 $AUTOMAKE && exit 1 exit 0 diff --git a/tests/version4.test b/tests/version4.test index 9744b5904..993bc5c0a 100755 --- a/tests/version4.test +++ b/tests/version4.test @@ -8,4 +8,5 @@ cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = 1.4-p3 END +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/vpath.test b/tests/vpath.test index 03bbc0929..89e5004cb 100755 --- a/tests/vpath.test +++ b/tests/vpath.test @@ -9,6 +9,7 @@ cat > Makefile.am << 'END' VPATH = zardoz END +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep 'VPATH.*@srcdir@' Makefile.in && exit 1 diff --git a/tests/vtexi.test b/tests/vtexi.test index afe5f8dd8..b99636097 100755 --- a/tests/vtexi.test +++ b/tests/vtexi.test @@ -17,6 +17,7 @@ END set -e +$ACLOCAL || exit 1 $AUTOMAKE # Test for bug reported by Jim Meyering: diff --git a/tests/vtexi2.test b/tests/vtexi2.test index d950c258c..7587f31ee 100755 --- a/tests/vtexi2.test +++ b/tests/vtexi2.test @@ -20,6 +20,7 @@ END : > mdate-sh : > texinfo.tex +$ACLOCAL || exit 1 $AUTOMAKE || exit 1 grep '^zardoz\.dvi:' Makefile.in diff --git a/tests/werror.test b/tests/werror.test index 23ce2ae52..6bfb1389e 100755 --- a/tests/werror.test +++ b/tests/werror.test @@ -8,4 +8,5 @@ rm -f install-sh depcomp missing mkinstalldirs +$ACLOCAL || exit 1 $AUTOMAKE --Werror --add-missing |