tests: remove FIXME comments from tricks to pacify syntax checks

Originally, I myself had insisted on adding those "FIXME" comments
near every unusual construct or use of "creative quoting" whose
only purpose was to avoid false positive from out syntax checks.
I did that with the expectation that we could have easily and soon
added a whitelisting capability to our maintainer-specific syntax
checks.  This hasn't been the case unfortunately, and now those
"FIXME" in the comments are just distracting noise, making it more
difficult to grep the test cases for stuff that could really use a
fix or an improvement.  So just get rid of them.

* tests/instdir-ltlib.test: Remove that extra "FIXME".
* tests/instdir-prog.test: Likewise.
* tests/parallel-tests3.test: Likewise.
* tests/parallel-tests-dry-run.test: Likewise.
* tests/parallel-tests-console-output.test: Likewise.
* tests/parallel-tests-no-color-in-log.test: Likewise.
* tests/tap-realtime.test: Likewise.
* tests/test-trs-recover.test: Likewise.
* tests/tap-deps.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3fd3bb17061592a05d72077886601b734ee6a1ca..828288bc88dfc2cc275acbe322ea39758b48d07d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: remove FIXME comments from tricks to pacify syntax checks
+       Originally, I myself had insisted on adding those "FIXME" comments
+       near every unusual construct or use of "creative quoting" whose
+       only purpose was to avoid false positive from out syntax checks.
+       I did that with the expectation that we could have easily and soon
+       added a whitelisting capability to our maintainer-specific syntax
+       checks.  This hasn't been the case unfortunately, and now those
+       "FIXME" in the comments are just distracting noise, making it more
+       difficult to grep the test cases for stuff that could really use a
+       fix or an improvement.  So just get rid of them.
+       * tests/instdir-ltlib.test: Remove that extra "FIXME".
+       * tests/instdir-prog.test: Likewise.
+       * tests/parallel-tests3.test: Likewise.
+       * tests/parallel-tests-dry-run.test: Likewise.
+       * tests/parallel-tests-console-output.test: Likewise.
+       * tests/parallel-tests-no-color-in-log.test: Likewise.
+       * tests/tap-realtime.test: Likewise.
+       * tests/test-trs-recover.test: Likewise.
+       * tests/tap-deps.test: Likewise.
+
 2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: few minor fixlets, improvements and tweakings

diff --git a/tests/instdir-ltlib.test b/tests/instdir-ltlib.test
index 6b8e8cac81b4ee623b402959e5e3c1857c36e7f6..bf9330fa2748d035fe432958f70393232d785fcc 100755 (executable)
--- a/tests/instdir-ltlib.test
+++ b/tests/instdir-ltlib.test
@@ -77,11 +77,11 @@ test ! -d "$instdir"
 test ! -d "$destdir"
 $MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
 cat stdout
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
 grep 'rm'' ' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; }
 cat stdout
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
 grep 'rm'' ' stdout && Exit 1
 
 :

diff --git a/tests/instdir-prog.test b/tests/instdir-prog.test
index 3e77b107d26647aac85648a84174483ce488e167..5e7c6a11fe6d4ef195e039e88cc02376aeeb2ac3 100755 (executable)
--- a/tests/instdir-prog.test
+++ b/tests/instdir-prog.test
@@ -76,11 +76,11 @@ test ! -d "$instdir"
 test ! -d "$destdir"
 $MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
 cat stdout
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
 grep 'rm'' ' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; }
 cat stdout
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
 grep 'rm'' ' stdout && Exit 1
 
 :

diff --git a/tests/parallel-tests-console-output.test b/tests/parallel-tests-console-output.test
index 63dd749f951b18f926cd6a08ad3b2b0d25ca900c..93c2429b14687ebcf0e21c2e47e83dd885527f91 100755 (executable)
--- a/tests/parallel-tests-console-output.test
+++ b/tests/parallel-tests-console-output.test
@@ -61,7 +61,7 @@ cat > xfail.test << 'END'
 #!/bin/sh
 # The sleep should ensure expected execution order of tests
 # even when make is run in parallel mode.
-# FIXME: quotes below required by maintainer-check.
+# Creative quoting below to plase maintainer-check.
 sleep '10'
 exit 1
 END

diff --git a/tests/parallel-tests-dry-run.test b/tests/parallel-tests-dry-run.test
index 4791598588d1a3a7eb5296e82b1afaaf273aeeaa..3a136f44493cd4c24d0ae7e28cb82ec734270c5e 100755 (executable)
--- a/tests/parallel-tests-dry-run.test
+++ b/tests/parallel-tests-dry-run.test
@@ -58,7 +58,7 @@ for target in check recheck test-suite.log; do
   test ! -f test-suite.log
 done
 
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
 echo exit '0' > foo.test
 echo exit '1' > bar.test
 
@@ -72,7 +72,7 @@ test -f foo.trs
 test -f foo.log
 test -f bar.trs
 
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
 cat > foo.test <<END
 echo this is bad
 exit 1

diff --git a/tests/parallel-tests-no-color-in-log.test b/tests/parallel-tests-no-color-in-log.test
index 97ef19de506e1566c0862b5405de1757972ba0c7..b69d6e109f138913690724585bf27659f11b8f3a 100755 (executable)
--- a/tests/parallel-tests-no-color-in-log.test
+++ b/tests/parallel-tests-no-color-in-log.test
@@ -26,7 +26,7 @@ esc='\e'
 # GNU or BSD 'grep -a' works on files, but is not portable.
 case `echo "$esc" | $FGREP "$esc"` in
   "$esc") ;;
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
   *) echo "$me: f""grep can't parse nonprinting characters" >&2; Exit 77;;
 esac
 
@@ -43,7 +43,7 @@ TESTS = pass fail skip xpass xfail error
 XFAIL_TESTS = xpass xfail
 END
 
-# FIXME: creative quoting to please maintainer-check.
+# Creative quoting to please maintainer-check.
 echo exit '0' > pass
 echo exit '0' > xpass
 echo exit '1' > fail

diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
index 69ce1c1d19f9af504873631c6621a777826b7e1a..d5275a8f45f7768e24a912de347f5f1a97ff01d1 100755 (executable)
--- a/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@ -38,7 +38,7 @@ for i in 1 2 3 4 5 6 7 8; do
   unindent >foo$i.test <<'END'
     #! /bin/sh
     echo "this is $0"
-    # FIXME: spurious quote to please maintainer-check
+    # Creative quoting below to please maintainer-check.
     sleep '1'
     exit 0
 END

diff --git a/tests/tap-deps.test b/tests/tap-deps.test
index 74612ed53c567755036d40b93ede62769fb0cfb3..dde1208c3c30c9123b44b210bf837ecbddb46fe8 100755 (executable)
--- a/tests/tap-deps.test
+++ b/tests/tap-deps.test
@@ -33,7 +33,8 @@ cat > a.test << 'END'
 #!/bin/sh
 echo 1..2
 echo ok 1
-sleep '3' # FIXME: quotes to please maintainer-check
+# Creative quoting below to please maintainer-check.
+sleep '3'
 echo ok 2
 : > a.run
 END
@@ -46,7 +47,8 @@ if test -f a.run; then
 else
   echo not ok 1
 fi
-sleep '3' # FIXME: quotes to please maintainer-check
+# Creative quoting below to please maintainer-check.
+sleep '3'
 echo ok 2
 : > b.run
 END

diff --git a/tests/tap-realtime.test b/tests/tap-realtime.test
index 2cdcda96ea226c3e9d163d146f4a282cdd58c984..dd4621ce0940243fb930a8b88b307cde54fda12e 100755 (executable)
--- a/tests/tap-realtime.test
+++ b/tests/tap-realtime.test
@@ -44,7 +44,7 @@ cat > all.test <<'END'
 #! /bin/sh
 echo 1..3
 
-# FIXME: creative quoting to placate maintainer-check
+# Creative quoting to placate maintainer-check
 sleep="sleep "3
 
 # The awk+shell implementation of the TAP driver must "read ahead" of one

diff --git a/tests/test-trs-recover.test b/tests/test-trs-recover.test
index fe12a4eb6b7b92fdc49569e8d3126ad7bf0661f5..e498688d09dcebb78500dff3a5e0908ab5aa53bd 100755 (executable)
--- a/tests/test-trs-recover.test
+++ b/tests/test-trs-recover.test
@@ -31,7 +31,7 @@ TESTS = foo.test bar.test baz.test
 TEST_LOG_COMPILER = $(SHELL)
 END
 
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
 echo exit '$TEST_STATUS' > foo.test
 echo exit '$TEST_STATUS' > bar.test
 : > baz.test