tests: avoid '##'-style comments inside recipe commands

* tests/autodist.test: Do not whitespace-indent `##' comments when
they are embedded in a makefile rule: having them indented is not
part of the Automake API, and might cause failures with e.g., Tru64
make.
* tests/autodist-subdir.test: Likewise.
* tests/backcompat.test: Likewise.
* tests/backcompat6.test: Likewise.
* tests/colon7.test: Likewise.
* tests/posixsubst-scripts.test: Likewise.
* tests/posixsubst-sources.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3879c5a9ed6b34c6bf4ba2d524bd3addf1869543..3688e3b47c2da78a873d171b669a9ba6969f5198 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-07-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: avoid '##'-style comments inside recipe commands
+       * tests/autodist.test: Do not whitespace-indent `##' comments when
+       they are embedded in a makefile rule: having them indented is not
+       part of the Automake API, and might cause failures with e.g., Tru64
+       make.
+       * tests/autodist-subdir.test: Likewise.
+       * tests/backcompat.test: Likewise.
+       * tests/backcompat6.test: Likewise.
+       * tests/colon7.test: Likewise.
+       * tests/posixsubst-scripts.test: Likewise.
+       * tests/posixsubst-sources.test: Likewise.
+
 2011-07-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: tweak, improve and extend tests on lisp support

diff --git a/tests/autodist-subdir.test b/tests/autodist-subdir.test
index 6c0a1d5f24301ae422811506b5a30f33cdc4e927..fd2f2830450ac8108881879f0c0426f82985546d 100755 (executable)
--- a/tests/autodist-subdir.test
+++ b/tests/autodist-subdir.test
@@ -73,9 +73,9 @@ check-local:
 ## Now the checks.
        @for f in $(autodist_list); do \
          echo "file: $$f"; \
-         ## Some filenames might contain dots, but this won't cause spurious
-         ## failures, and "spurious successes" are so unlikely that they're
-         ## not worth worrying about.
+## Some filenames might contain dots, but this won't cause spurious
+## failures, and "spurious successes" are so unlikely that they're
+## not worth worrying about.
          echo ' ' $(DIST_COMMON) ' ' | grep "[ /]$$f " >/dev/null \
            || { echo $$f: distcom fail >&2; exit 1; }; \
        done

diff --git a/tests/autodist.test b/tests/autodist.test
index f6fa6fd03a7cc0232a7c85b1d5ee632dcaa14c33..f2b31ab2759832fad0f655e4fdcb3c238a8bf6a2 100755 (executable)
--- a/tests/autodist.test
+++ b/tests/autodist.test
@@ -60,9 +60,9 @@ check-local:
          echo "file: $$f"; \
          test -f $(distdir)/$$f \
            || { echo $$f: distdir fail >&2; exit 1; }; \
-         ## Some filenames might contain dots, but this won't cause spurious
-         ## failures, and "spurious successes" are so unlikely that they're
-         ## not worth worrying about.
+## Some filenames might contain dots, but this won't cause spurious
+## failures, and "spurious successes" are so unlikely that they're
+## not worth worrying about.
          echo ' ' $(DIST_COMMON) ' ' | grep "[ /]$$f " >/dev/null \
            || { echo $$f: distcom fail >&2; exit 1; }; \
        done

diff --git a/tests/backcompat.test b/tests/backcompat.test
index 9ef4d4ce2a3f286d9d1c3bae8e6bd7d5bf8a5726..9d748f7f6a03fdb5434a96abdd5602c54fda5e9a 100755 (executable)
--- a/tests/backcompat.test
+++ b/tests/backcompat.test
@@ -24,11 +24,11 @@ cat > Makefile.am <<'END'
 
 ## Might be useful for debugging.
 display:
-       ## The following should be substituted by AM_INIT_AUTOMAKE.
+## The following should be substituted by AM_INIT_AUTOMAKE.
        @echo PACKAGE = $(PACKAGE)
        @echo VERSION = $(VERSION)
-       ## The following should not be substituted, as we used the
-       ## old form of AC_INIT.
+## The following should not be substituted, as we used the
+## old form of AC_INIT.
        @echo PACKAGE_NAME = $(PACKAGE_NAME)
        @echo PACKAGE_VERSION = $(PACKAGE_VERSION)
        @echo PACKAGE_TARNAME = $(PACKAGE_TARNAME)

diff --git a/tests/backcompat6.test b/tests/backcompat6.test
index 343fd4e31e4c4f1b0fd333b102fd1406fbf9583f..2cb589e3e6fecc74278c94f104b6d33fc84078a3 100755 (executable)
--- a/tests/backcompat6.test
+++ b/tests/backcompat6.test
@@ -58,9 +58,9 @@ check-local:
        test x'$(VERSION)' = x'nonesuch-0.1'
 if ! CROSS_COMPILING
        ./foo
-       ## Do not anchor the regexps w.r.t. the end of line, because on
-       ## MinGW/MSYS, grep may assume LF line endings only, while our
-       ## `foo' program may generate CRLF line endings.
+## Do not anchor the regexps w.r.t. the end of line, because on
+## MinGW/MSYS, grep may assume LF line endings only, while our
+## `foo' program may generate CRLF line endings.
        ./foo | grep '^PACKAGE = nonesuch-zardoz!'
        ./foo | echo '^VERSION = nonesuch-0\.1!'
 endif

diff --git a/tests/colon7.test b/tests/colon7.test
index 2ab5a4877600034bc74b001e08fce0020d034559..f445dacfb07ed02d0f77c469226545685517f8e7 100755 (executable)
--- a/tests/colon7.test
+++ b/tests/colon7.test
@@ -34,11 +34,11 @@ mkdir subdir
 : > Makefile.am
 : > subdir/foo
 cat > subdir/Makefile.am << 'END'
-.PHONY: test
+# DIST_COMMON should contain `foo', not `subdir/foo'.
 test:
-       ## DIST_COMMON should contain `foo', not `subdir/foo'.
        case '$(DIST_COMMON)' in *subdir/foo*) exit 1;; *) exit 0;; esac
        echo ' ' $(DIST_COMMON) ' ' | grep '[ /]foo '
+.PHONY: test
 END
 
 $ACLOCAL

diff --git a/tests/posixsubst-scripts.test b/tests/posixsubst-scripts.test
index eef7856ae397b21d548f7568de650ff327ea0f70..73babc9738afcea4150e1ccfb52aa9f9175c01a0 100755 (executable)
--- a/tests/posixsubst-scripts.test
+++ b/tests/posixsubst-scripts.test
@@ -56,10 +56,10 @@ test1:
        test -f quux.pl
 test2: distdir
        ls -l $(distdir)
-       ## the scripts foo1.sh and foo2.sh should be distributed
+## The scripts foo1.sh and foo2.sh should be distributed.
        test -f $(distdir)/foo1.sh
        test -f $(distdir)/foo2.sh
-       ## the scripts bar1, bar2 and quux.pl shouldn't be distributed
+## The scripts bar1, bar2 and quux.pl shouldn't be distributed.
        test ! -r $(distdir)/bar1
        test ! -r $(distdir)/bar2
        test ! -r $(distdir)/quux.pl

diff --git a/tests/posixsubst-sources.test b/tests/posixsubst-sources.test
index 62e9d3d81a882c444300c91d43c53d132572e090..36bdd2a8ed7c1e9c4e36e2f134d7fa8822264d6d 100755 (executable)
--- a/tests/posixsubst-sources.test
+++ b/tests/posixsubst-sources.test
@@ -51,11 +51,11 @@ test1:
        test -f baz.c
 test2: distdir
        ls -l $(distdir)
-       ## these sources should be distributed ...
+## These sources should be distributed ...
        test -f $(distdir)/bar.c
        test -f $(distdir)/foo.c
        test -f $(distdir)/main.c
-       ## ... and this shouldn't
+## ... and this shouldn't.
        test ! -r $(distdir)/baz.c
 END