diff options
181 files changed, 388 insertions, 379 deletions
@@ -1,3 +1,8 @@ +2011-07-18 Stefano Lattarini <stefano.lattarini@gmail.com> + + tests: fix typos, grammaros and other blunders in comments + All affected files changed. + 2011-07-16 Stefano Lattarini <stefano.lattarini@gmail.com> test defs: new subroutine 'seq_', simulating GNU seq(1) diff --git a/tests/all.test b/tests/all.test index 6df139704..9a137719f 100755 --- a/tests/all.test +++ b/tests/all.test @@ -21,13 +21,13 @@ targets='all install-exec install-data uninstall' echo "$targets:" | sed -e 's/[ :]/-local&/g' > Makefile.am -cat Makefile.am # might be useful for debugging +cat Makefile.am # For debugging. $ACLOCAL $AUTOMAKE for target in $targets; do - grep "${target}-local" Makefile.in # might be useful for debugging + grep "${target}-local" Makefile.in # For debugging. grep "${target}-am:.*${target}-local" Makefile.in done diff --git a/tests/alpha.test b/tests/alpha.test index a95e42d1d..d907df068 100755 --- a/tests/alpha.test +++ b/tests/alpha.test @@ -60,7 +60,7 @@ $AUTOCONF $AUTOMAKE ./configure -# make distdir should fail because NEWS does not mention 1.0a +# "make distdir" should fail because NEWS does not mention 1.0a $MAKE check 2>stderr && { cat stderr >&2; Exit 1; } cat stderr >&2 grep 'NEWS not updated' stderr diff --git a/tests/amopts-variable-expansion.test b/tests/amopts-variable-expansion.test index 7a746ea66..c11be8742 100755 --- a/tests/amopts-variable-expansion.test +++ b/tests/amopts-variable-expansion.test @@ -37,9 +37,9 @@ foo2 = -Wnone foo2 += $(foo3) foo3 = -Wno-error bar = -Wportability -## This will give a warning with `-Wportability' +# This will give a warning with `-Wportability'. zardoz := -## This would give a warning with `-Woverride'. +# This would give a warning with `-Woverride'. install: END diff --git a/tests/ar-lib.test b/tests/ar-lib.test index 6f6625dc8..6f9c93c4e 100755 --- a/tests/ar-lib.test +++ b/tests/ar-lib.test @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Make sure `ar-lib' wraps the Microsoft Library Manager (lib) correctly +# Make sure `ar-lib' wraps the Microsoft Library Manager (lib) correctly. required=xsi-lib-shell . ./defs || Exit 1 @@ -35,11 +35,11 @@ END chmod +x ./lib -# Check if ar-lib can create an archive with "cr" +# Check if ar-lib can create an archive with "cr". opts=`./ar-lib ./lib cr foo.lib foo.obj` test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.obj" -# Check if ar-lib can update an existing archive with "r" +# Check if ar-lib can update an existing archive with "r". touch foo.lib opts=`./ar-lib ./lib r foo.lib foo.obj` test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj" @@ -48,37 +48,37 @@ test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj" opts=`./ar-lib ./lib r foo.lib @list` test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib @list" -# Check if ar-lib can delete a member from an archive with "d" +# Check if ar-lib can delete a member from an archive with "d". opts=`./ar-lib ./lib d foo.lib foo.obj` test x"$opts" = x"lib -NOLOGO -REMOVE:foo.obj foo.lib" -# Check if ar-lib can delete members in an @FILE +# Check if ar-lib can delete members in an @FILE. echo foo.obj > foolist opts=`./ar-lib ./lib d foo.lib @foolist` test x"$opts" = x"lib -NOLOGO -REMOVE:foo.obj foo.lib" -# Check if ar-lib can list archive members with "t" +# Check if ar-lib can list archive members with "t". opts=`./ar-lib ./lib t foo.lib` test x"$opts" = x"lib -NOLOGO -LIST foo.lib" -# Check if ar-lib can extract archive members with "x" +# Check if ar-lib can extract archive members with "x". touch fake.lib opts=`./ar-lib ./lib x fake.lib` test x"$opts" = x"lib -NOLOGO -EXTRACT:fake.obj fake.lib" -# Check if ar-lib can extract specified archive members with "x" +# Check if ar-lib can extract specified archive members with "x". opts=`./ar-lib ./lib x foo.lib foo.obj` test x"$opts" = x"lib -NOLOGO -EXTRACT:foo.obj foo.lib" -# Check if ar-lib can extract members in an @FILE +# Check if ar-lib can extract members in an @FILE. opts=`./ar-lib ./lib x foo.lib @foolist` test x"$opts" = x"lib -NOLOGO -EXTRACT:foo.obj foo.lib" -# Check if ar-lib passes -lib and -LTCG through to the wrappee +# Check if ar-lib passes -lib and -LTCG through to the wrappee. opts=`./ar-lib ./lib -lib -LTCG x foo.lib foo.obj` test x"$opts" = x"lib -lib -LTCG -NOLOGO -EXTRACT:foo.obj foo.lib" -# Check if ar-lib can extract backslashed members +# Check if ar-lib can extract backslashed members. touch fake2.lib opts=`./ar-lib ./lib x fake2.lib` test x"$opts" = x"lib -NOLOGO -EXTRACT:dir\\fake2.obj fake2.lib" diff --git a/tests/automake.test b/tests/automake.test index 98018a127..db8c2b391 100755 --- a/tests/automake.test +++ b/tests/automake.test @@ -19,7 +19,7 @@ AUTOMAKE_fails --voo grep 'unrecognized option.*--voo' stderr -# older perl has a buggy Getopt::Long which makes this fail. +# Older perl has a buggy Getopt::Long which makes this fail. if $PERL -e 'require 5.8.2;'; then AUTOMAKE_fails -- --voo grep 'input file.*--voo' stderr diff --git a/tests/backcompat.test b/tests/backcompat.test index 0acb77b9a..f76b53b4a 100755 --- a/tests/backcompat.test +++ b/tests/backcompat.test @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Test usage of AM_INIT_AUTOMAKE with two ot three arguments, for +# Test usage of AM_INIT_AUTOMAKE with two or three arguments, for # backward-compatibility. . ./defs || Exit 1 @@ -52,7 +52,7 @@ for ac_init in 'AC_INIT' 'AC_INIT([Makefile.am])'; do AC_CONFIG_FILES([Makefile]) AC_OUTPUT END - cat configure.in # might be useful for debugging + cat configure.in # For debugging. $ACLOCAL $AUTOCONF $AUTOMAKE diff --git a/tests/backcompat2.test b/tests/backcompat2.test index d1d3520f2..57badf38e 100755 --- a/tests/backcompat2.test +++ b/tests/backcompat2.test @@ -38,10 +38,10 @@ for am_arg3 in ':' 'false' '#' ' '; do AM_INIT_AUTOMAKE([pkgname], [pkgversion], [$am_arg3]) AC_OUTPUT END - cat configure.in # might be useful for debugging + cat configure.in # For debugging. $AUTOCONF ./configure - cat config.h # might be useful for debugging + cat config.h # For debugging. # The non-empty third argument should prevent PACKAGE and VERSION # from being AC_DEFINE'd. $EGREP 'pkg(name|version)' config.h && Exit 1 @@ -59,10 +59,10 @@ for am_extra_args in '' ',' ', []'; do AM_INIT_AUTOMAKE([pkgname], [pkgversion]$am_extra_args) AC_OUTPUT END - cat configure.in # might be useful for debugging + cat configure.in # For debugging. $AUTOCONF ./configure - cat config.h # might be useful for debugging + cat config.h # For debugging. grep '^ *# *define *PACKAGE *"pkgname" *$' config.h grep '^ *# *define *VERSION *"pkgversion" *$' config.h done diff --git a/tests/backcompat3.test b/tests/backcompat3.test index 437377f9a..f0e34ba9e 100755 --- a/tests/backcompat3.test +++ b/tests/backcompat3.test @@ -73,10 +73,10 @@ diff exp got ### Run 2 ### cat > configure.in <<'END' -dnl# `AC_INIT' in Autoconf <= 2.63 doesn't have an URL argument. -dnl# Luckily, `AC_AUTOCONF_VERSION' and `m4_version_prereq' are -dnl# both present in autoconf 2.62, which we require; so that we -dnl# can at least use the following workaround. +dnl: `AC_INIT' in Autoconf <= 2.63 doesn't have an URL argument. +dnl: Luckily, `AC_AUTOCONF_VERSION' and `m4_version_prereq' are +dnl: both present in autoconf 2.62, which we require; so that we +dnl: can at least use the following workaround. m4_version_prereq([2.64], [AC_INIT([ac_name], [ac_version], [ac_bugreport], [ac_tarname], [ac_url])], diff --git a/tests/backcompat4.test b/tests/backcompat4.test index e4432eb97..b95a30b4c 100755 --- a/tests/backcompat4.test +++ b/tests/backcompat4.test @@ -27,7 +27,7 @@ mkdir sub : > foo3.in : > sub/bar.in -ls -l # might be useful for debugging +ls -l # For debugging. for args in \ 'foo' \ @@ -46,7 +46,7 @@ for args in \ AC_CONFIG_FILES([$args]) AC_OUTPUT END - cat configure.in # for debugging + cat configure.in # For debugging. $ACLOCAL $AUTOMAKE Makefile mv -f Makefile.in Makefile.acf @@ -56,7 +56,7 @@ END AM_INIT_AUTOMAKE AC_OUTPUT([$args]) END - cat configure.in # for debugging + cat configure.in # For debugging. $ACLOCAL $AUTOMAKE Makefile mv -f Makefile.in Makefile.aco diff --git a/tests/backcompat5.test b/tests/backcompat5.test index 2385ae483..0630a50c3 100755 --- a/tests/backcompat5.test +++ b/tests/backcompat5.test @@ -23,7 +23,7 @@ # Yuck! cat > configure.in <<'END' -dnl. Everything here is *deliberately* underquoted! +dnl: Everything here is *deliberately* underquoted! AC_INIT(src/foo.input) AM_INIT_AUTOMAKE(foo, 1.0) AC_CONFIG_FILES(Makefile:mkfile.in) @@ -93,7 +93,7 @@ $AUTOCONF $AUTOMAKE ./configure -ls -l . hacky src data tests # useful for debugging +ls -l . hacky src data tests # For debugging. test ! -f mkfile $MAKE $MAKE distdir @@ -111,7 +111,7 @@ $MAKE distcheck test -f $distdir.tar.gz chmod a-x tests/a.test -# dist-hook should take care of making test files executables +# dist-hook should take care of making test files executables. $MAKE distcheck : diff --git a/tests/backcompat6.test b/tests/backcompat6.test index 2cb589e3e..468e71d26 100755 --- a/tests/backcompat6.test +++ b/tests/backcompat6.test @@ -25,7 +25,7 @@ required=cc # Anyone doing something like this in a real-life package probably # deserves to be killed. cat > configure.in <<'END' -dnl. Everything here is *deliberately* underquoted! +dnl: Everything here is *deliberately* underquoted! AC_INIT(quux.c) PACKAGE=nonesuch-zardoz VERSION=nonesuch-0.1 diff --git a/tests/backsl3.test b/tests/backsl3.test index 876c045ef..1319c0aa5 100755 --- a/tests/backsl3.test +++ b/tests/backsl3.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure we diagnose trailing backslash at the end of a file. -# Report from Akim Demaile <akim@epita.fr> +# Report from Akim Demaile <akim@epita.fr>. . ./defs || Exit 1 diff --git a/tests/check.test b/tests/check.test index 2f9f8b11a..c9038adb3 100755 --- a/tests/check.test +++ b/tests/check.test @@ -30,10 +30,10 @@ $AUTOMAKE grep '^check-TESTS:' Makefile.in grep 'check-DEJAGNU' Makefile.in && Exit 1 -# check-TESTS is phony. +# 'check-TESTS' is phony. sed -n '/^\.PHONY:/,/^$/p' Makefile.in | $EGREP '(^| )check-TESTS($| )' -# check should depend directly on check-am (similar tests are +# 'check' should depend directly on 'check-am' (similar tests are # in check2.test and check3.test). $EGREP '^check:.* check-am( |$)' Makefile.in diff --git a/tests/check2.test b/tests/check2.test index d21551890..4edf0ee6c 100755 --- a/tests/check2.test +++ b/tests/check2.test @@ -53,7 +53,7 @@ cat stdout grep '^PASS: subrun\.sh *$' stdout grep 'PASS.*echo\.sh' stdout && Exit 1 -# check should depend directly on check-am (similar tests are +# 'check' should depend directly on 'check-am' (similar tests are # in check.test and check3.test). $EGREP '^check:.* check-recursive( |$)' Makefile.in $EGREP '^check:.* check-am( |$)' dir/Makefile.in diff --git a/tests/check4.test b/tests/check4.test index 417b2e458..c7a23fe06 100755 --- a/tests/check4.test +++ b/tests/check4.test @@ -61,7 +61,7 @@ cat stdout grep '^FAIL: fail\.sh *$' stdout grep '^PASS: ok\.sh *$' stdout -# should also works when -k is not in first position +# Should also works when -k is not in first position. $MAKE -s -k check >stdout || : cat stdout grep '^FAIL: fail\.sh *' stdout diff --git a/tests/check8.test b/tests/check8.test index 225816100..51fcbd29c 100755 --- a/tests/check8.test +++ b/tests/check8.test @@ -74,7 +74,7 @@ grep '^[^X]*PASS.* bar' stdout grep '^[^X]*PASS.* sub/bar' stdout grep '^[^X]*FAIL.* baz' stdout grep 'XFAIL.* sub/baz' stdout -# parallel-tests should not add circular dependencies. +# `parallel-tests' should not add circular dependencies. # Look for known warnings from a couple of `make' implementations. grep -i 'circular.*dependency' stderr && Exit 1 grep -i 'graph cycles' stderr && Exit 1 diff --git a/tests/clean2.test b/tests/clean2.test index 1f9baff80..46ab4b70d 100755 --- a/tests/clean2.test +++ b/tests/clean2.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure distclean works in cygnus mode. -# Report from Daniel Jacobowitz +# Report from Daniel Jacobowitz. . ./defs || Exit 1 diff --git a/tests/colon2.test b/tests/colon2.test index 10b270d9c..b583831ee 100755 --- a/tests/colon2.test +++ b/tests/colon2.test @@ -54,7 +54,7 @@ str='%% ZaR DoZ %%' $AUTOCONF ./configure -test -f Makefile # sanity check +test -f Makefile # Sanity check. $MAKE dummy # Again, make sure that the generated Makefile do not unduly @@ -72,7 +72,7 @@ testin: testmk: grep '$str' Makefile END -$MAKE Makefile # for non-GNU make +$MAKE Makefile # For non-GNU make. $MAKE testam testin testmk $MAKE distcheck diff --git a/tests/colon3.test b/tests/colon3.test index 8a830633a..5183b571c 100755 --- a/tests/colon3.test +++ b/tests/colon3.test @@ -60,7 +60,7 @@ str3='== @thr33@ ==' $AUTOCONF ./configure -test -f Makefile # sanity check +test -f Makefile # Sanity check. $MAKE dummy # Again, make sure that the generated Makefile do not unduly @@ -84,7 +84,7 @@ test3: END echo "# $str2" >> two.in echo "# $str3" >> three.in -$MAKE Makefile # for non-GNU make +$MAKE Makefile # For non-GNU make. $MAKE testam testin testmk test2 test3 $MAKE distcheck diff --git a/tests/colon5.test b/tests/colon5.test index ca5414c15..571d88c04 100755 --- a/tests/colon5.test +++ b/tests/colon5.test @@ -51,8 +51,8 @@ $AUTOMAKE ./configure -grep '=GrEpMe_am=' Makefile && Exit 1 # sanity check -grep '=GrEpMe_dep=' Makefile && Exit 1 # likewise +grep '=GrEpMe_am=' Makefile && Exit 1 # Sanity check. +grep '=GrEpMe_dep=' Makefile && Exit 1 # Likewise. $MAKE test-distcommon $MAKE test-distdir @@ -62,7 +62,7 @@ $sleep echo '# =GrEpMe_am=' >> Makefile.am echo '# =GrEpMe_dep=' >> Makefile.dep -$MAKE Makefile # for non-GNU make +$MAKE Makefile # For non-GNU make. $MAKE test-grep $MAKE test-distcommon $MAKE test-distdir diff --git a/tests/colon6.test b/tests/colon6.test index 9c739b054..6aac84a1a 100755 --- a/tests/colon6.test +++ b/tests/colon6.test @@ -55,8 +55,8 @@ for vpath in : false; do $srcdir/configure - test -f demo/version.good # sanity check - test ! -s demo/version.good # likewise + test -f demo/version.good # Sanity check. + test ! -s demo/version.good # Likewise. cd demo @@ -84,7 +84,7 @@ for vpath in : false; do # Makefile should not depend on version.gin. rm -f ../$srcdir/demo/version.gin $MAKE Makefile - test ! -r ../$srcdir/demo/version.gin # sanity check + test ! -r ../$srcdir/demo/version.gin # Sanity check. # version.good should depend on version.gin. rm -f version.good @@ -93,7 +93,7 @@ for vpath in : false; do # Try to verify that we errored out for the right reason. $FGREP version.gin output - cd .. # back in top builddir + cd .. # Back in top builddir. cd $srcdir # Re-create it for the next pass (if any). diff --git a/tests/comments-in-var-def.test b/tests/comments-in-var-def.test index 3f5192e8b..aaee1d35c 100755 --- a/tests/comments-in-var-def.test +++ b/tests/comments-in-var-def.test @@ -46,7 +46,7 @@ mkdir tex $ACLOCAL $AUTOMAKE -grep TEX Makefile.in # for debugging +grep TEX Makefile.in # For debugging. grep '^TEXINFO_TEX *= *tex/texinfo\.tex *# some comment w/ a slash *$' Makefile.in $AUTOCONF diff --git a/tests/cond14.test b/tests/cond14.test index 6e552c1d2..c956200ad 100755 --- a/tests/cond14.test +++ b/tests/cond14.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test for bug in conditionals. -# Report from Robert Boehne +# Report from Robert Boehne. . ./defs || Exit 1 diff --git a/tests/cond16.test b/tests/cond16.test index 89182c409..4efcbbd74 100755 --- a/tests/cond16.test +++ b/tests/cond16.test @@ -16,7 +16,7 @@ # Test for bug in conditionals in SOURCES with variable substitution # references. -# Report from Richard Boulton +# Report from Richard Boulton. . ./defs || Exit 1 diff --git a/tests/cond17.test b/tests/cond17.test index c934ee8d5..26a8ebb31 100755 --- a/tests/cond17.test +++ b/tests/cond17.test @@ -16,7 +16,7 @@ # Test for being able to define an object to be generated in different ways # according to a conditional. -# Report from Richard Boulton +# Report from Richard Boulton. . ./defs || Exit 1 diff --git a/tests/cond18.test b/tests/cond18.test index 9c404a4bd..366dfd01d 100755 --- a/tests/cond18.test +++ b/tests/cond18.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Regression test for substitution references to conditional variables. -# Report from Richard Boulton +# Report from Richard Boulton. . ./defs || Exit 1 diff --git a/tests/cond19.test b/tests/cond19.test index ec69bfbb8..d1ba08a31 100755 --- a/tests/cond19.test +++ b/tests/cond19.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Regression test for substitution references to conditional variables. -# Report from Richard Boulton +# Report from Richard Boulton. . ./defs || Exit 1 diff --git a/tests/cond23.test b/tests/cond23.test index db209b23d..2e43f894a 100755 --- a/tests/cond23.test +++ b/tests/cond23.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check that conditional redefinitions of AC_SUBST'ed variables are detected. -# Report from Patrik Weiskircher +# Report from Patrik Weiskircher. . ./defs || Exit 1 diff --git a/tests/cond24.test b/tests/cond24.test index 11f8d8701..89424bec0 100755 --- a/tests/cond24.test +++ b/tests/cond24.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check that conditional redefinitions of AC_SUBST'ed variables are detected. -# Report from Patrik Weiskircher +# Report from Patrik Weiskircher. . ./defs || Exit 1 diff --git a/tests/cond33.test b/tests/cond33.test index 5f454dbcc..2b5f62e11 100755 --- a/tests/cond33.test +++ b/tests/cond33.test @@ -16,7 +16,7 @@ # Check that conditionally-defined install directories are handled # correctly. -# Report from Ralf Corsepius +# Report from Ralf Corsepius. . ./defs || Exit 1 diff --git a/tests/cond34.test b/tests/cond34.test index 1e030e834..2443798b5 100755 --- a/tests/cond34.test +++ b/tests/cond34.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check for _DEPENDENCIES definition with conditional _LDADD. -# Report from Elena A. Vengerova +# Report from Elena A. Vengerova. . ./defs || Exit 1 diff --git a/tests/condd.test b/tests/condd.test index b0cf6f027..4c31f300e 100755 --- a/tests/condd.test +++ b/tests/condd.test @@ -38,7 +38,7 @@ if COND1 SUBDIRS += bar endif -# Small example from the manual +# Small example from the manual. bin_PROGRAMS = hello hello_SOURCES = hello-common.c if COND1 diff --git a/tests/condlib.test b/tests/condlib.test index 390de753f..6051d9c03 100755 --- a/tests/condlib.test +++ b/tests/condlib.test @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test for bug with conditional library. -# From Harlan Stenn +# From Harlan Stenn. . ./defs || Exit 1 diff --git a/tests/confh5.test b/tests/confh5.test index f823af1f8..d13ff1553 100755 --- a/tests/confh5.test +++ b/tests/confh5.test @@ -31,7 +31,7 @@ cat > Makefile.am << 'END' test: distdir test -f $(distdir)/config.h.in test -f $(distdir)/include/config.h.in.in - : # Solaris Sh does not support 'test -e' + : # Solaris Sh does not support 'test -e'. test ! -f $(distdir)/include/config.h.in test ! -r $(distdir)/include/config.h.in END @@ -50,7 +50,7 @@ $MAKE $sleep echo '#undef @FOO@' > include/config.h.in.in $MAKE include/config.h -# Don't try to be too strict in this grepping, since the substutition +# Don't try to be too strict in this grepping, since the substitution # is done by config.status, and we don't have too much control on it. grep '/\*.*#undef.*NameToBeGrepped' include/config.h $MAKE test diff --git a/tests/conflnk3.test b/tests/conflnk3.test index 78086077b..1755170c5 100755 --- a/tests/conflnk3.test +++ b/tests/conflnk3.test @@ -28,7 +28,7 @@ test: distdir test ! -r $(distdir)/dest3 test ! -r $(distdir)/dest2 test -f $(distdir)/src2 -## src3 cannot be distributed, Automake knows nothing about it +## src3 cannot be distributed, Automake knows nothing about it. test ! -r $(distdir)/sdir/src3 test ! -r $(distdir)/src3 END @@ -45,7 +45,7 @@ my_src_dir=sdir my_dest=dest AC_CONFIG_LINKS([sdir/dest2:src2 sdir/dest3:$my_src_dir/src3]) AC_CONFIG_LINKS([$my_dest:src]) -# the following is a link whose source is itself a link +# The following is a link whose source is itself a link. AC_CONFIG_LINKS([dest4:sdir/dest2]) # Some package prefer to compute links. cmplink='dest5:src'; @@ -74,7 +74,7 @@ $MAKE distclean test ! -r sdir/dest2 test ! -r sdir/dest3 test -r dest # Should still exist, Automake knows nothing about it. -test -r dest5 # ditto +test -r dest5 # Ditto. rm -f dest dest5 test ! -r dest4 diff --git a/tests/cygnus-check-without-all.test b/tests/cygnus-check-without-all.test index af15421bf..9cf7ae7b5 100755 --- a/tests/cygnus-check-without-all.test +++ b/tests/cygnus-check-without-all.test @@ -43,7 +43,7 @@ $AUTOCONF $MAKE check test -f check-target-has-run test ! -r all-target-has-failed -# sanity checks +# Sanity checks. $MAKE && Exit 1 test -f all-target-has-failed diff --git a/tests/depcomp.test b/tests/depcomp.test index f4d5acf90..f456c47f0 100755 --- a/tests/depcomp.test +++ b/tests/depcomp.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test to make sure depcomp is installed and found properly -# when required for multiple directories +# when required for multiple directories. . ./defs || Exit 1 @@ -42,7 +42,7 @@ $ACLOCAL $AUTOMAKE --add-missing # There used to be a bug where this was created in the first subdir with C -# sources in it instead of in $top_srcdir or $ac_auxdir +# sources in it instead of in $top_srcdir or $ac_auxdir. test -f depcomp : diff --git a/tests/depcomp3.test b/tests/depcomp3.test index 8a77f0568..058d7e9d3 100755 --- a/tests/depcomp3.test +++ b/tests/depcomp3.test @@ -53,7 +53,7 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -# Sanity check: make sure the cache variable we force is used by configure +# Sanity check: make sure the cache variable we force is used by configure. grep am_cv_CC_dependencies_compiler_type configure ./configure am_cv_CC_dependencies_compiler_type=dashmstdout diff --git a/tests/depcomp4.test b/tests/depcomp4.test index b995c0836..864e9b9fb 100755 --- a/tests/depcomp4.test +++ b/tests/depcomp4.test @@ -46,7 +46,7 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -# Sanity check: make sure the cache variable we force is used by configure +# Sanity check: make sure the cache variable we force is used by configure. grep am_cv_CC_dependencies_compiler_type configure ./configure am_cv_CC_dependencies_compiler_type=makedepend diff --git a/tests/depcomp8a.test b/tests/depcomp8a.test index 5b2030499..2d9e80945 100755 --- a/tests/depcomp8a.test +++ b/tests/depcomp8a.test @@ -46,7 +46,7 @@ END $ACLOCAL $AUTOMAKE -a -grep include Makefile.in # for debugging +grep include Makefile.in # For debugging. grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in grep 'include.*/\./\$(DEPDIR)' Makefile.in && Exit 1 @@ -65,7 +65,7 @@ echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am $ACLOCAL $AUTOMAKE -a -grep include Makefile.in # for debugging +grep include Makefile.in # For debugging. grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in $EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && Exit 1 diff --git a/tests/depcomp8b.test b/tests/depcomp8b.test index 509bcb205..e1e9975c5 100755 --- a/tests/depcomp8b.test +++ b/tests/depcomp8b.test @@ -41,7 +41,7 @@ libtoolize $ACLOCAL $AUTOMAKE -a -grep include Makefile.in # for debugging +grep include Makefile.in # For debugging. grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in grep 'include.*/\./\$(DEPDIR)' Makefile.in && Exit 1 @@ -59,7 +59,7 @@ echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am $ACLOCAL $AUTOMAKE -a -grep include Makefile.in # for debugging +grep include Makefile.in # For debugging. grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in $EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && Exit 1 diff --git a/tests/depend2.test b/tests/depend2.test index 995680426..ec949e349 100755 --- a/tests/depend2.test +++ b/tests/depend2.test @@ -17,7 +17,7 @@ # Test to make sure dependency tracking works with # --disable-dependency-tracking. -# Report from Robert Boehne +# Report from Robert Boehne. required=cc . ./defs || Exit 1 diff --git a/tests/deprecated-acinit.test b/tests/deprecated-acinit.test index a25d32cef..7908bb62d 100755 --- a/tests/deprecated-acinit.test +++ b/tests/deprecated-acinit.test @@ -36,7 +36,7 @@ for ac_init in AC_INIT 'AC_INIT([Makefile.am])'; do $am_init_automake AC_CONFIG_FILES([Makefile]) END - cat configure.in # might be useful for debugging + cat configure.in # For debugging. $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; } cat stderr >&2 grep "^configure\\.in:.* $errmsg" stderr diff --git a/tests/dirlist.test b/tests/dirlist.test index 89183c6be..f6aa57ee7 100755 --- a/tests/dirlist.test +++ b/tests/dirlist.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check dirlist support. -# This test relies on m4/dirlist +# This test relies on m4/dirlist. . ./defs || Exit 1 @@ -42,9 +42,9 @@ EOF $ACLOCAL $AUTOCONF -# there should be no m4_include in aclocal.m4, even tho m4/dirlist contains -# `./dirlist-test' as a relative directory. Only -I directories are subject -# to file inclusion. +# There should be no m4_include in aclocal.m4, even though m4/dirlist +# contains `./dirlist-test' as a relative directory. Only -I directories +# are subject to file inclusion. grep m4_include aclocal.m4 && Exit 1 grep 'GUILE-VERSION' configure diff --git a/tests/dirlist2.test b/tests/dirlist2.test index e7c2c93f1..910c47038 100755 --- a/tests/dirlist2.test +++ b/tests/dirlist2.test @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check dirlist globbing support. -# This test relies on m4/dirlist +# This test relies on m4/dirlist. . ./defs || Exit 1 @@ -45,9 +45,9 @@ END $ACLOCAL $AUTOCONF -# there should be no m4_include in aclocal.m4, even tho m4/dirlist contains -# `./dirlist-test' as a relative directory. Only -I directories are subject -# to file inclusion. +# There should be no m4_include in aclocal.m4, even though m4/dirlist +# contains `./dirlist-test' as a relative directory. Only -I directories +# are subject to file inclusion. grep m4_include aclocal.m4 && Exit 1 grep 'GUILE-VERSION' configure diff --git a/tests/distcom2.test b/tests/distcom2.test index e093e069e..dc1365fdf 100755 --- a/tests/distcom2.test +++ b/tests/distcom2.test @@ -61,7 +61,7 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { n }' -e 's/$/ /' -e '/^DIST_COMMON =/p' Makefile.in > dc.txt -cat dc.txt # might be useful for debugging +cat dc.txt # For debugging. $FGREP ' compile ' dc.txt $FGREP ' depcomp ' dc.txt diff --git a/tests/distcom3.test b/tests/distcom3.test index fc0c5e24e..5cb5e8425 100755 --- a/tests/distcom3.test +++ b/tests/distcom3.test @@ -25,7 +25,7 @@ README: echo 'I bet you are reading me.' > README END -# Files required by --gnu +# Files required by `--gnu'. : > NEWS : > AUTHORS : > ChangeLog diff --git a/tests/distcom4.test b/tests/distcom4.test index 1cbc78337..7eda400b7 100755 --- a/tests/distcom4.test +++ b/tests/distcom4.test @@ -67,7 +67,7 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { n }' -e '/^DIST_COMMON =/ p' Makefile.in > dc.txt -cat dc.txt # might be useful for debugging +cat dc.txt # For debugging. test 1 = `grep tests dc.txt | wc -l` grep configure dc.txt diff --git a/tests/distcom5.test b/tests/distcom5.test index 974ab75f7..2e4591353 100755 --- a/tests/distcom5.test +++ b/tests/distcom5.test @@ -74,7 +74,7 @@ $MAKE test extract_distcommon Makefile.in > top.txt extract_distcommon tests/Makefile.in > inner.txt -# might be useful for debugging +# Might be useful for debugging. cat top.txt cat inner.txt diff --git a/tests/distcom6.test b/tests/distcom6.test index fd7f0abbc..d3f501de2 100755 --- a/tests/distcom6.test +++ b/tests/distcom6.test @@ -63,7 +63,7 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { n }' -e 's/$/ /' -e '/^DIST_COMMON =/p' Makefile.in > dc.txt -cat dc.txt # might be useful for debugging +cat dc.txt # For debugging. $FGREP ' compile ' dc.txt $FGREP ' depcomp ' dc.txt diff --git a/tests/distlinks.test b/tests/distlinks.test index 0f68bee1c..55cdc449b 100755 --- a/tests/distlinks.test +++ b/tests/distlinks.test @@ -42,7 +42,7 @@ cat >> configure.in << 'END' AC_OUTPUT END -echo "me = $me" > Makefile.am # for better failure messages +echo "me = $me" > Makefile.am # For better failure messages. cat >> Makefile.am << 'END' EXTRA_DIST = lnk B/bbb bar1 bar2 bar3 quux .PHONY: test diff --git a/tests/distlinksbrk.test b/tests/distlinksbrk.test index ac0dc28c3..41cc499cc 100755 --- a/tests/distlinksbrk.test +++ b/tests/distlinksbrk.test @@ -51,7 +51,7 @@ END $ACLOCAL $AUTOCONF -ls -l # for debugging +ls -l # For debugging. # Don't try to use "make -k", because some botched make implementations # (HP-UX, IRIX) might still exit on the first error in this situations. diff --git a/tests/distname.test b/tests/distname.test index d090fe9a0..c92f70d13 100755 --- a/tests/distname.test +++ b/tests/distname.test @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test of names in tar file. -# From Rainer Orth +# From Rainer Orth. required=cc . ./defs || Exit 1 diff --git a/tests/dmalloc.test b/tests/dmalloc.test index 38716164f..4665f9c42 100755 --- a/tests/dmalloc.test +++ b/tests/dmalloc.test @@ -44,15 +44,15 @@ $AUTOMAKE $AUTOCONF ./configure -cat config.h # debug info +cat config.h # For debugging. grep '^ */\* *# *undef *WITH_DMALLOC *\*/ *$' config.h ./configure --without-dmalloc -cat config.h # debug info +cat config.h # For debugging. grep '^ */\* *# *undef *WITH_DMALLOC *\*/ *$' config.h ./configure --with-dmalloc -cat config.h # debug info +cat config.h # For debugging. grep '^# *define *WITH_DMALLOC *1 *$' config.h $MAKE check-with-dmalloc diff --git a/tests/else.test b/tests/else.test index 9a881b764..cf1a67f36 100755 --- a/tests/else.test +++ b/tests/else.test @@ -22,10 +22,11 @@ echo 'AM_CONDITIONAL(FOO, true)' >> configure.in cat > Makefile.am << 'END' -# flag to tell us if apache dir is a source distribution +# Flag to tell us if apache dir is a source distribution. APACHE_DIR_IS_SRC = @APACHE_DIR_IS_SRC@ -# we only need to descend into the c dir if we're doing a 1.3 DSO configuration +# We only need to descend into the c dir if we're doing a 1.3 DSO +# configuration. ifeq ("${APACHE_DIR_IS_SRC}","yes") SUBDIRS = java else @@ -35,4 +36,4 @@ END $ACLOCAL AUTOMAKE_fails -grep 'Makefile.am:7:.*else without if' stderr +grep '^Makefile\.am:8:.*else without if' stderr diff --git a/tests/extradep.test b/tests/extradep.test index 7f3478ed3..87408276d 100755 --- a/tests/extradep.test +++ b/tests/extradep.test @@ -70,10 +70,10 @@ $AUTOCONF ./configure cond=yes -# hypotheses: -# EXTRA_*_DEPENDENCIES are honored. -# conditionals and substitutions are honored. -# *_DEPENDENCIES are not overwritten by their EXTRA_* counterparts. +# Hypotheses: +# - EXTRA_*_DEPENDENCIES are honored. +# - Conditionals and substitutions are honored. +# - *_DEPENDENCIES are not overwritten by their EXTRA_* counterparts. : >foodep : >foodep2 diff --git a/tests/extradep2.test b/tests/extradep2.test index 86caa5d28..b059be46a 100755 --- a/tests/extradep2.test +++ b/tests/extradep2.test @@ -62,7 +62,7 @@ $AUTOCONF ./configure -# hypothesis: EXTRA_*_DEPENDENCIES are honored. +# Hypothesis: EXTRA_*_DEPENDENCIES are honored. : >foodep : >foodep2 diff --git a/tests/fort4.test b/tests/fort4.test index fbeaedb07..273ccf41c 100755 --- a/tests/fort4.test +++ b/tests/fort4.test @@ -70,7 +70,7 @@ $AUTOMAKE -a grep '.\$(FCLINK)' Makefile.in && Exit 1 $AUTOCONF -# configure may Exit 77 if no compiler is found, +# ./configure may exit with status 77 if no compiler is found, # or if the compiler cannot compile Fortran 90 files). ./configure $MAKE diff --git a/tests/fort5.test b/tests/fort5.test index de68a6cd5..eb2414a0f 100755 --- a/tests/fort5.test +++ b/tests/fort5.test @@ -84,7 +84,7 @@ grep LT_PREREQ configure && skip_ "libtool is too old (probably < 2.0)" # Ensure we use --tag for f90, too. grep " --tag=FC" Makefile.in -# configure may exit with status 77 if no compiler is found, +# ./configure may exit with status 77 if no compiler is found, # or if the compiler cannot compile Fortran 90 files). ./configure $MAKE diff --git a/tests/gettext.test b/tests/gettext.test index 98c2a4553..d40c8987c 100755 --- a/tests/gettext.test +++ b/tests/gettext.test @@ -51,7 +51,7 @@ mv -f configure.int configure.in $ACLOCAL -# po/ and intl/ are required +# po/ and intl/ are required. AUTOMAKE_fails --add-missing grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr @@ -69,7 +69,7 @@ grep 'AM_GNU_GETTEXT.*po' stderr echo 'SUBDIRS = po intl' >Makefile.am $AUTOMAKE --add-missing -# Make sure distcheck runs ./configure --with-included-gettext +# Make sure distcheck runs `./configure --with-included-gettext'. grep 'with-included-gettext' Makefile.in # `SUBDIRS = po intl' isn't required if po/ doesn't exist. diff --git a/tests/gettext3.test b/tests/gettext3.test index 66a32a8d6..560c01b91 100755 --- a/tests/gettext3.test +++ b/tests/gettext3.test @@ -28,7 +28,7 @@ END echo 'SUBDIRS = po' >Makefile.am mkdir po -# if aclocal fails, assume the gettext macros are too old and do not +# If aclocal fails, assume the gettext macros are too old and do not # define AM_GNU_GETTEXT_INTL_SUBDIR. $ACLOCAL || skip_ "your gettext macros are probably too old" diff --git a/tests/help-maintainer.test b/tests/help-maintainer.test index a4b2d8521..7ddfb61b8 100755 --- a/tests/help-maintainer.test +++ b/tests/help-maintainer.test @@ -24,7 +24,7 @@ AC_INIT([$me], [1.0]) AM_MAINTAINER_MODE END -cat configure.in +cat configure.in # For debugging. $ACLOCAL $AUTOCONF --force ./configure --help >stdout || { cat stdout; Exit 1; } @@ -32,11 +32,11 @@ cat stdout $EGREP '^ *--enable-maintainer-mode( |$)' stdout $FGREP ' enable make rules' stdout -rm -rf autom4te*.cache # just to be sure +rm -rf autom4te*.cache # Just to be sure. sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.in >t mv -f t configure.in -cat configure.in +cat configure.in # For debugging. $ACLOCAL $AUTOCONF --force ./configure --help >stdout || { cat stdout; Exit 1; } @@ -44,11 +44,11 @@ cat stdout $EGREP '^ *--enable-maintainer-mode( |$)' stdout $FGREP ' enable make rules' stdout -rm -rf autom4te*.cache # just to be sure +rm -rf autom4te*.cache # Just to be sure. sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.in >t mv -f t configure.in -cat configure.in +cat configure.in # For debugging. $ACLOCAL $AUTOCONF --force ./configure --help >stdout || { cat stdout; Exit 1; } diff --git a/tests/help3.test b/tests/help3.test index 9d026d080..eddd3e17c 100755 --- a/tests/help3.test +++ b/tests/help3.test @@ -35,7 +35,7 @@ AC_CONFIG_FILES([Makefile]) END cat > Makefile.am <<END -## so that install-sh will be required +# So that install-sh will be required. pkgdata_DATA = END diff --git a/tests/help4.test b/tests/help4.test index 34866880f..906803a74 100755 --- a/tests/help4.test +++ b/tests/help4.test @@ -28,7 +28,7 @@ cd emptydir ACLOCAL=$original_ACLOCAL AUTOMAKE=$original_AUTOMAKE -escape_dots () { sed 's/\./\\./g'; } # avoid issues with `\' in backquotes +escape_dots () { sed 's/\./\\./g'; } # Avoid issues with `\' in backquotes. apiversion_rx=`echo "$APIVERSION" | escape_dots` $ACLOCAL --version --help >stdout || { cat stdout; Exit 1; } diff --git a/tests/init.test b/tests/init.test index 625e8eb50..896bd27af 100755 --- a/tests/init.test +++ b/tests/init.test @@ -26,7 +26,7 @@ for ac_init_args in '' '([x])'; do AC_INIT$ac_init_args AM_INIT_AUTOMAKE$am_init_args END - cat configure.in # might be useful for debugging + cat configure.in # For debugging. # The error message should mention AC_INIT, not AC_PACKAGE_VERSION. ($ACLOCAL && $AUTOCONF) 2>stderr && { cat stderr >&2; Exit 1; } cat stderr >&2 diff --git a/tests/instsh2.test b/tests/instsh2.test index f86c414c2..8cc5f2617 100755 --- a/tests/instsh2.test +++ b/tests/instsh2.test @@ -15,17 +15,17 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Various install-sh checks +# Various install-sh checks. . ./defs || Exit 1 get_shell_script install-sh -# Basic errors +# Basic errors. ./install-sh && Exit 1 ./install-sh -m 644 dest && Exit 1 -# Directories +# Directories. # It should be OK to create no directory. We sometimes need # this when directory are conditionally defined. @@ -39,7 +39,7 @@ test -d d1 test -d d2 test -d d3 test -d d4 -# Subdirectories +# Subdirectories. ./install-sh -d p1/p2/p3 p4//p5//p6// test -d p1/p2/p3 test -d p4/p5/p6 @@ -52,7 +52,7 @@ test -f y ./install-sh -m 644 y z test -f y test -f z -# Multiple files +# Multiple files. ./install-sh -m 644 -c x z d1 test -f x test -f z diff --git a/tests/java-check.test b/tests/java-check.test index ffec9b6d4..86b5f0591 100755 --- a/tests/java-check.test +++ b/tests/java-check.test @@ -53,7 +53,7 @@ echo '}' >> Two.java # "make check" should compile files in $(check_JAVA) ... $MAKE check -ls -l # for debugging +ls -l # For debugging. test -f One.class test -f Two.class # ... but should *not* install them. diff --git a/tests/lex3.test b/tests/lex3.test index dca98ba47..46f0b9f9d 100755 --- a/tests/lex3.test +++ b/tests/lex3.test @@ -81,7 +81,7 @@ $MAKE distcheck test -f foo.c $MAKE distclean test -f foo.c -./configure # we must re-create `Makefile' +./configure # Re-create `Makefile'. $MAKE maintainer-clean test ! -f foo.c diff --git a/tests/lexvpath.test b/tests/lexvpath.test index 2f542568b..106093e2e 100755 --- a/tests/lexvpath.test +++ b/tests/lexvpath.test @@ -73,7 +73,7 @@ mkdir sub cd sub ../configure . ./lexoutroot -test -n "$LEX_OUTPUT_ROOT" # sanity check +test -n "$LEX_OUTPUT_ROOT" # Sanity check. cd .. flex lexer.l diff --git a/tests/lflags.test b/tests/lflags.test index 42e6da0a4..63e1073e7 100755 --- a/tests/lflags.test +++ b/tests/lflags.test @@ -17,7 +17,7 @@ # Check that $(LFLAGS) takes precedence over both $(AM_LFLAGS) and # $(foo_LFLAGS). # Please keep this in sync with the sister tests lflags2.test, yflags.test -# and yflags2.test +# and yflags2.test. required=cc . ./defs || Exit 1 diff --git a/tests/lflags2.test b/tests/lflags2.test index f78de85cc..139c800d4 100755 --- a/tests/lflags2.test +++ b/tests/lflags2.test @@ -17,7 +17,7 @@ # Check that $(LFLAGS) takes precedence over both $(AM_LFLAGS) and # $(foo_LFLAGS). # Please keep this in sync with the sister tests lflags.test, yflags.test -# and yflags2.test +# and yflags2.test. . ./defs || Exit 1 diff --git a/tests/libobj10.test b/tests/libobj10.test index 85b3d8a96..d43cfc339 100755 --- a/tests/libobj10.test +++ b/tests/libobj10.test @@ -45,7 +45,7 @@ $AUTOMAKE ./configure $MAKE -ar t libfoo.a # for debugging +ar t libfoo.a # For debugging. $MAKE distcheck : diff --git a/tests/libobj14.test b/tests/libobj14.test index daeaa2560..41b9ba13b 100755 --- a/tests/libobj14.test +++ b/tests/libobj14.test @@ -17,7 +17,7 @@ # Regression test for an internal error when @LIBOBJS@ is used in # a variable that is not defined in the same conditions as the _LDADD # that uses it. -# Report from Bill Davidson +# Report from Bill Davidson. . ./defs || Exit 1 diff --git a/tests/libobj16a.test b/tests/libobj16a.test index 9b7c6fbdc..5f5bfb7de 100755 --- a/tests/libobj16a.test +++ b/tests/libobj16a.test @@ -24,7 +24,7 @@ mv configure.in configure.proto cat >> configure.proto << 'END' AC_PROG_CC AC_PROG_RANLIB -%LIBOBJ-STUFF% # will be activated later +%LIBOBJ-STUFF% # Will be activated later. AC_OUTPUT END @@ -77,7 +77,7 @@ s/.*// i\ AC_LIBOBJ([maude]) }' configure.proto > configure.in -cat configure.in # for debugging +cat configure.in # For debugging. cat > extra-checks.am << 'END' extra_checks = maude-src maude-dist maude-lib liver-not-dist @@ -117,7 +117,7 @@ else\ fi\ AC_LIBSOURCES([maude.c, liver.c]) }' configure.proto > configure.in -cat configure.in # for debugging +cat configure.in # For debugging. $ACLOCAL $AUTOCONF diff --git a/tests/libobj16b.test b/tests/libobj16b.test index 9f6088358..6738675c5 100755 --- a/tests/libobj16b.test +++ b/tests/libobj16b.test @@ -24,7 +24,7 @@ mv configure.in configure.proto cat >> configure.proto << 'END' AC_PROG_CC AC_PROG_RANLIB -%LIBOBJ-STUFF% # will be activated later +%LIBOBJ-STUFF% # Will be activated later. AC_OUTPUT END @@ -77,7 +77,7 @@ s/.*// i\ AC_LIBOBJ(maude) dnl: do not quote this! }' configure.proto > configure.in -cat configure.in # for debugging +cat configure.in # For debugging. cat > extra-checks.am << 'END' extra_checks = maude-src maude-dist maude-lib liver-not-dist @@ -118,7 +118,7 @@ fi\ AC_LIBSOURCE(maude.c) dnl: do not quote this!\ AC_LIBSOURCE(liver.c) dnl: do not quote this! }' configure.proto > configure.in -cat configure.in # for debugging +cat configure.in # For debugging. $ACLOCAL $AUTOCONF diff --git a/tests/libobj17.test b/tests/libobj17.test index c753f7da6..623c6bc96 100755 --- a/tests/libobj17.test +++ b/tests/libobj17.test @@ -49,7 +49,7 @@ $AUTOCONF ./configure FOO=quux $MAKE -ls -l # for debugging +ls -l # For debugging. test -f libtu.a ar t libtu.a | $FGREP quux ar t libtu.a | $FGREP zardoz && Exit 1 @@ -58,7 +58,7 @@ $MAKE distclean ./configure FOO=zardoz $MAKE -ls -l # for debugging +ls -l # For debugging. test -f libtu.a ar t libtu.a | $FGREP zardoz ar t libtu.a | $FGREP quux && Exit 1 diff --git a/tests/libobj20b.test b/tests/libobj20b.test index d130a8abe..216ba052f 100755 --- a/tests/libobj20b.test +++ b/tests/libobj20b.test @@ -42,13 +42,13 @@ AUTOMAKE_fails grep 'configure\.in:.*required directory.*libobj-dir' stderr mkdir libobj-dir -: > foobar.c # oops, it should be in libobj-dir... +: > foobar.c # Oops, it should be in libobj-dir! AUTOMAKE_fails grep 'configure\.in:.*required file.*libobj-dir/foobar.c.*' stderr rm -f foobar.c : > libobj-dir/foobar.c -$AUTOMAKE # now we should succeed +$AUTOMAKE # Now we should succeed. : diff --git a/tests/libobj20c.test b/tests/libobj20c.test index 1fb1f9d97..91771b0ab 100755 --- a/tests/libobj20c.test +++ b/tests/libobj20c.test @@ -39,13 +39,13 @@ AUTOMAKE_fails grep 'configure\.in:.*required directory.*\./libobj-dir' stderr mkdir libobj-dir -: > foobar.c # oops, it should be in libobj-dir! +: > foobar.c # Oops, it should be in libobj-dir! AUTOMAKE_fails grep 'configure\.in:.*required file.*libobj-dir/foobar.c.*' stderr rm -f foobar.c : > libobj-dir/foobar.c -$AUTOMAKE # now we should succeed +$AUTOMAKE # Now we should succeed. : diff --git a/tests/libtool.test b/tests/libtool.test index e88c2084b..87b55a7c3 100755 --- a/tests/libtool.test +++ b/tests/libtool.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure libtool is removed. -# Report from Kevin Dalley +# Report from Kevin Dalley. required=libtool . ./defs || Exit 1 diff --git a/tests/license.test b/tests/license.test index 0ab7ce78e..3b3942591 100755 --- a/tests/license.test +++ b/tests/license.test @@ -44,7 +44,7 @@ $AUTOMAKE --gnu --add-missing ./configure $MAKE test1 -# rm before echo, because COPYING is likely to be a symlink to +# Use 'rm' before 'echo', because COPYING is likely to be a symlink to # the real COPYING... rm -f COPYING echo 'MY-OWN-LICENSE' >COPYING diff --git a/tests/lzip.test b/tests/lzip.test index 481474343..d413a8348 100755 --- a/tests/lzip.test +++ b/tests/lzip.test @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Check support for no-dist-gzip with lzip +# Check support for no-dist-gzip with lzip. required=lzip . ./defs || Exit 1 diff --git a/tests/lzma.test b/tests/lzma.test index 97908d2fd..4262ceb45 100755 --- a/tests/lzma.test +++ b/tests/lzma.test @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Check support for no-dist-gzip with lzma +# Check support for no-dist-gzip with lzma. required=lzma . ./defs || Exit 1 diff --git a/tests/man4.test b/tests/man4.test index 74acb3366..9052511bd 100755 --- a/tests/man4.test +++ b/tests/man4.test @@ -63,7 +63,7 @@ chmod +x foo bar mkdir bin cat > bin/help2man <<'END' #! /bin/sh -# fake help2man script that lets `missing' think it is not installed +# Fake help2man script that lets `missing' think it is not installed. exit 127 END chmod +x bin/help2man diff --git a/tests/man6.test b/tests/man6.test index 42a0f9af1..be9618899 100755 --- a/tests/man6.test +++ b/tests/man6.test @@ -60,7 +60,7 @@ mkdir build cd build ../configure -# sanity check +# Sanity check. grep '^HELP2MAN *=.*/missing --run help2man' Makefile $MAKE @@ -76,10 +76,10 @@ $FGREP zardoz $me-1.0/zardoz.1 $MAKE distcheck cd .. -rm -f *.1 # remove leftover generated manpages +rm -f *.1 # Remove leftover generated manpages. ./configure -# sanity check +# Sanity check. grep '^HELP2MAN *=.*/missing --run help2man' Makefile $MAKE diff --git a/tests/man8.test b/tests/man8.test index 91d6cacc8..2257627ea 100755 --- a/tests/man8.test +++ b/tests/man8.test @@ -21,7 +21,7 @@ cat > Makefile.am << 'END' dist_man_MANS = foo.1 foo.1: -## this 'rm' command will fail if $(srcdir) is unwritable +## This 'rm' command will fail if $(srcdir) is unwritable. rm -f $(srcdir)/$@ : > $(srcdir)/$@ END diff --git a/tests/mdate4.test b/tests/mdate4.test index c1052a3d2..dcac0fc9f 100755 --- a/tests/mdate4.test +++ b/tests/mdate4.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test to make sure that mdate-sh is added to the right directory. -# Report from Kevin Dalley +# Report from Kevin Dalley. . ./defs || Exit 1 diff --git a/tests/missing5.test b/tests/missing5.test index 462aeb03d..1cd491806 100755 --- a/tests/missing5.test +++ b/tests/missing5.test @@ -14,14 +14,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# test how well `missing' finds output file names of various tools. +# Test how well `missing' finds output file names of various tools. # PR automake/483. . ./defs || Exit 1 get_shell_script missing -# these programs may be invoked by `missing' +# These programs may be invoked by `missing'. needed_tools='chmod find sed test touch' needed_tools_csep=`echo $needed_tools | sed 's/ /, /g'` diff --git a/tests/mmodely.test b/tests/mmodely.test index f232058b2..4457bb09f 100755 --- a/tests/mmodely.test +++ b/tests/mmodely.test @@ -38,7 +38,8 @@ zardoz_SOURCES = zardoz.y joe.l LDADD = @LEXLIB@ END -# The point of this test is that it is not dependent on a working lex or yacc. +# The point of this test is that it is not dependent on a working lex +# or yacc. cat > joe.c <<EOF int joe (int arg) { @@ -83,7 +84,7 @@ END chmod +x myyacc.sh mylex.sh PATH="`pwd`$PATH_SEPARATOR$PATH" -# make maintainer-clean; ./configure; make should always work, +# "make maintainer-clean; ./configure; make" should always work, # per GNU Standard. $MAKE maintainer-clean ./configure diff --git a/tests/nobase-python.test b/tests/nobase-python.test index c869b85ad..3974ca5c5 100755 --- a/tests/nobase-python.test +++ b/tests/nobase-python.test @@ -30,7 +30,7 @@ my_PYTHON = one.py sub/base.py nobase_my_PYTHON = two.py sub/nobase.py test-install-data: install-data - find inst -print; : for debugging + find inst -print; : For debugging. test -f inst/my/one.py test -f inst/my/one.pyc test -f inst/my/two.py diff --git a/tests/notrans.test b/tests/notrans.test index f791384d6..ce38926f0 100755 --- a/tests/notrans.test +++ b/tests/notrans.test @@ -37,7 +37,7 @@ notrans_man3_MANS = z-foo.man z-foo2.man notrans_dist_man2_MANS = z-bar.man z-bar2.man notrans_nodist_man1_MANS = z-baz.man z-baz2.man -# These two are ignored +# These two are ignored. dist_notrans_man_MANS = nosuch.8 nodist_notrans_man9_MANS = nosuch.man diff --git a/tests/obsolete.test b/tests/obsolete.test index 943df6f87..8a247d839 100755 --- a/tests/obsolete.test +++ b/tests/obsolete.test @@ -32,12 +32,12 @@ $PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \ cat obs >> configure.in $PERL -ne 'chomp; print "grep $_ output || Exit 1\n"; ' obs > obs.1 $PERL -ne 'chomp; print "grep $_ configure.in && Exit 1\n"; ' obs > obs.2 -echo : >> obs.1 # since it will be sourced, it must and with a success -echo : >> obs.2 # ditto +echo : >> obs.1 # Since it will be sourced, it must end with a success. +echo : >> obs.2 # Likewise. -cat configure.in # for debugging -cat obs.1 # ditto -cat obs.2 # ditto +cat configure.in # For debugging. +cat obs.1 # Likewise. +cat obs.2 # Likewise. # Sanity check. Make sure we have added something to configure.in. test `wc -l <configure.in` -gt 1 diff --git a/tests/output6.test b/tests/output6.test index e28391933..898697d78 100755 --- a/tests/output6.test +++ b/tests/output6.test @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Check for support for colon separated input files in AC_CONFIG_FILES +# Check for support for colon-separated input files in AC_CONFIG_FILES. . ./defs || Exit 1 diff --git a/tests/override-suggest-local.test b/tests/override-suggest-local.test index 6639ee5ba..535ccd081 100755 --- a/tests/override-suggest-local.test +++ b/tests/override-suggest-local.test @@ -33,7 +33,8 @@ END $ACLOCAL $AUTOMAKE -Wno-override AUTOMAKE_fails -grep ':.*install-local' stderr && Exit 1 # There is no such thing as install-local +# There is no such thing as `install-local'. +grep ':.*install-local' stderr && Exit 1 grep ':.*installcheck-local' stderr grep ':.*html-local' stderr # Make sure overriding *-am targets suggest using *-local, not *-am. diff --git a/tests/parallel-am2.test b/tests/parallel-am2.test index 16b089fc9..b51bd1fd9 100755 --- a/tests/parallel-am2.test +++ b/tests/parallel-am2.test @@ -18,7 +18,7 @@ # This tests: # 4) warning and normal error output should be identical, in that duplicate -# warnings should be omitted in the same way as without threads, +# warnings should be omitted in the same way as without threads. required=perl-threads . ./defs || Exit 1 diff --git a/tests/parallel-am3.test b/tests/parallel-am3.test index 9918edff1..6db3ca7e3 100755 --- a/tests/parallel-am3.test +++ b/tests/parallel-am3.test @@ -19,7 +19,7 @@ # This tests: # 3) normal automake output should be identical and ordered in the same way # with --add-missing, even with concurrent file requirements, and the -# installation of aux files should be race-free, +# installation of aux files should be race-free. required=perl-threads . ./defs || Exit 1 diff --git a/tests/parallel-tests-ext-driver.test b/tests/parallel-tests-ext-driver.test index b53ccdb53..44d760658 100755 --- a/tests/parallel-tests-ext-driver.test +++ b/tests/parallel-tests-ext-driver.test @@ -17,7 +17,7 @@ # Check parallel-tests features: # - per-extension test drivers (xxx_LOG_COMPILER and xxx_LOG_FLAGS), # also with AC_SUBST'd stuff. -# See also related test 'parallel-tests-ext-driver-prog.test' +# See also related test 'parallel-tests-ext-driver-prog.test'. parallel_tests=yes . ./defs || Exit 1 @@ -50,7 +50,7 @@ AM_T_LOG_FLAGS = --am-t AM_LOG_FLAGS = -a LOG_FLAGS = -b -# t-driver is deliberately not distributed; it should be available +# `t-driver' is deliberately not distributed; it should be available # in PATH also from "make distcheck". EXTRA_DIST = $(TESTS) chk-driver test-driver noext-driver END @@ -127,7 +127,7 @@ cat test-suite.log cat bla.log # With the above flag overridden, bla.t should fail ... $EGREP '(^ *|/)t-driver:.* invalid .*--bad' bla.log -# ... but no oher test should. +# ... but no other test should. grep -v '^FAIL: bla\.t ' bla.log | grep 'FAIL:' && Exit 1 # Try also with a VPATH build. diff --git a/tests/posixsubst-ldadd.test b/tests/posixsubst-ldadd.test index 9d6cc2dc5..5d3072bde 100755 --- a/tests/posixsubst-ldadd.test +++ b/tests/posixsubst-ldadd.test @@ -43,7 +43,7 @@ bar_LDADD = $(v:=.a) libquux2.a $(w:none=libquux3.a) libquux1.c: echo 'int quux1(void) { return 0; }' > $@ -CLEANFILES = libquux1.c # for FreeBSD make +CLEANFILES = libquux1.c # For FreeBSD make. END cat > foo.c <<'END' diff --git a/tests/posixsubst-libraries.test b/tests/posixsubst-libraries.test index 00283090e..3565caf69 100755 --- a/tests/posixsubst-libraries.test +++ b/tests/posixsubst-libraries.test @@ -37,7 +37,7 @@ lib_LIBRARIES = $(foolibs:=.a) $(barlibs:z=r.a) libbar.c: echo 'int bar(void) { return 0; }' > $@ -CLEANFILES = libbar.c # for FreeBSD make +CLEANFILES = libbar.c # For FreeBSD make. installcheck-local: ls -l $(prefix)/lib diff --git a/tests/posixsubst-ltlibraries.test b/tests/posixsubst-ltlibraries.test index b601672cf..d4f6f7456 100755 --- a/tests/posixsubst-ltlibraries.test +++ b/tests/posixsubst-ltlibraries.test @@ -37,7 +37,7 @@ lib_LTLIBRARIES = $(foolibs:=.la) $(barlibs:z=r.la) libbar.c: echo 'int bar(void) { return 0; }' > $@ -CLEANFILES = libbar.c # for FreeBSD make +CLEANFILES = libbar.c # For FreeBSD make. installcheck-local: ls -l $(prefix)/lib diff --git a/tests/posixsubst-sources.test b/tests/posixsubst-sources.test index 36bdd2a8e..557428e02 100755 --- a/tests/posixsubst-sources.test +++ b/tests/posixsubst-sources.test @@ -41,7 +41,7 @@ nodist_foo_SOURCES = $(BAZ:=c) bar.c baz.c: echo 'int $@ (void) { return 0; }' | sed 's/\.c //' > $@ CLEANFILES = baz.c -CLEANFILES += bar.c # for FreeBSD make +CLEANFILES += bar.c # For FreeBSD make. .PHONY: test test2 check-local: test1 test2 diff --git a/tests/posixsubst-tests.test b/tests/posixsubst-tests.test index 26ae69fa5..ea9a21aa0 100755 --- a/tests/posixsubst-tests.test +++ b/tests/posixsubst-tests.test @@ -30,7 +30,7 @@ t3 = bar2 foo2.test barz: (echo '#!/bin/sh' && echo 'exit 0') > $@ && chmod a+x $@ -CLEANFILES = foo2.test barz # for FreeBSD make +CLEANFILES = foo2.test barz # For FreeBSD make. # Also try an empty match suffix, to ensure that the `:=' in there is # not confused by the parser with an unportable assignment operator. diff --git a/tests/pr307.test b/tests/pr307.test index ea2515171..9db74c0e4 100755 --- a/tests/pr307.test +++ b/tests/pr307.test @@ -69,7 +69,7 @@ $AUTOCONF $AUTOMAKE -a # Sanity check: make sure the variable we are attempting to force -# is used by configure +# is indeed used by configure. grep am_cv_CC_dependencies_compiler_type configure ./configure am_cv_CC_dependencies_compiler_type=dashmstdout @@ -79,14 +79,14 @@ test -f librace.la && Exit 1 $MAKE check # The failure we check usually occurs during the above build, -# with an output such as +# with an output such as: # -# mv -f .libs/f.lo f.lo -# mv: cannot stat `.libs/f.lo': No such file or directory +# mv -f .libs/f.lo f.lo +# mv: cannot stat `.libs/f.lo': No such file or directory # # (This may happen on `f' or on some other files.) test -f librace.la -test -f tst # a proof that check-local was run +test -f tst # A proof that check-local was run. : diff --git a/tests/pr401c.test b/tests/pr401c.test index 0ab785ec1..3db12ee48 100755 --- a/tests/pr401c.test +++ b/tests/pr401c.test @@ -47,7 +47,7 @@ int main (void) EOF cat >>configure.in << 'EOF' -## These lines are activated for later tests +## These lines are activated for later tests. #: AC_CONFIG_LIBOBJ_DIR([lib]) AC_PROG_CC #x AM_PROG_CC_C_O @@ -132,7 +132,7 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LIBRARIES = libfeep.a libfeep_a_SOURCES = -libfeep_a_LIBADD = $(ALLOCA) $(LIBOBJS) # Add LIBOBJS for fun +libfeep_a_LIBADD = $(ALLOCA) $(LIBOBJS) # Add LIBOBJS for fun. check_PROGRAMS = main main_LDADD = libfeep.a diff --git a/tests/pr9.test b/tests/pr9.test index 71a535ab2..f8fa7acb7 100755 --- a/tests/pr9.test +++ b/tests/pr9.test @@ -51,9 +51,9 @@ gzip -d $distdir.tar.gz tar tf $distdir.tar | $FGREP support tar xf $distdir.tar -ls -l . $distdir # for debugging +ls -l . $distdir # For debugging. test -d $distdir/support -ls -l $distdir/support # for debugging +ls -l $distdir/support # For debugging. test -f $distdir/support/install-sh : diff --git a/tests/python11.test b/tests/python11.test index 298176468..604f3eb68 100755 --- a/tests/python11.test +++ b/tests/python11.test @@ -45,7 +45,7 @@ sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.in >configure.int mv -f configure.int configure.in $ACLOCAL --force $AUTOCONF --force -# This one should define PYTHON as : and exit successfully +# This one should define PYTHON as `:' and exit successfully. ./configure # Any user setting should be used. diff --git a/tests/python12.test b/tests/python12.test index 84d3cd325..1ff9b4a13 100755 --- a/tests/python12.test +++ b/tests/python12.test @@ -44,12 +44,12 @@ cd build ../configure --prefix="/usr" DESTDIR=$instdir $MAKE -e install -# Perfunctory test that the files were created +# Perfunctory test that the files were created. test -f "$instdir/usr/share/my/my.py" test -f "$instdir/usr/share/my/my.pyc" test -f "$instdir/usr/share/my/my.pyo" -# If DESTDIR has made it into the byte compiled files, fail the test +# If DESTDIR has made it into the byte compiled files, fail the test. $FGREP "$instdir" "$instdir/usr/share/my/my.pyo" \ "$instdir/usr/share/my/my.pyc" && Exit 1 diff --git a/tests/remake-gnulib-add-acsubst.test b/tests/remake-gnulib-add-acsubst.test index 6b3549fea..5bfa6e411 100755 --- a/tests/remake-gnulib-add-acsubst.test +++ b/tests/remake-gnulib-add-acsubst.test @@ -38,7 +38,7 @@ BUILT_SOURCES = foo.h edit_h = sed -e 's|[@]foovar@|@foovar@|g' foo.h: foo.in.h $(edit_h) < $(srcdir)/foo.in.h > $@-t - cat $@-t;: for debugging + cat $@-t;: For debugging. mv -f $@-t $@ EXTRA_DIST = foo.in.h MOSTLYCLEANFILES = foo.h foo.h-t diff --git a/tests/remake-subdir.test b/tests/remake-subdir.test index 2df1e6f48..b4cd6562c 100755 --- a/tests/remake-subdir.test +++ b/tests/remake-subdir.test @@ -17,7 +17,7 @@ # Check that remake rules works from subdirectories, even with non-GNU # make implementations. # See also the other similar tests `remake-subdir*.test', and the -# related test `aclocal5.test' +# related test `aclocal5.test'. . ./defs || Exit 1 diff --git a/tests/remake-subdir2.test b/tests/remake-subdir2.test index a8f755693..a70b5f9a9 100755 --- a/tests/remake-subdir2.test +++ b/tests/remake-subdir2.test @@ -17,7 +17,7 @@ # Check that remake rules works from subdirectories, even when makefiles # are not named "Makefile". # See also the other similar tests `remake-subdir*.test', and the -# related test `aclocal5.test' +# related test `aclocal5.test'. . ./defs || Exit 1 diff --git a/tests/remake10a.test b/tests/remake10a.test index 78b15b0e1..0521860be 100755 --- a/tests/remake10a.test +++ b/tests/remake10a.test @@ -48,7 +48,7 @@ END echo 'm4_define([my_fingerprint], [BadBadBad])' > foo.m4 -$sleep # so that generated autotools files will be newer than prerequisites +$sleep # So that generated autotools files will be newer than prerequisites. $ACLOCAL $AUTOCONF $AUTOMAKE @@ -64,18 +64,18 @@ for vpath in : false; do fi $top_srcdir/configure - $MAKE # should be no-op + $MAKE # Should be a no-op. $sleep echo "m4_define([my_fingerprint], [$magic1])" > $top_srcdir/foo.m4 $remake - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile $sleep echo "m4_define([my_fingerprint], [$magic2])" > $top_srcdir/foo.m4 $remake - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile && Exit 1 $FGREP $magic2 Makefile @@ -83,7 +83,7 @@ for vpath in : false; do echo "m4_include([bar.m4])" > $top_srcdir/foo.m4 echo "m4_define([my_fingerprint], [$magic3])" > $top_srcdir/bar.m4 $remake - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile && Exit 1 $FGREP $magic2 Makefile && Exit 1 $FGREP $magic3 Makefile @@ -99,9 +99,9 @@ for vpath in : false; do echo "m4_define([my_fingerprint], [DummyValue])" > $top_srcdir/foo.m4 using_gmake || $remake $MAKE distcheck - $FGREP $magic1 Makefile && Exit 1 # sanity check - $FGREP $magic2 Makefile && Exit 1 # likewise - $FGREP $magic3 Makefile && Exit 1 # likewise + $FGREP $magic1 Makefile && Exit 1 # Sanity check. + $FGREP $magic2 Makefile && Exit 1 # Likewise. + $FGREP $magic3 Makefile && Exit 1 # Likewise. $MAKE distclean diff --git a/tests/remake10b.test b/tests/remake10b.test index 2c193cd20..8637c4bbb 100755 --- a/tests/remake10b.test +++ b/tests/remake10b.test @@ -47,7 +47,7 @@ END echo 'FINGERPRINT = BadBadBad' > foo.am -$sleep # so that generated autotools files will be newer than prerequisites +$sleep # So that generated autotools files will be newer than prerequisites. $ACLOCAL $AUTOCONF $AUTOMAKE @@ -63,18 +63,18 @@ for vpath in : false; do fi $top_srcdir/configure - $MAKE # should be no-op + $MAKE # Should be a no-op. $sleep echo "FINGERPRINT = $magic1" > $top_srcdir/foo.am $remake - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile $sleep echo "FINGERPRINT = $magic2" > $top_srcdir/foo.am $remake - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile && Exit 1 $FGREP $magic2 Makefile @@ -82,7 +82,7 @@ for vpath in : false; do echo 'include $(top_srcdir)/bar.am' > $top_srcdir/foo.am echo "FINGERPRINT = $magic3" > $top_srcdir/bar.am $remake - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile && Exit 1 $FGREP $magic2 Makefile && Exit 1 $FGREP $magic3 Makefile @@ -98,9 +98,9 @@ for vpath in : false; do echo "FINGERPRINT = DummyValue" > $top_srcdir/foo.am using_gmake || $remake $MAKE distcheck - $FGREP $magic1 Makefile && Exit 1 # sanity check - $FGREP $magic2 Makefile && Exit 1 # likewise - $FGREP $magic3 Makefile && Exit 1 # likewise + $FGREP $magic1 Makefile && Exit 1 # Sanity check. + $FGREP $magic2 Makefile && Exit 1 # Likewise. + $FGREP $magic3 Makefile && Exit 1 # Likewise. $MAKE distclean diff --git a/tests/remake10c.test b/tests/remake10c.test index d20c1e8a3..2e062a118 100755 --- a/tests/remake10c.test +++ b/tests/remake10c.test @@ -50,7 +50,7 @@ END mkdir m4 echo 'AC_DEFUN([my_fingerprint], [BadBadBad])' > m4/foo.m4 -$sleep # so that generated autotools files will be newer than prerequisites +$sleep # So that generated autotools files will be newer than prerequisites. $ACLOCAL -I m4 $AUTOCONF $AUTOMAKE @@ -66,18 +66,18 @@ for vpath in : false; do fi $top_srcdir/configure - $MAKE # should be no-op + $MAKE # Should be a no-op. $sleep echo "AC_DEFUN([my_fingerprint], [$magic1])" > $top_srcdir/m4/foo.m4 $remake - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile $sleep echo "AC_DEFUN([my_fingerprint], [$magic2])" > $top_srcdir/m4/foo.m4 $remake - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile && Exit 1 $FGREP $magic2 Makefile @@ -85,7 +85,7 @@ for vpath in : false; do echo "m4_include([m4/bar.m4])" > $top_srcdir/m4/foo.m4 echo "AC_DEFUN([my_fingerprint], [$magic3])" > $top_srcdir/m4/bar.m4 $remake - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile && Exit 1 $FGREP $magic2 Makefile && Exit 1 $FGREP $magic3 Makefile @@ -102,9 +102,9 @@ for vpath in : false; do echo "AC_DEFUN([AM_UNUSED], [NoSuchMacro])" > $top_srcdir/m4/bar.m4 using_gmake || $remake $MAKE distcheck - $FGREP $magic1 Makefile && Exit 1 # sanity check - $FGREP $magic2 Makefile && Exit 1 # likewise - $FGREP $magic3 Makefile && Exit 1 # likewise + $FGREP $magic1 Makefile && Exit 1 # Sanity check. + $FGREP $magic2 Makefile && Exit 1 # Likewise. + $FGREP $magic3 Makefile && Exit 1 # Likewise. $MAKE distclean diff --git a/tests/remake11.test b/tests/remake11.test index 493fcf319..b00e56212 100755 --- a/tests/remake11.test +++ b/tests/remake11.test @@ -51,7 +51,7 @@ makefiles_list=`echo "$makefiles_am_list" | sed 's/\.am$//'` bar_in_list=`find . -name bar.in | LC_ALL=C sort` bar_list=`echo "$bar_in_list" | sed 's/\.in$//'` -cat configure.in # useful for debugging +cat configure.in # For debugging. $ACLOCAL $AUTOMAKE diff --git a/tests/remake12.test b/tests/remake12.test index d6c1ef20f..883fe712f 100755 --- a/tests/remake12.test +++ b/tests/remake12.test @@ -68,11 +68,11 @@ if using_gmake; then else $MAKE Makefile fi -grep '^#H:' zardoz.in # for debugging +grep '^#H:' zardoz.in # For debugging. $FGREP $magic1 zardoz $FGREP $magic1 zardoz.in $MAKE distcheck -$MAKE distclean # this shouldn't remove Makefile +$MAKE distclean # This shouldn't remove Makefile. ls -l test -f Makefile @@ -81,33 +81,33 @@ test -f Makefile $sleep sed "s/%MAGIC3%/$magic3/" >> Makefile <<'END' my-check: - ls -l . $(srcdir) ;: for debugging + ls -l . $(srcdir) ;: For debugging. test -f $(srcdir)/quux.am test -f $(srcdir)/quux.in test -f $(srcdir)/bot.in test -f $(srcdir)/top.in test ! -r $(srcdir)/zardoz.am test ! -r $(srcdir)/zardoz.in - grep FOO zardoz ;: for debugging + grep FOO zardoz ;: For debugging. test x'$(FOO)' = x'%MAGIC3%' test: - ls -l ;: for debugging + ls -l ;: For debugging. test x'$(FOO)' = x'dummy' .PHONY: test my-check END sed "s/^#H:.*/#H: $magic2/" zardoz.am > t cat >> t <<'END' -# used by "make distcheck" below +# Used by "make distcheck" below. check-local: my-check END mv -f t zardoz.am -cat zardoz.am # for debugging +cat zardoz.am # For debugging. if using_gmake; then $MAKE nil else $MAKE zardoz fi -$FGREP my-check zardoz # sanity check +$FGREP my-check zardoz # Sanity check. $FGREP $magic1 zardoz zardoz.in && Exit 1 $FGREP $magic2 zardoz $FGREP $magic2 zardoz.in @@ -118,24 +118,24 @@ $sleep sed 's/^\(AC_CONFIG_FILES\)(.*/\1([zardoz:top.in:quux.in:bot.in])/' \ <configure.in >t mv -f t configure.in -cat configure.in # for debugging +cat configure.in # For debugging. sed '/^#H:/d' zardoz.am > quux.am echo 'FOO = dummy' >> quux.am echo 'BAR = $(BAZ)' > top.in echo "BAZ = $magic3" > bot.in is_gmake || $MAKE zardoz $MAKE test -$FGREP my-check zardoz # sanity check +$FGREP my-check zardoz # Sanity check. $FGREP $magic3 quux.in && Exit 1 $FGREP $magic3 zardoz $FGREP $magic1 zardoz && Exit 1 $FGREP $magic2 zardoz && Exit 1 # After the remake above, the files `zardoz.am' and `zardoz.in' -# should be no more needed -echo 'endif' > zardoz.am # put in syntax error +# should be no more needed. +echo 'endif' > zardoz.am # Put in a syntax error. is_gmake || $MAKE zardoz $MAKE test -rm -f zardoz.in zardoz.am # get rid of them +rm -f zardoz.in zardoz.am # Get rid of them. is_gmake || $MAKE zardoz $MAKE test diff --git a/tests/remake1a.test b/tests/remake1a.test index fc5ba6d07..c55ffb606 100755 --- a/tests/remake1a.test +++ b/tests/remake1a.test @@ -39,7 +39,7 @@ $AUTOMAKE # Rebuild rules should work even if there is no top-level # makefiles, if we are careful enough to trigger them only -# in proper subdirs +# in proper subdirs. $sleep echo "# $fingerprint" > sub/Makefile.am cd sub diff --git a/tests/remake3a.test b/tests/remake3a.test index 38a3f401f..33b917458 100755 --- a/tests/remake3a.test +++ b/tests/remake3a.test @@ -50,7 +50,7 @@ grep '#GrepMe#' sub/foo cd .. # Now try an in-tree build. -: > sub/foo.in # restore its original (empty) content +: > sub/foo.in # Restore its original (empty) content. ./configure $sleep test -f sub/foo @@ -67,7 +67,7 @@ check-local: grep '%GrepMe%' sub/foo END $MAKE -grep "grep '%GrepMe%' sub/foo" Makefile.in # sanity check +grep "grep '%GrepMe%' sub/foo" Makefile.in # Sanity check. $MAKE distcheck : diff --git a/tests/remake8a.test b/tests/remake8a.test index 10a6c5a4b..d1c3d76f7 100755 --- a/tests/remake8a.test +++ b/tests/remake8a.test @@ -43,7 +43,7 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -srcdir='.' # to make syncing with remake8b.test easier. +srcdir='.' # To make syncing with remake8b.test easier. $srcdir/configure @@ -125,8 +125,8 @@ check-local: test x'$(QUUX)' = x'%Foo%' END -$MAKE # this should place aclocal flags in Makefile -grep '.*-I m4' Makefile # sanity check +$MAKE # This should place aclocal flags in Makefile. +grep '.*-I m4' Makefile # Sanity check. # Modify configure.in and aclocal.m4. diff --git a/tests/remake8b.test b/tests/remake8b.test index 461940ce1..8c11a15b8 100755 --- a/tests/remake8b.test +++ b/tests/remake8b.test @@ -45,7 +45,7 @@ $AUTOMAKE mkdir build cd build -srcdir='..' # to make syncing with remake8a.test easier. +srcdir='..' # To make syncing with remake8a.test easier. $srcdir/configure @@ -127,8 +127,8 @@ check-local: test x'$(QUUX)' = x'%Foo%' END -$MAKE # this should place aclocal flags in Makefile -grep '.*-I m4' Makefile # sanity check +$MAKE # This should place aclocal flags in Makefile. +grep '.*-I m4' Makefile # Sanity check. # Modify configure.in and aclocal.m4. diff --git a/tests/remake9a.test b/tests/remake9a.test index 9139b461e..026eac845 100755 --- a/tests/remake9a.test +++ b/tests/remake9a.test @@ -55,9 +55,9 @@ cat > foo.in <<END echo '@FINGERPRINT@' END -echo cat > tweak-configure-in # no-op by default +echo cat > tweak-configure-in # It is a no-op by default. -$sleep # so that generated autotools files will be newer than prerequisites +$sleep # So that generated autotools files will be newer than prerequisites. $ACLOCAL $AUTOCONF $AUTOMAKE @@ -73,13 +73,13 @@ for vpath in : false; do fi $srcdir/configure - $MAKE # should be no-op + $MAKE # Should be a no-op. $sleep sed "s/^\\(FINGERPRINT\\)=.*/\\1=$magic1/" $srcdir/configure.in >t mv -f t $srcdir/configure.in remake_ - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile test x"`./foo.sh`" = x"$magic1" @@ -87,19 +87,19 @@ for vpath in : false; do echo 'sed "s/^\\(FINGERPRINT\\)=.*/\\1='$magic2'/"' \ > $srcdir/tweak-configure-in remake_ - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile && Exit 1 $FGREP $magic2 Makefile test x"`./foo.sh`" = x"$magic2" $sleep - echo cat > $srcdir/tweak-configure-in # no-op again + echo cat > $srcdir/tweak-configure-in # Make it a no-op again. sed "s/^\\(FINGERPRINT\\)=.*/\\1=DummyValue/" $srcdir/configure.in >t mv -f t $srcdir/configure.in using_gmake || remake_ $MAKE distcheck - $FGREP $magic1 Makefile && Exit 1 # sanity check - $FGREP $magic2 Makefile && Exit 1 # likewise + $FGREP $magic1 Makefile && Exit 1 # Sanity check. + $FGREP $magic2 Makefile && Exit 1 # Likewise. $MAKE distclean diff --git a/tests/remake9b.test b/tests/remake9b.test index 6c650c4eb..ab886ac14 100755 --- a/tests/remake9b.test +++ b/tests/remake9b.test @@ -57,9 +57,9 @@ check-local: test x"`./foo.sh`" = x"DummyValue" END -echo cat > tweak-makefile-am # no-op by default +echo cat > tweak-makefile-am # It is a no-op by default. -$sleep # so that generated autotools files will be newer than prerequisites +$sleep # So that generated autotools files will be newer than prerequisites. $ACLOCAL $AUTOCONF $AUTOMAKE @@ -75,13 +75,13 @@ for vpath in : false; do fi $srcdir/configure - $MAKE # should be no-op + $MAKE # Should be a no-op. $sleep sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = $magic1/" $srcdir/Makefile.am >t mv -f t $srcdir/Makefile.am remake_ - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile test x"`./foo.sh`" = x"$magic1" @@ -89,19 +89,19 @@ for vpath in : false; do echo 'sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = '$magic2'/"' \ > $srcdir/tweak-makefile-am remake_ - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile && Exit 1 $FGREP $magic2 Makefile test x"`./foo.sh`" = x"$magic2" $sleep - echo cat > $srcdir/tweak-makefile-am # no-op again + echo cat > $srcdir/tweak-makefile-am # Make it a no-op again. sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = DummyValue/" $srcdir/Makefile.am >t mv -f t $srcdir/Makefile.am using_gmake || remake_ $MAKE distcheck - $FGREP $magic1 Makefile && Exit 1 # sanity check - $FGREP $magic2 Makefile && Exit 1 # likewise + $FGREP $magic1 Makefile && Exit 1 # Sanity check. + $FGREP $magic2 Makefile && Exit 1 # Likewise. $MAKE distclean diff --git a/tests/remake9c.test b/tests/remake9c.test index 6186bfb3f..e0acd95bd 100755 --- a/tests/remake9c.test +++ b/tests/remake9c.test @@ -60,9 +60,9 @@ END echo "AC_DEFUN([my_fingerprint], [BadBadBad])" > acinclude.m4 -echo : > tweak-acinclude-m4 # no-op by default +echo : > tweak-acinclude-m4 # It is a no-op by default. -$sleep # so that generated autotools files will be newer than prerequisites +$sleep # So that generated autotools files will be newer than prerequisites. $ACLOCAL $AUTOCONF $AUTOMAKE @@ -78,12 +78,12 @@ for vpath in : false; do fi $srcdir/configure - $MAKE # should be no-op + $MAKE # Should be a no-op. $sleep echo "AC_DEFUN([my_fingerprint], [$magic1])" > $srcdir/acinclude.m4 remake_ - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile test x"`./foo.sh`" = x"$magic1" @@ -91,18 +91,18 @@ for vpath in : false; do echo "echo 'AC_DEFUN([my_fingerprint], [$magic2])'" \ > $srcdir/tweak-acinclude-m4 remake_ - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile && Exit 1 $FGREP $magic2 Makefile test x"`./foo.sh`" = x"$magic2" $sleep - echo : > $srcdir/tweak-acinclude-m4 # no-op again + echo : > $srcdir/tweak-acinclude-m4 # Make it a no-op again. echo "AC_DEFUN([my_fingerprint], [DummyValue])" > $srcdir/acinclude.m4 using_gmake || remake_ $MAKE distcheck - $FGREP $magic1 Makefile && Exit 1 # sanity check - $FGREP $magic2 Makefile && Exit 1 # likewise + $FGREP $magic1 Makefile && Exit 1 # Sanity check. + $FGREP $magic2 Makefile && Exit 1 # Likewise. $MAKE distclean diff --git a/tests/remake9d.test b/tests/remake9d.test index b18db2a05..ae6183598 100755 --- a/tests/remake9d.test +++ b/tests/remake9d.test @@ -57,9 +57,9 @@ cat > foo.in <<END echo '@FINGERPRINT@' END -echo cat > tweak-aclocal-m4 # no-op by default +echo cat > tweak-aclocal-m4 # It is a no-op by default. -$sleep # so that generated autotools files will be newer than prerequisites +$sleep # So that generated autotools files will be newer than prerequisites. $ACLOCAL # Cheatingly mark aclocal.m4 as non auto-generated. sed '/^ *#.*generated automatically/d' aclocal.m4 > t @@ -78,12 +78,12 @@ for vpath in : false; do fi $srcdir/configure - $MAKE # should be no-op + $MAKE # Should be a no-op. $sleep echo "AC_DEFUN([my_fingerprint], [$magic1])dnl %%%" >> $srcdir/aclocal.m4 remake_ - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile test x"`./foo.sh`" = x"$magic1" @@ -91,18 +91,18 @@ for vpath in : false; do echo "sed 's/.*dnl *%%%.*/AC_DEFUN([my_fingerprint], [$magic2])/'" \ > $srcdir/tweak-aclocal-m4 remake_ - $FGREP FINGERPRINT Makefile # for debugging + $FGREP FINGERPRINT Makefile # For debugging. $FGREP $magic1 Makefile && Exit 1 $FGREP $magic2 Makefile test x"`./foo.sh`" = x"$magic2" $sleep - echo cat > $srcdir/tweak-aclocal-m4 # no-op again + echo cat > $srcdir/tweak-aclocal-m4 # Make it a no-op again. echo 'AC_DEFUN([my_fingerprint], [DummyValue])' >> $srcdir/aclocal.m4 using_gmake || remake_ $MAKE distcheck - $FGREP $magic1 Makefile && Exit 1 # sanity check - $FGREP $magic2 Makefile && Exit 1 # likewise + $FGREP $magic1 Makefile && Exit 1 # Sanity check. + $FGREP $magic2 Makefile && Exit 1 # Likewise. $MAKE distclean diff --git a/tests/self-check-is_newest.test b/tests/self-check-is_newest.test index f17922952..678f7644d 100755 --- a/tests/self-check-is_newest.test +++ b/tests/self-check-is_newest.test @@ -24,7 +24,7 @@ $sleep : > b : > c -stat a b c || : # for debugging +stat a b c || : # For debugging. is_newest c a is_newest b a @@ -35,7 +35,7 @@ is_newest c a b c touch -r c d -stat c d || : # for debugging +stat c d || : # For debugging. is_newest c d diff --git a/tests/self-check-unindent.test b/tests/self-check-unindent.test index 3f7edd962..0a0f86fc8 100755 --- a/tests/self-check-unindent.test +++ b/tests/self-check-unindent.test @@ -21,7 +21,7 @@ #------------------------------------------------------------------ -: Leading spaces +: Leading spaces. cat > input <<END 1 @@ -81,7 +81,7 @@ diff exp got #------------------------------------------------------------------ -: Leading tab +: Leading tab. cat > input <<END ${tab}1 @@ -139,7 +139,7 @@ diff exp got #------------------------------------------------------------------ -: No leading whitespace +: No leading whitespace. cat > input <<END 1 @@ -172,7 +172,7 @@ diff exp got #------------------------------------------------------------------ -: Leading empty lines are ignored [1] +: Leading empty lines are ignored [1]. cat > input <<END @@ -198,7 +198,7 @@ diff exp got #------------------------------------------------------------------ -: Leading empty lines are ignored [2] +: Leading empty lines are ignored [2]. cat > input <<END @@ -224,7 +224,7 @@ diff exp got #------------------------------------------------------------------ -: More elaborated parallel use +: More elaborated parallel use. cat > input <<END x diff --git a/tests/silent6.test b/tests/silent6.test index 5fa968ef1..28b7a2ded 100755 --- a/tests/silent6.test +++ b/tests/silent6.test @@ -76,7 +76,7 @@ $ACLOCAL AUTOMAKE_fails $AUTOMAKE -Wno-error -# AM_SILENT_RULES should turn off the warning +# AM_SILENT_RULES should turn off the warning. $sleep echo 'AM_SILENT_RULES' >> configure.in $ACLOCAL diff --git a/tests/silent8.test b/tests/silent8.test index 7a34bdb64..b016ad26c 100755 --- a/tests/silent8.test +++ b/tests/silent8.test @@ -43,7 +43,7 @@ $AUTOCONF ./configure --disable-silent-rules -# Make sure that all labels work in silent-mode +# Make sure that all labels work in silent-mode. $MAKE V=0 dvi html info ps pdf >stdout || { cat stdout; Exit 1; } cat stdout grep 'DVIPS foo.ps' stdout || Exit 1 diff --git a/tests/silentcxx-gcc.test b/tests/silentcxx-gcc.test index 55f296d0a..8d23a383d 100755 --- a/tests/silentcxx-gcc.test +++ b/tests/silentcxx-gcc.test @@ -53,7 +53,7 @@ using namespace std; /* C compilers fail on this. */ int main() { return 0; } EOF -# let's try out other extensions too +# Let's try out other extensions too. echo 'class Baz { public: int i; };' > baz.cxx echo 'class Quux { public: bool b; };' > quux.cc diff --git a/tests/specflg6.test b/tests/specflg6.test index b02dbbaa3..3e8d64861 100755 --- a/tests/specflg6.test +++ b/tests/specflg6.test @@ -17,7 +17,7 @@ # Regression test for multiple rules being generated for each target when # conditionals are present. -# From Richard Boulton +# From Richard Boulton. . ./defs || Exit 1 diff --git a/tests/subdir5.test b/tests/subdir5.test index f9865b618..e3af205d6 100755 --- a/tests/subdir5.test +++ b/tests/subdir5.test @@ -46,10 +46,10 @@ $sleep sed <configure.in >configure.tmp -e '/^AC_OUTPUT$/i\ AC_CONFIG_FILES([maude/Makefile])\ m4_include([confile.m4])\ -' # last newline required by older OpenBSD sed +' # Last newline required by older OpenBSD sed. mv -f configure.tmp configure.in -cat configure.in # might be useful for debugging +cat configure.in # For debugging. : > confile.m4 diff --git a/tests/subobj10.test b/tests/subobj10.test index 227e34d00..92cca4aec 100755 --- a/tests/subobj10.test +++ b/tests/subobj10.test @@ -16,7 +16,7 @@ # PR 492: Test asm subdir-objects. -required=gcc # avoid compiler errors. +required=gcc . ./defs || Exit 1 cat > configure.in << END diff --git a/tests/subobj11a.test b/tests/subobj11a.test index 60ad5a51b..80406e357 100755 --- a/tests/subobj11a.test +++ b/tests/subobj11a.test @@ -38,7 +38,7 @@ END cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = subdir-objects bin_PROGRAMS = foo -## the `.//' is meant +## The `.//' below is meant. foo_SOURCES = .//src/foo.c END diff --git a/tests/subobj11c.test b/tests/subobj11c.test index f78f7e96d..6e8d27037 100755 --- a/tests/subobj11c.test +++ b/tests/subobj11c.test @@ -17,7 +17,7 @@ # Automatic dependency tracking with subdir-objects option active: # check for a pathological case of slash-collapsing in the name of # included makefile fragments (containing dependency info). -# See also related tests `subobj11a.test' and `subobj11b.test' +# See also related tests `subobj11a.test' and `subobj11b.test'. . ./defs || Exit 1 diff --git a/tests/subobj5.test b/tests/subobj5.test index 00402db44..730e3cfb0 100755 --- a/tests/subobj5.test +++ b/tests/subobj5.test @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test of subdir make dist rules. -# From Robert Collins +# From Robert Collins. required=cc . ./defs || Exit 1 diff --git a/tests/subobj6.test b/tests/subobj6.test index fff515174..557a21468 100755 --- a/tests/subobj6.test +++ b/tests/subobj6.test @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test of subdir make distclean rules. -# From Robert Collins +# From Robert Collins. required=cc . ./defs || Exit 1 diff --git a/tests/subobj9.test b/tests/subobj9.test index 9bab174a1..f25349ccf 100755 --- a/tests/subobj9.test +++ b/tests/subobj9.test @@ -37,7 +37,7 @@ END cat > Makefile.am << 'END' noinst_LTLIBRARIES = libfoo.la -libfoo_la_SOURCES = src/foo.cc .//src/bar.cc # the `.//' is meant. +libfoo_la_SOURCES = src/foo.cc .//src/bar.cc # The `.//' is meant. .PHONY: print print: @echo BEG1: "$(LTCXXCOMPILE)" :1END diff --git a/tests/subpkg.test b/tests/subpkg.test index 5987ac3d5..e1b01b3e6 100755 --- a/tests/subpkg.test +++ b/tests/subpkg.test @@ -122,7 +122,7 @@ cd .. ./configure $MAKE $MAKE distcheck -test ! -d subpack-1 # make sure distcheck cleans up after itself +test ! -d subpack-1 # Make sure distcheck cleans up after itself. test -f subpack-1.tar.gz : diff --git a/tests/subpkg3.test b/tests/subpkg3.test index 937e51d3c..ea082c20f 100755 --- a/tests/subpkg3.test +++ b/tests/subpkg3.test @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# make sure different subpackages may share files and directories. +# Make sure different subpackages may share files and directories. . ./defs || Exit 1 diff --git a/tests/substref.test b/tests/substref.test index 47f4d410b..815449607 100755 --- a/tests/substref.test +++ b/tests/substref.test @@ -16,7 +16,7 @@ # Test for bug in variable substitution references when left hand # pattern is null. -# Report from Richard Boulton +# Report from Richard Boulton. required=cc . ./defs || Exit 1 diff --git a/tests/substtarg.test b/tests/substtarg.test index ad94e3e84..d20c34655 100755 --- a/tests/substtarg.test +++ b/tests/substtarg.test @@ -35,7 +35,7 @@ noinst_LIBRARIES = libfake@SUBST@.a libfake@SUBST@_a_SOURCES = abra.c kadabra.c -# then we override the target rule: +# Then we override the target rule: libfake@SUBST@.a: Makefile $(libfake@SUBST@_a_OBJECTS) $(libfake@SUBST@_a_DEPENDENCIES) @echo here we do some custom stuff, instead of invoking the linker END diff --git a/tests/suffix.test b/tests/suffix.test index bb8b82ec6..0c29881d8 100755 --- a/tests/suffix.test +++ b/tests/suffix.test @@ -34,12 +34,12 @@ END $ACLOCAL $AUTOMAKE -i -grep '^ *\.c' Makefile.in # for debugging +grep '^ *\.c' Makefile.in # For debugging. test `grep -c '^\.c\.o:' Makefile.in` -eq 1 test `grep -c '^\.c\.obj:' Makefile.in` -eq 1 $AUTOMAKE -grep '^ *\.c' Makefile.in # for debugging +grep '^ *\.c' Makefile.in # For debugging. test `grep -c '^\.c\.o:' Makefile.in` -eq 1 test `grep -c '^\.c\.obj:' Makefile.in` -eq 1 diff --git a/tests/suffix10.test b/tests/suffix10.test index bd870f381..9f36c5547 100755 --- a/tests/suffix10.test +++ b/tests/suffix10.test @@ -32,7 +32,7 @@ lib_LTLIBRARIES = libfoo.la libfoo_la_SOURCES = foo.x_ .x_.y: rm -f $@ $@-t -## the leading `:;' works around a bug in bash <= 3.2 +## The leading `:;' works around a bug in bash <= 3.2. :; { echo '/* autogenerated */' \ && echo '%{' \ && echo 'int yylex () {return 0;}' \ @@ -41,7 +41,7 @@ libfoo_la_SOURCES = foo.x_ && echo '%%' \ && echo 'WORD: "foo";' \ && echo '%%' \ -## account for VPATH issues on weaker make implementations +## Account for VPATH issues on weaker make implementations. && cat `test -f '$<' || echo $(srcdir)/`$<; \ } > $@-t mv -f $@-t $@ diff --git a/tests/suffix11.test b/tests/suffix11.test index c53e2565f..3f0542b59 100755 --- a/tests/suffix11.test +++ b/tests/suffix11.test @@ -33,7 +33,7 @@ bar_SOURCES = bar.y-z baz_SOURCES = baz1.x_ baz2.y-z .y-z.c .x_.c: -## account for VPATH issues on weaker make implementations (e.g. IRIX 6.5) +## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5). sed 's/INTEGER/int/g' `test -f '$<' || echo $(srcdir)/`$< >$@ CLEANFILES = foo.c bar.c baz1.c baz2.c diff --git a/tests/suffix12.test b/tests/suffix12.test index c14b84268..f583e365a 100755 --- a/tests/suffix12.test +++ b/tests/suffix12.test @@ -29,9 +29,9 @@ EOF cat >Makefile.am << 'END' AUTOMAKE_OPTIONS = subdir-objects SUFFIXES = .baz .o -# we fake here: +# We fake here: .baz.o: - ## account for VPATH issues on weaker make implementations + ## Account for VPATH issues on weaker make implementations. cp `test -f '$<' || echo $(srcdir)/`$< $@ bin_PROGRAMS = foo diff --git a/tests/suffix13.test b/tests/suffix13.test index 542f89288..756d83e12 100755 --- a/tests/suffix13.test +++ b/tests/suffix13.test @@ -37,7 +37,7 @@ AUTOMAKE_OPTIONS = subdir-objects SUFFIXES = .baz .c .baz.c: case $@ in sub/*) $(MKDIR_P) sub;; *) :;; esac -## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5) +## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5). cp `test -f '$<' || echo $(srcdir)/`$< $@ DISTCLEANFILES = sub/bar.c @@ -65,7 +65,7 @@ $MAKE $MAKE distcheck $MAKE distclean -# Should also work without subdir-objects +# Should also work without subdir-objects. sed '/subdir-objects/d' < Makefile.am > t mv -f t Makefile.am diff --git a/tests/suffix2.test b/tests/suffix2.test index b1212a8ac..2b7327961 100755 --- a/tests/suffix2.test +++ b/tests/suffix2.test @@ -42,12 +42,12 @@ END $ACLOCAL $AUTOMAKE -i -grep '^ *\.c' Makefile.in # for debugging +grep '^ *\.c' Makefile.in # For debugging. test `grep -c '^\.c\.o:' Makefile.in` -eq 1 test `grep -c '^\.c\.obj:' Makefile.in` -eq 1 $AUTOMAKE -grep '^ *\.c' Makefile.in # for debugging +grep '^ *\.c' Makefile.in # For debugging. test `grep -c '^\.c\.o:' Makefile.in` -eq 1 test `grep -c '^\.c\.obj:' Makefile.in` -eq 1 diff --git a/tests/suffix5.test b/tests/suffix5.test index c0566a99a..6bdaea41e 100755 --- a/tests/suffix5.test +++ b/tests/suffix5.test @@ -29,7 +29,7 @@ END cat > Makefile.am << 'END' .k.lo: -## account for VPATH issues on weaker make implementations +## Account for VPATH issues on weaker make implementations. (echo $< && cat `test -f '$<' || echo $(srcdir)/`$<) > $@ noinst_LTLIBRARIES = libfoo.la @@ -38,7 +38,7 @@ libfoo_la_SOURCES = foo.k .PHONY: test test: all grep '^=GREP=ME=$$' foo.lo -## weaker regex to account for VPATH issues +## Weaker regex to account for VPATH issues. grep 'foo\.k$$' foo.lo check-local: test END diff --git a/tests/suffix6.test b/tests/suffix6.test index 1d31a141c..c50b442a0 100755 --- a/tests/suffix6.test +++ b/tests/suffix6.test @@ -55,9 +55,9 @@ cat foo-objects # foo.$(OBJEXT) using the following rules: # fooa --[ab]--> foob --[b.$(OBJEXT)]--> foo.$(OBJEXT) $FGREP ' foo.$(OBJEXT) ' foo-objects -# barc --[c.o]--> bar.$(OBJEXT) ## This is really meant ! +# barc --[c.o]--> bar.$(OBJEXT) ## This is really meant! $FGREP ' bar.$(OBJEXT) ' foo-objects -# bazc --[c.obj]--> baz.$(OBJEXT) ## This is really meant ! +# bazc --[c.obj]--> baz.$(OBJEXT) ## This is really meant! $FGREP ' baz.$(OBJEXT) ' foo-objects : diff --git a/tests/suffix6b.test b/tests/suffix6b.test index c417df234..b4da6bbdc 100755 --- a/tests/suffix6b.test +++ b/tests/suffix6b.test @@ -17,12 +17,12 @@ # Test to make sure Automake supports implicit rules with dot-less # extensions. Se also related "grepping" test suffix6.test. -required=GNUmake # other makes might not grok dot-less suffix rules +required=GNUmake # Other makes might not grok dot-less suffix rules. . ./defs || Exit 1 cat >> configure.in << 'END' # $(LINK) is not defined automatically by Automake, since the *_SOURCES -# variables don't contain any known extension (.c, .cc, .f ...), +# variables don't contain any known extension (.c, .cc, .f, ...). # So we need this hack -- but since such an hack can also serve as a # mild stress test, that's ok. AC_SUBST([LINK], ['cat >$@']) @@ -42,17 +42,17 @@ bc: c.$(OBJEXT): { echo '=b.obj=' && cat $<; } >$@ test: - : for debugging + : For debugging. ls -l - : implicit intermediate files should be removed by GNU make + : Implicit intermediate files should be removed by GNU make ... test ! -r foob test ! -r fooc - : but object files should not + : ... but object files should not. cat foo.$(OBJEXT) - : for debugging + : For debugging. cat foo.XxX - : now check that the chain of implicit rules has been executed - : completely and in the correct order + : Now check that the chain of implicit rules has been executed + : completely and in the correct order. (echo =b.obj= && echo =bc= && echo =ab= && echo =src=) > exp diff exp foo.XxX rm -f exp diff --git a/tests/symlink.test b/tests/symlink.test index a7e63fd9f..5ecd4ab04 100755 --- a/tests/symlink.test +++ b/tests/symlink.test @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure we get an error if symlink creation fails. -# Reported by Joerg-Martin Schwarz +# Reported by Joerg-Martin Schwarz. . ./defs || Exit 1 diff --git a/tests/txinfo10.test b/tests/txinfo10.test index 28eee445f..1c58739ce 100755 --- a/tests/txinfo10.test +++ b/tests/txinfo10.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure dvi target recurses into subdir. -# Reported by Pavel Roskin +# Reported by Pavel Roskin. . ./defs || Exit 1 diff --git a/tests/txinfo13.test b/tests/txinfo13.test index aace4e68b..d50b8bd73 100755 --- a/tests/txinfo13.test +++ b/tests/txinfo13.test @@ -15,9 +15,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Check for subdir Texinfo (PR/343) +# Check for subdir Texinfo (PR/343). # Also make sure we do not distribute too much foo.info* files (Report -# from Vincent Lefevre) +# from Vincent Lefevre). required='makeinfo tex texi2dvi-o' . ./defs || Exit 1 diff --git a/tests/txinfo18.test b/tests/txinfo18.test index dcc370504..01e4c215a 100755 --- a/tests/txinfo18.test +++ b/tests/txinfo18.test @@ -64,10 +64,10 @@ $AUTOCONF ./configure $MAKE dvi -ls -l # for debugging -test -f main.sa # sanity check +ls -l # For debugging. +test -f main.sa # Sanity check. $MAKE clean -ls -l # for debugging +ls -l # For debugging. test x"`echo main.*`" = x"main.texi" TAR_OPTIONS= $MAKE distcheck diff --git a/tests/txinfo20.test b/tests/txinfo20.test index dcd362b12..b56cdefa3 100755 --- a/tests/txinfo20.test +++ b/tests/txinfo20.test @@ -49,7 +49,7 @@ $MAKE : > main-1 : > sub/main-1 -# Break main.texi +# Break main.texi. $sleep cp main.texi main.old cat > main.texi << 'END' @@ -66,7 +66,7 @@ $MAKE && Exit 1 test -f main test -f main-1 -# Restore main.texi, and break sub/main.texi +# Restore main.texi, and break sub/main.texi. cp main.texi sub/main.texi mv main.old main.texi $MAKE && Exit 1 diff --git a/tests/txinfo23.test b/tests/txinfo23.test index 7ec3796b8..de82f81f9 100755 --- a/tests/txinfo23.test +++ b/tests/txinfo23.test @@ -16,8 +16,8 @@ # Check that info files are built in builddir when needed. # Test with subdir Texinfo. -# (Similar to txinfo13.test, plus DISTCLEANFILES.) -# (See also txinfo24.test and txinfo25.test) +# (Similar to txinfo13.test, plus DISTCLEANFILES). +# (See also txinfo24.test and txinfo25.test). required='makeinfo tex texi2dvi-o' . ./defs || Exit 1 diff --git a/tests/txinfo24.test b/tests/txinfo24.test index a6f9e023c..d2bacc8ec 100755 --- a/tests/txinfo24.test +++ b/tests/txinfo24.test @@ -15,8 +15,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check that info files are built in builddir when needed. -# (Similar to txinfo16.test, plus CLEANFILES.) -# (See also txinfo23.test and txinfo25.test) +# (Similar to txinfo16.test, plus CLEANFILES). +# (See also txinfo23.test and txinfo25.test). required='makeinfo tex texi2dvi-o' . ./defs || Exit 1 @@ -58,7 +58,7 @@ $MAKE test -f main.info # Make sure stamp-vti is older that version.texi. -# (A common situation in a real tree.) +# (A common situation in a real tree). test -f stamp-vti test -f version.texi $sleep @@ -72,7 +72,7 @@ mkdir build cd build ../configure $MAKE -# main.info should be rebuilt in the current directory +# main.info should be rebuilt in the current directory. test -f main.info test ! -f ../main.info $MAKE dvi diff --git a/tests/txinfo25.test b/tests/txinfo25.test index a350a02a2..b97b1a109 100755 --- a/tests/txinfo25.test +++ b/tests/txinfo25.test @@ -17,8 +17,8 @@ # Check that info files are built in builddir and in srcdir can safely # co-exist. This setup is obtained by having two info files, only one # of which being cleaned. -# (Similar to txinfo16.test, plus CLEANFILES.) -# (See also txinfo23.test and txinfo24.test) +# (Similar to txinfo16.test, plus CLEANFILES). +# (See also txinfo23.test and txinfo24.test). required='makeinfo tex texi2dvi-o' . ./defs || Exit 1 @@ -73,7 +73,7 @@ test -f main.info test -f other.info # Make sure stamp-vti is older that version.texi. -# (A common situation in a real tree.) +# (A common situation in a real tree). # This is needed to test the "subtle" issue described below. test -f stamp-vti test -f version.texi diff --git a/tests/txinfo26.test b/tests/txinfo26.test index 20a708f12..46bb322cd 100755 --- a/tests/txinfo26.test +++ b/tests/txinfo26.test @@ -63,5 +63,5 @@ $MAKE uninstall test ! -f _inst/info/main.info test -f ../main.info -# multiple uninstall should not fail. +# Multiple uninstall should not fail. $MAKE uninstall diff --git a/tests/txinfo28.test b/tests/txinfo28.test index 26e8bb31f..808affe18 100755 --- a/tests/txinfo28.test +++ b/tests/txinfo28.test @@ -15,7 +15,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check that info files are built in builddir when needed. -# Similar to txinfo24.test, but obfuscating filenames with variable references. +# Similar to txinfo24.test, but obfuscating filenames with variable +# references. # Report from Ralf Corsepius. required='makeinfo tex texi2dvi-o' @@ -65,7 +66,7 @@ $MAKE test -f main.info # Make sure stamp-vti is older that version.texi. -# (A common situation in a real tree.) +# (A common situation in a real tree). test -f stamp-vti test -f version.texi $sleep @@ -79,7 +80,7 @@ mkdir build cd build ../configure $MAKE -# main.info should be rebuilt in the current directory +# main.info should be rebuilt in the current directory. test -f main.info test ! -f ../main.info $MAKE dvi diff --git a/tests/txinfo29.test b/tests/txinfo29.test index 6f986541a..9243e3880 100755 --- a/tests/txinfo29.test +++ b/tests/txinfo29.test @@ -33,9 +33,9 @@ grep 'overrides Automake variable.*INFO_DEPS' stderr $AUTOMAKE -Wno-override -# There is only one definition of INFO_DEPS +# There is only one definition of INFO_DEPS ... test 1 = `grep '^INFO_DEPS.*=' Makefile.in | wc -l` -# and it is the right one. +# ... and it is the right one. grep '^INFO_DEPS *= *foo.info *$' Makefile.in # Likewise with AC_SUBST. @@ -54,9 +54,9 @@ grep 'overrides Automake variable.*INFO_DEPS' stderr $AUTOMAKE -Wno-override -# There is only one definition of INFO_DEPS +# There is only one definition of INFO_DEPS ... test 1 = `grep '^INFO_DEPS.*=' Makefile.in | wc -l` -# and it is the right one. +# ... and it is the right one. grep '^INFO_DEPS *= *@INFO_DEPS@ *$' Makefile.in : diff --git a/tests/txinfo9.test b/tests/txinfo9.test index ce1e72c53..29635b22d 100755 --- a/tests/txinfo9.test +++ b/tests/txinfo9.test @@ -34,7 +34,7 @@ $AUTOMAKE # we only want them to appear once. But grepping them all would be # overkill. for t in info dist-info dvi-am install-html uninstall-pdf-am; do - $EGREP "(^| )$t*.:" Makefile.in # help in debugging + $EGREP "(^| )$t*.:" Makefile.in # For debugging. test `$EGREP -c "(^| )$t(:| *.:)" Makefile.in` -eq 1 done diff --git a/tests/vala2.test b/tests/vala2.test index d020c5883..55e9b8eaa 100755 --- a/tests/vala2.test +++ b/tests/vala2.test @@ -67,7 +67,7 @@ $AUTOMAKE -a ./configure || skip_ "configure failure" $MAKE -# test rebuild rules +# Test rebuild rules. rm -f src/zardoz.h $MAKE -C src zardoz.h @@ -79,7 +79,7 @@ cd build $MAKE $MAKE distcheck -# test rebuild rules from builddir +# Test rebuild rules from builddir. touch ../src/zardoz.vala $MAKE diff --git a/tests/vars.test b/tests/vars.test index 1a33b3bd7..aa022afe5 100755 --- a/tests/vars.test +++ b/tests/vars.test @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Test various variable definitions that include an '=' sign -# From Raja R Harinath +# Test various variable definitions that include an '=' sign. +# From Raja R Harinath. . ./defs || Exit 1 diff --git a/tests/vars3.test b/tests/vars3.test index 9608d6cf3..5b6ff23f4 100755 --- a/tests/vars3.test +++ b/tests/vars3.test @@ -72,7 +72,7 @@ grep 'another Error' stderr grep 'thisis' stderr && Exit 1 grep 'here' stderr && Exit 1 -# None of these errors be diagnosed with -Wno-portability +# None of these errors be diagnosed with `-Wno-portability'. $AUTOMAKE -Wno-portability # Likewise if we add this in the Makefile.am diff --git a/tests/vtexi3.test b/tests/vtexi3.test index da0278bbb..882906887 100755 --- a/tests/vtexi3.test +++ b/tests/vtexi3.test @@ -26,7 +26,7 @@ # to redefine the name of the distdir as well. distdir=$me-7.45.3a -# This should work without tex, texinfo or makeinfo +# This should work without tex, texinfo or makeinfo. TEX=false TEXI2DVI=false MAKEINFO=false export TEX TEXI2DVI MAKEINFO diff --git a/tests/warnopts.test b/tests/warnopts.test index edcf70ac4..4efba4830 100755 --- a/tests/warnopts.test +++ b/tests/warnopts.test @@ -60,7 +60,7 @@ test `grep -v 'warnings are treated as errors' stderr | wc -l` = 3 # created below; thus causing traces for the old configure.in to be # used. We could do `$sleep', but it's faster to erase the # directory. (Erase autom4te*.cache, not autom4te.cache, because some -# bogus installations of Autoconf use a versioned cache.) +# bogus installations of Autoconf use a versioned cache). rm -rf autom4te*.cache # If we add a global -Wnone, all warnings should disappear. diff --git a/tests/xz.test b/tests/xz.test index 50bfb4a9c..1320ed778 100755 --- a/tests/xz.test +++ b/tests/xz.test @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Check support for no-dist-gzip with xz +# Check support for no-dist-gzip with xz. required=xz . ./defs || Exit 1 diff --git a/tests/yacc-basic.test b/tests/yacc-basic.test index 6ce8256a3..aef08c19a 100755 --- a/tests/yacc-basic.test +++ b/tests/yacc-basic.test @@ -79,7 +79,7 @@ $MAKE distcheck test -f parse.c $MAKE distclean test -f parse.c -./configure # we must re-create `Makefile' +./configure # Re-create `Makefile'. $MAKE maintainer-clean test ! -f parse.c diff --git a/tests/yacc-clean.test b/tests/yacc-clean.test index f97e18245..ca03466c8 100755 --- a/tests/yacc-clean.test +++ b/tests/yacc-clean.test @@ -130,7 +130,7 @@ for target in clean distclean; do done cp config.sav config.status -./config.status # re-create Makefile +./config.status # Re-create `Makefile'. $MAKE maintainer-clean ls -l . sub1 sub2 @@ -144,7 +144,7 @@ test ! -r sub2/bar-parse.c test ! -r sub2/bar-parse.h cp config.sav config.status -./config.status # re-create Makefile +./config.status # Re-create `Makefile'. # The distribution must work correctly, assuming the user has # the proper tools to process yacc files. diff --git a/tests/yacc-d-vpath.test b/tests/yacc-d-vpath.test index 2e38529c0..87e694632 100755 --- a/tests/yacc-d-vpath.test +++ b/tests/yacc-d-vpath.test @@ -37,7 +37,7 @@ foo_SOURCES = parse.y foo.c AM_YFLAGS = -d END -# Original parser, with `foobar' +# Original parser, with `foobar'. cat > parse.y << 'END' %{ int yylex () {return 0;} @@ -70,7 +70,7 @@ cd sub $sleep -# New parser, with `fubar' +# New parser, with `fubar'. cat > ../parse.y << 'END' %{ int yylex () {return 0;} @@ -90,7 +90,7 @@ $FGREP FUBAR $distdir/parse.h $sleep -# New parser, with `maude' +# New parser, with `maude'. cat > ../parse.y << 'END' %{ int yylex () {return 0;} diff --git a/tests/yacc-dist-nobuild-subdir.test b/tests/yacc-dist-nobuild-subdir.test index f48d34bce..7ae38b21d 100755 --- a/tests/yacc-dist-nobuild-subdir.test +++ b/tests/yacc-dist-nobuild-subdir.test @@ -62,7 +62,7 @@ $AUTOMAKE -a ./configure $MAKE distdir -# Yacc-derived C source and header files must be built and distributed +# Yacc-derived C source and header files must be built and distributed. test -f sub/parse.c test -f sub/parse.h diff --git a/tests/yacc2.test b/tests/yacc2.test index bf5084b47..0476a9057 100755 --- a/tests/yacc2.test +++ b/tests/yacc2.test @@ -39,19 +39,19 @@ END cp Makefile.am Makefile.src $AUTOMAKE -a -# If zardoz.h IS mentioned, fail +# If zardoz.h IS mentioned, fail. $FGREP 'zardoz.h' Makefile.in && Exit 1 cp Makefile.src Makefile.am echo 'AM_YFLAGS = -d' >> Makefile.am $AUTOMAKE -# If zardoz.h is NOT mentioned, fail +# If zardoz.h is NOT mentioned, fail. $FGREP 'zardoz.h' Makefile.in cp Makefile.src Makefile.am echo 'AM_YFLAGS = ' >> Makefile.am $AUTOMAKE -# If zardoz.h IS mentioned, fail +# If zardoz.h IS mentioned, fail. $FGREP 'zardoz.h' Makefile.in && Exit 1 cp Makefile.src Makefile.am @@ -61,13 +61,13 @@ AUTOMAKE_fails grep 'YFLAGS.* user variable' stderr grep 'AM_YFLAGS.* instead' stderr $AUTOMAKE -Wno-gnu -# If zardoz.h is NOT mentioned, fail +# If zardoz.h is NOT mentioned, fail. $FGREP 'zardoz.h' Makefile.in cp Makefile.src Makefile.am echo 'YFLAGS = ' >> Makefile.am $AUTOMAKE -Wno-gnu -# If zardoz.h IS mentioned, fail +# If zardoz.h IS mentioned, fail. $FGREP 'zardoz.h' Makefile.in && Exit 1 : diff --git a/tests/yacc6.test b/tests/yacc6.test index c127d15d7..8992e95d4 100755 --- a/tests/yacc6.test +++ b/tests/yacc6.test @@ -25,7 +25,7 @@ required='gcc yacc GNUmake' cat > configure.in << 'END' AC_INIT([yacc6], [1.0]) -# `aux' is not an acceptable file/directory name on Windows systems +# `aux' is not an acceptable file/directory name on Windows systems. AC_CONFIG_AUX_DIR([aux1]) AM_INIT_AUTOMAKE AC_CONFIG_FILES([Makefile sub/Makefile]) diff --git a/tests/yacc7.test b/tests/yacc7.test index 0bd0b64d2..64a536b57 100755 --- a/tests/yacc7.test +++ b/tests/yacc7.test @@ -82,7 +82,7 @@ $MAKE distclean test -f foo.h test -f foo.c # ... but maintainer-clean should. -./configure # we must re-create `Makefile' +./configure # Re-create `Makefile'. $MAKE maintainer-clean test ! -f foo.h test ! -f foo.c diff --git a/tests/yacc8.test b/tests/yacc8.test index c7cedc72f..ec04a75bf 100755 --- a/tests/yacc8.test +++ b/tests/yacc8.test @@ -68,7 +68,7 @@ cd sub $MAKE test1 # Aside of the rest of this test, let's see if we can recover from -# parse.h removal +# parse.h removal. test -f foo/parse.h rm -f foo/parse.h $MAKE foo/parse.h @@ -103,7 +103,7 @@ $AUTOMAKE -a test -f ./ylwrap cd sub -# Regenerate Makefile (automatic in GNU Make, but not in other Makes) +# Regenerate Makefile (automatic in GNU Make, but not in other Makes). ./config.status $MAKE test2 diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test index aaebcaa40..c98fb46b1 100755 --- a/tests/yaccvpath.test +++ b/tests/yaccvpath.test @@ -39,7 +39,7 @@ bin_PROGRAMS = foo foo_SOURCES = parse.y foo.c END -# Original parser, with `foobar' +# Original parser, with `foobar'. cat > parse.y << 'END' %{ int yylex () {return 0;} @@ -66,7 +66,7 @@ cd sub $sleep -# New parser, with `fubar' +# New parser, with `fubar'. cat > ../parse.y << 'END' %{ int yylex () {return 0;} @@ -84,7 +84,7 @@ $FGREP fubar $distdir/parse.c $sleep -# New parser, with `maude' +# New parser, with `maude'. cat > ../parse.y << 'END' %{ int yylex () {return 0;} diff --git a/tests/yflags-conditional.test b/tests/yflags-conditional.test index 68e25eb77..8849af434 100755 --- a/tests/yflags-conditional.test +++ b/tests/yflags-conditional.test @@ -46,7 +46,7 @@ END cat > Makefile1.am <<'END' bin_PROGRAMS = foo foo_SOURCES = foo.y -## dummy comment to keep line count right +## This is a dummy comment to keep line count right. if COND YFLAGS = foo endif COND @@ -112,7 +112,7 @@ END : > ylwrap -LC_ALL=C; export LC_ALL # For grep regexes below. +LC_ALL=C; export LC_ALL; # For grep regexes below. AUTOMAKE_fails -Wnone -Wunsupported Makefile grep '^Makefile\.am:5:.*AM_YFLAGS.* conditional contents' stderr diff --git a/tests/yflags-force-override.test b/tests/yflags-force-override.test index cf30f4666..3ed1b386c 100755 --- a/tests/yflags-force-override.test +++ b/tests/yflags-force-override.test @@ -47,7 +47,7 @@ END $ACLOCAL $AUTOMAKE -a -Wno-gnu -$EGREP '(foo|YFLAGS)' Makefile.in # for debugging +$EGREP '(foo|YFLAGS)' Makefile.in # For debugging. grep '^foo.h *:' Makefile.in $AUTOCONF diff --git a/tests/yflags-var-expand.test b/tests/yflags-var-expand.test index de38a7420..5117b6bc4 100755 --- a/tests/yflags-var-expand.test +++ b/tests/yflags-var-expand.test @@ -39,7 +39,7 @@ END $AUTOMAKE -a -$EGREP '(foo|bar|YFLAGS)' Makefile.in # for debugging +$EGREP '(foo|bar|YFLAGS)' Makefile.in # For debugging. grep '^foo.h *:' Makefile.in grep '^bar-bar.h *:' Makefile.in @@ -55,7 +55,7 @@ END $AUTOMAKE -$EGREP 'parser|YFLAGS' Makefile.in # for debugging +$EGREP 'parser|YFLAGS' Makefile.in # For debugging. grep '^parser.h *:' Makefile.in : diff --git a/tests/yflags.test b/tests/yflags.test index bf5611d3e..7eb304094 100755 --- a/tests/yflags.test +++ b/tests/yflags.test @@ -17,7 +17,7 @@ # Check that $(YFLAGS) takes precedence over both $(AM_YFLAGS) and # $(foo_YFLAGS). # Please keep this in sync with the sister tests yflags2.test, lflags.test -# and lflags2.test +# and lflags2.test. . ./defs || Exit 1 diff --git a/tests/yflags2.test b/tests/yflags2.test index 8e17d08da..b4678afd0 100755 --- a/tests/yflags2.test +++ b/tests/yflags2.test @@ -17,7 +17,7 @@ # Check that $(YFLAGS) takes precedence over both $(AM_YFLAGS) and # $(foo_YFLAGS). # Please keep this in sync with the sister tests yflags.test, lflags.test -# and lflags2.test +# and lflags2.test. . ./defs || Exit 1 |