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.

8 files changed, 32 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 3879c5a9e..3688e3b47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 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
 	* tests/lisp2.test: Prettify, and improve debugging output.  Make
 	grepping of automake stderr stricter.
diff --git a/tests/autodist-subdir.test b/tests/autodist-subdir.test
index 6c0a1d5f2..fd2f28304 100755
--- 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 f6fa6fd03..f2b31ab27 100755
--- 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 9ef4d4ce2..9d748f7f6 100755
--- 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 343fd4e31..2cb589e3e 100755
--- 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 2ab5a4877..f445dacfb 100755
--- 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 eef7856ae..73babc973 100755
--- 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 62e9d3d81..36bdd2a8e 100755
--- 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