maintcheck: fix failures, both real and spurious

* syntax-checks.mk (sc_rm_minus_f): Whitelist the
't/subobj-clean*-pr10697.sh' tests.
* t/subobj-clean-pr10697.sh: When redefining PATH,
use '$PATH_SEPARATOR', not hard-coded ':'.
* t/subobj-clean-lt-pr10697.sh: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/syntax-checks.mk b/syntax-checks.mk
index 4b226a0bd459fd20b9fbdce393c768b9de81c014..c09156e8fcfc84b7336618736f5f9bd8cbaccaf5 100644 (file)
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -169,7 +169,7 @@ sc_no_brace_variable_expansions:
 ## Make sure 'rm' is called with '-f'.
 sc_rm_minus_f:
        @if grep -v '^#' $(ams) $(xtests) \
-          | grep -v '/spy-rm\.tap:' \
+          | grep -vE '/(spy-rm\.tap|subobj-clean.*-pr10697\.sh):' \
           | grep -E '\<rm ([^-]|\-[^f ]*\>)'; \
        then \
          echo "Suspicious 'rm' invocation." 1>&2; \

diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
index 0d8e4d05e0cf34d56cd11f3d608eb6504fcad72e..cfebc998d0e68f2bc26edbb97e822d6d011a0a5c 100755 (executable)
--- a/t/subobj-clean-lt-pr10697.sh
+++ b/t/subobj-clean-lt-pr10697.sh
@@ -112,7 +112,7 @@ OBJEXT=lo
 $MAKE
 
 # This must go after configure, since that will invoke rm many times.
-PATH=$ocwd/rm-wrap:$PATH; export PATH
+PATH=$ocwd/rm-wrap$PATH_SEPARATOR$PATH; export PATH
 $MAKE sanity-check-rm || fatal_ "rm wrapper doesn't work as expected"
 
 $MAKE mostlyclean

diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
index 7ed07d643a1cc35cd1d8c3a72ec5e3bc51783102..69abc107bae1759a178f25e4ebf0cf50279a250e 100755 (executable)
--- a/t/subobj-clean-pr10697.sh
+++ b/t/subobj-clean-pr10697.sh
@@ -108,7 +108,7 @@ test -f get-objext.sh
 $MAKE
 
 # This must go after configure, since that will invoke rm many times.
-PATH=$ocwd/rm-wrap:$PATH; export PATH
+PATH=$ocwd/rm-wrap$PATH_SEPARATOR$PATH; export PATH
 $MAKE sanity-check-rm || fatal_ "rm wrapper doesn't work as expected"
 
 $MAKE mostlyclean