From a9fd45b818bf7ed4bdeb6b488a9fcd1bc9a12a87 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 20 Oct 2001 11:17:16 +0000 Subject: [PATCH] * 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. --- ChangeLog | 55 ++++++++++++++++++++++++++++++++++++++++++ tests/acoutnoq.test | 1 + tests/acoutput.test | 1 + tests/acoutput2.test | 2 ++ tests/acoutqnl.test | 1 + tests/acouttbs.test | 1 + tests/all.test | 3 ++- tests/alpha.test | 1 + tests/ansi.test | 1 + tests/asm.test | 4 +++ tests/auxdir.test | 1 + tests/auxdir2.test | 1 + tests/backsl2.test | 1 + tests/badline.test | 1 + tests/block.test | 1 + tests/canon2.test | 1 + tests/check.test | 1 + tests/checkall.test | 1 + tests/clean.test | 1 + tests/colneq.test | 1 + tests/colneq2.test | 1 + tests/colon.test | 1 + tests/colon2.test | 1 + tests/colon3.test | 1 + tests/colon4.test | 1 + tests/colon5.test | 1 + tests/colon6.test | 1 + tests/colon7.test | 1 + tests/comment.test | 1 + tests/comment3.test | 1 + tests/cond.test | 1 + tests/cond2.test | 1 + tests/cond6.test | 1 + tests/cond7.test | 1 + tests/condincl.test | 1 + tests/condincl2.test | 1 + tests/condman.test | 1 + tests/condman2.test | 1 + tests/confdist.test | 1 + tests/confh.test | 2 ++ tests/confh2.test | 1 + tests/confh3.test | 1 + tests/confvar.test | 1 + tests/confvar2.test | 1 + tests/copy.test | 1 + tests/ctarget1.test | 1 + tests/cxxcpp.test | 1 + tests/dash.test | 1 + tests/dejagnu.test | 1 + tests/dejagnu2.test | 1 + tests/distcommon.test | 1 + tests/distdir.test | 1 + tests/else.test | 1 + tests/empty.test | 1 + tests/exdir.test | 1 + tests/exdir2.test | 1 + tests/extra3.test | 1 + tests/extra4.test | 1 + tests/flibs.test | 1 + tests/fnoc.test | 1 + tests/fo.test | 1 + tests/fonly.test | 1 + tests/fortdep.test | 1 + tests/fpinst2.test | 1 + tests/fpinstall.test | 1 + tests/gcj2.test | 1 + tests/gnits.test | 1 + tests/include.test | 1 + tests/info.test | 1 + tests/insh.test | 1 + tests/insh2.test | 1 + tests/install.test | 3 ++- tests/installsh.test | 1 + tests/instdata.test | 1 + tests/instdata2.test | 1 + tests/instexec.test | 1 + tests/insthook.test | 1 + tests/instman.test | 1 + tests/instman2.test | 1 + tests/java.test | 1 + tests/javaprim.test | 1 + tests/javasubst.test | 1 + tests/libobj3.test | 1 + tests/link_f_only.test | 1 + tests/lisp.test | 1 + tests/man.test | 1 + tests/mclean.test | 1 + tests/mdate.test | 1 + tests/mdate2.test | 1 + tests/mdate3.test | 1 + tests/mdate4.test | 1 + tests/mkinst2.test | 1 + tests/mkinstall.test | 1 + tests/nodepcomp.test | 1 + tests/noinst.test | 1 + tests/obsolete.test | 1 + tests/obsolete2.test | 1 + tests/outdir.test | 1 + tests/output.test | 1 + tests/output2.test | 1 + tests/output3.test | 1 + tests/output4.test | 1 + tests/output5.test | 1 + tests/package.test | 1 + tests/pluseq.test | 1 + tests/pluseq2.test | 1 + tests/pluseq3.test | 1 + tests/pluseq5.test | 1 + tests/pluseq6.test | 1 + tests/pluseq8.test | 1 + tests/ppf77.test | 1 + tests/pr2.test | 1 + tests/primary.test | 1 + tests/proginst.test | 1 + tests/python.test | 1 + tests/remake.test | 1 + tests/remake2.test | 1 + tests/remake3.test | 1 + tests/rulepat.test | 1 + tests/scripts.test | 1 + tests/seenc.test | 1 + tests/sinclude.test | 1 + tests/spell.test | 1 + tests/spell3.test | 1 + tests/spelling.test | 3 ++- tests/stamph.test | 1 + tests/subdir.test | 1 + tests/subdir2.test | 1 + tests/subdircond.test | 1 + tests/subst.test | 1 + tests/symlink.test | 1 + tests/symlink2.test | 1 + tests/symlink3.test | 1 + tests/syntax.test | 1 + tests/tags.test | 1 + tests/tagsub.test | 1 + tests/texinfo.test | 1 + tests/texinfo10.test | 1 + tests/texinfo2.test | 1 + tests/texinfo3.test | 1 + tests/texinfo4.test | 1 + tests/texinfo5.test | 1 + tests/texinfo6.test | 1 + tests/texinfo7.test | 1 + tests/texinfo8.test | 1 + tests/texinfo9.test | 1 + tests/vars.test | 1 + tests/vartar.test | 1 + tests/version.test | 1 + tests/version2.test | 1 + tests/version3.test | 1 + tests/version4.test | 1 + tests/vpath.test | 1 + tests/vtexi.test | 1 + tests/vtexi2.test | 1 + tests/werror.test | 1 + 156 files changed, 218 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2441d7c8..9c801d13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,58 @@ +2001-10-20 Akim Demaille + + * 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 * tests/acoutnoq.test, tests/acoutput.test, tests/acoutqnl.test, diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test index b281bb57..3e9cc7b8 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 5918a74e..aa41caa6 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 3c2488db..6af5440d 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 40d37f3a..39101abc 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 a5fa37fe..07e79c70 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 61e12928..2387dbe7 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 4add83d1..923e0b8b 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 0e133c29..3b7da79e 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 ee2fe3bc..6fdbea36 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 cf6872d4..8b42f689 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 1251fbe7..891dc61a 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 9d3dcb2c..ae3eaaea 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 16ad1282..3ad0358e 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 8ec8c25c..a9d23003 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 0efe3460..ea60dda1 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 2cf75083..4f9945a3 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 34b72304..625daa8b 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 e34173f6..b0942cc2 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 e3db4947..23ec0d0b 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 a5af04ca..458328f7 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 6da5ef8d..f143973a 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 60aa1afe..afa2bf34 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 4252b24f..29913dbb 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 a041a2a1..d433c441 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 e27712cd..799d5e3a 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 9bc496e5..36e3cd6b 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 3ccf811e..a56012e6 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 1d2b4f34..863c0cdf 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 01d83231..017c0a7c 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 348618f1..fb8b0d83 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 271ae01a..7ac7fc30 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 7ea2510f..7502e013 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 7a257b4b..ee3709f1 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 0dfb451f..22f0753d 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 59b2a290..3b068be6 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 4559c94d..ebeaa3f8 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 941b24e2..be087cdd 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 f02307e5..76fcce12 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 8ae20010..b19f3c0e 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 a7daa341..97e12a3c 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 fdf9f7b4..d804cc89 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 fdae95f4..9fa06aab 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 a1f5c619..13566a49 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 dc1de49b..6426df95 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 dff9bc4b..6d32c0ef 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 0a90fc78..e15fd113 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 a3e2da69..a95112c7 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 55459fde..f68dbf08 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 f99163a2..23d54d83 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 f7297de5..4a3db7da 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 cfc15d9f..c6320009 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 a1cd725d..3aad8de0 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 112b2c6b..e5cd3211 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 0ef3cbe5..1400b5f8 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 7dbdfb6c..02713878 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 5c9a4855..44091885 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 b652fba2..934bafc9 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 a4978f95..f8c69fbd 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 f264d390..445931c6 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 2b4b425f..3c76e08c 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 392b6762..e418447d 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 225a7508..d751c801 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 1351173d..7637ccc9 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 84109644..a47b736d 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 3a4320f1..11c808b2 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 19471b36..f7895ed6 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 179ab612..0f0d8e5d 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 f5c3cfa5..77d3e983 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 53e6acd9..2ebf918e 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 9f35a6c2..00105008 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 031b97c4..7bc77c56 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 e1130230..214f822e 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 134ca1c7..6362b387 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 569e6c13..73dbd2ad 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 98480a01..3361d26f 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 82876bf1..7950bb24 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 60d231bd..f225f598 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 fb440105..5e8f7b25 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 47a2992f..d2e1944b 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 640ce798..d6b54a93 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 1743115f..8880bbac 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 3c7ca654..f078e0e9 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 ca577934..5dfcdcdc 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 fa7366f7..ae8a6c68 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 c6a6d81f..4e6de693 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 78b87944..2c59ca25 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 c0619e89..fe5ca02b 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 ef194583..d9e5b090 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 8440c5ae..693fee0b 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 f6dc8676..9cbb1100 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 b30e46df..73b0e76b 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 eed6e8fe..90a1403c 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 8f59c4b3..88f3882b 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 d5970a8d..1910434e 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 442b2471..306cf135 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 6ea8ff8c..4a65e846 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 c9055684..f3da3163 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 9f23c67d..b2b8c8ce 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 7aed3fea..086b9744 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 139ee5f3..f9e01a5e 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 3ee08deb..46695c63 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 2052716c..e354db0e 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 0d14b067..9eb4e17d 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 165f4e2e..f7673a47 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 9be0a5e5..be1e0705 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 71d4ccf9..58555a6e 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 b5700b51..e1d4903d 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 cf4a36a0..ae8e869a 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 bd974bb6..6cc60d5d 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 7aca16d1..68466a75 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 a03caba1..7f8b00c5 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 3a561b7d..4cbe9434 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 1a3d1064..5de275f3 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 b3b52b9c..9d06d22c 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 3dd7a8e0..eed132b8 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 d153188c..b57d41e5 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 b898aad7..f3b08fd8 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 1a1544ce..87cdbd59 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 995b78cd..02052b6d 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 87bfc548..16ce89f8 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 96dd30dc..684e1fb8 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 493612cb..1c4cc049 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 0f3571e4..3dc3d1bf 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 b0cf2033..4e6c5a03 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 f7ff20f2..0c14c028 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 3373810f..93652442 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 4d9c8244..50876cf7 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 25bb5e84..fcdd11df 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 42098ecb..e9b746bc 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 78935131..9312fb31 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 a83d957b..960e4ca8 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 40d7ebc0..807b293a 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 8ca03920..f06ad1da 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 ca6a29fb..9d9c125f 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 9f766f38..174774ed 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 77b1538f..3ade5323 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 f93edbce..d6a17016 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 a7d9a3cd..8e0d95ab 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 e5ae2695..ce6c68ea 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 17b76e57..0c2cf902 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 05487090..7129fe68 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 dd984f82..6df75562 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 b9812131..c4352029 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 7527ebcc..5430b6e0 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 5ae8c065..4f0666ce 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 2f71a49f..50c9f462 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 578dbd04..8a212066 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 a5241a03..a9265271 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 cbf4e758..6acc2730 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 00fdcfb4..c9461eba 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 9744b590..993bc5c0 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 03bbc092..89e5004c 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 afe5f8dd..b9963609 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 d950c258..7587f31e 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 23ce2ae5..6bfb1389 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 -- 2.43.5