[FYI] {test-protocols} maintcheck: fix more maintainer-check failures

[Stefano Lattarini]

* tests/test-driver-custom-no-html.test (no-rst): Use `EOF',
not `EoL', as the here-document delimiter.
* tests/test-trs-basic.test: Use `cat + here-doc' rather
than `echo' when creating the dummy test scripts, to please
maintainer-check.
* tests/test-trs-recover.test: Use creative quoting where
needed, to please maintainer-check.
* tests/parallel-tests-no-color-in-log.test: Likewise.
* tests/parallel-tests-dry-run.test: Likewise.
---
 ChangeLog                                 |   13 +++++++++++++
 tests/parallel-tests-dry-run.test         |    5 +++--
 tests/parallel-tests-no-color-in-log.test |    3 ++-
 tests/test-driver-custom-no-html.test     |    4 ++--
 tests/test-trs-basic.test                 |    7 +++++--
 tests/test-trs-recover.test               |    5 +++--
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 829ee35..2d51a28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2011-08-03  Stefano Lattarini  <address@hidden>
 
+       maintcheck: fix more maintainer-check failures
+       * tests/test-driver-custom-no-html.test (no-rst): Use `EOF',
+       not `EoL', as the here-document delimiter.
+       * tests/test-trs-basic.test: Use `cat + here-doc' rather
+       than `echo' when creating the dummy test scripts, to please
+       maintainer-check.
+       * tests/test-trs-recover.test: Use creative quoting where
+       needed, to please maintainer-check.
+       * tests/parallel-tests-no-color-in-log.test: Likewise.
+       * tests/parallel-tests-dry-run.test: Likewise.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
        maintcheck: fix maintainer-check failures, both real and spurious
        * tests/amhello-binpkg.test: Use "$MAKE", not bare "make".
        * Makefile.am (sc_perl_local): Also allow perl special variable
diff --git a/tests/parallel-tests-dry-run.test 
b/tests/parallel-tests-dry-run.test
index 451f782..92a5c51 100755
--- a/tests/parallel-tests-dry-run.test
+++ b/tests/parallel-tests-dry-run.test
@@ -58,8 +58,9 @@ for target in check recheck test-suite.log; do
   test ! -f test-suite.log
 done
 
-echo 'exit 0' > foo.test
-echo 'exit 1' > bar.test
+# FIXME: creative quoting below to please maintainer-check.
+echo exit '0' > foo.test
+echo exit '1' > bar.test
 
 $MAKE check && Exit 1
 
diff --git a/tests/parallel-tests-no-color-in-log.test 
b/tests/parallel-tests-no-color-in-log.test
index ab3f371..5d33ac5 100755
--- a/tests/parallel-tests-no-color-in-log.test
+++ b/tests/parallel-tests-no-color-in-log.test
@@ -26,7 +26,8 @@ esc=''
 # GNU or BSD 'grep -a' works on files, but is not portable.
 case `echo "$esc" | $FGREP "$esc"` in
   "$esc") ;;
-  *) echo "$me: fgrep can't parse nonprinting characters" >&2; Exit 77;;
+# FIXME: creative quoting below to please maintainer-check.
+  *) echo "$me: f""grep can't parse nonprinting characters" >&2; Exit 77;;
 esac
 
 TERM=ansi; export TERM
diff --git a/tests/test-driver-custom-no-html.test 
b/tests/test-driver-custom-no-html.test
index 1a2b726..2c86026 100755
--- a/tests/test-driver-custom-no-html.test
+++ b/tests/test-driver-custom-no-html.test
@@ -39,13 +39,13 @@ echo ':test-result: SKIP' > foo.trs
 echo ':copy-in-global-log: yes' >> foo.trs
 # The genereted log file is deliberately syntactically invalid
 # reStructuredText.
-cat > foo.log <<'EoL'
+cat > foo.log <<'EOF'
 SKIP: FooBar
 =============
 
 --------------
  dummy title
-EoL
+EOF
 END
 chmod a+x no-rst
 
diff --git a/tests/test-trs-basic.test b/tests/test-trs-basic.test
index 33367d3..88f1276 100755
--- a/tests/test-trs-basic.test
+++ b/tests/test-trs-basic.test
@@ -36,9 +36,12 @@ tb:
        echo $(am__TEST_BASES) > $@
 END
 
-mkdir sub
-echo 'exit $FOO_STATUS' > foo.test
+cat > foo.test << 'END'
+#! /bin/sh
+exit $FOO_STATUS
+END
 : > bar.sh
+mkdir sub
 : > sub/zardoz.test
 
 FOO_STATUS=0; export FOO_STATUS
diff --git a/tests/test-trs-recover.test b/tests/test-trs-recover.test
index 7fff3ae..9893424 100755
--- a/tests/test-trs-recover.test
+++ b/tests/test-trs-recover.test
@@ -31,8 +31,9 @@ TESTS = foo.test bar.test baz.test
 TEST_LOG_COMPILER = $(SHELL)
 END
 
-echo 'exit $TEST_STATUS' > foo.test
-echo 'exit $TEST_STATUS' > bar.test
+# FIXME: creative quoting below to please maintainer-check.
+echo exit '$TEST_STATUS' > foo.test
+echo exit '$TEST_STATUS' > bar.test
 : > baz.test
 
 TEST_STATUS=0; export TEST_STATUS
-- 
1.7.2.3