* 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.lattar...@gmail.com>
---
syntax-checks.mk | 2 +-
t/subobj-clean-lt-pr10697.sh | 2 +-
t/subobj-clean-pr10697.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 4b226a0..c09156e 100644
--- 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 0d8e4d0..cfebc99 100755
--- 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 7ed07d6..69abc10 100755
--- 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
--
1.7.9.5
