From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 2 Jun 2011 10:47:58 +0000 (+0200)
Subject: maintcheck: fix some more failures
X-Git-Tag: ng-0.5a~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07d878b42df4a4d197d8f586be108666a26a0ba1;p=thirdparty%2Fautomake.git

maintcheck: fix some more failures

* tests/instdir-ltlib.test: Use creative quoting to avoid
spuriously triggering the `sc_rm_minus_f' maintainer check.
* tests/instdir-prog.test: Likewise.
* tests/instspc-data.test: Use creative quoting to avoid
spuriously triggering the `sc_tests_Exit_not_exit' maintainer
check.
---

diff --git a/ChangeLog b/ChangeLog
index a022fd921..b10c28acc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	maintcheck: fix some more failures
+	* tests/instdir-ltlib.test: Use creative quoting to avoid
+	spuriously triggering the `sc_rm_minus_f' maintainer check.
+	* tests/instdir-prog.test: Likewise.
+	* tests/instspc-data.test: Use creative quoting to avoid
+	spuriously triggering the `sc_tests_Exit_not_exit' maintainer
+	check.
+
 2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	maintcheck: fix some failures, extend some checks
diff --git a/tests/instdir-ltlib.test b/tests/instdir-ltlib.test
index a90536dbd..25f68dda3 100755
--- a/tests/instdir-ltlib.test
+++ b/tests/instdir-ltlib.test
@@ -76,9 +76,11 @@ test ! -d "$instdir"
 test ! -d "$destdir"
 $MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'rm ' stdout && Exit 1
+# FIXME: creative quoting below to please maintainer-check.
+grep 'rm'' ' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'rm ' stdout && Exit 1
+# FIXME: 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 eb52933ae..77fc2a04c 100755
--- a/tests/instdir-prog.test
+++ b/tests/instdir-prog.test
@@ -74,9 +74,11 @@ test ! -d "$instdir"
 test ! -d "$destdir"
 $MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'rm ' stdout && Exit 1
+# FIXME: creative quoting below to please maintainer-check.
+grep 'rm'' ' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'rm ' stdout && Exit 1
+# FIXME: creative quoting below to please maintainer-check.
+grep 'rm'' ' stdout && Exit 1
 
 :
diff --git a/tests/instspc-data.test b/tests/instspc-data.test
index 1c165d836..9af473a8b 100755
--- a/tests/instspc-data.test
+++ b/tests/instspc-data.test
@@ -19,8 +19,9 @@
 # script `instspc-test.sh'.
 
 # Ensure proper definition of $testsrcdir.
-. ./defs-static || exit 99
-test -n "$testsrcdir" || exit 99 # sanity check
+# FIXME: we employ useless quoting below to please maintainer-check.
+. ./defs-static || 'exit' 99
+test -n "$testsrcdir" || 'exit' 99 # Sanity check.
 
 instspc_action=generate-data
 . $testsrcdir/instspc-tests.sh