diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-11 21:27:12 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-11 21:27:12 +0200 |
| commit | c8ec1527547db12de96d7e67e2980e29ebb4ba57 (patch) | |
| tree | 1c2e6469abf534430b4b2c4dc89af9ea475f018d | |
| parent | c45604a7135b5301f8777b006f668f996aaac1a2 (diff) | |
| parent | 511b6896793aa4b6b76e9c220c7c7cab58ed7ae7 (diff) | |
| download | automake-c8ec1527547db12de96d7e67e2980e29ebb4ba57.tar.gz | |
Merge branch 'subdir-objects-pr10697' into maint
* subdir-objects-pr10697:
maintcheck: fix failures, both real and spurious
| -rw-r--r-- | syntax-checks.mk | 2 | ||||
| -rwxr-xr-x | t/subobj-clean-lt-pr10697.sh | 2 | ||||
| -rwxr-xr-x | t/subobj-clean-pr10697.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/syntax-checks.mk b/syntax-checks.mk index 4b226a0bd..c09156e8f 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 0d8e4d05e..cfebc998d 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 7ed07d643..69abc107b 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 |