From 57d09886b9ed8d37754357eb8d820d5ecad6f29e Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 2 Mar 2012 22:50:21 +0100 Subject: [PATCH] maintcheck: fix few spurious failures * syntax-checks.mk: Fix some spurious failures by tightening and/or tweaking few checks so that some false positives end up whitelisted. --- syntax-checks.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/syntax-checks.mk b/syntax-checks.mk index 7ec980a..d9d0c4d 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -187,6 +187,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 -E '\)'; \ then \ echo "Suspicious 'rm' invocation." 1>&2; \ @@ -282,8 +283,10 @@ sc_AMDEP_TRUE_in_automake_in: ## Recursive make invocations should always pass $(AM_MAKEFLAGS) ## to $(MAKE), for portability to non-GNU make. sc_tests_make_without_am_makeflags: - @if grep '^[^#].*(MAKE) ' $(ams) $(srcdir)/automake.in | \ - grep -v 'AM_MAKEFLAGS'; then \ + @if grep '^[^#].*(MAKE) ' $(ams) $(srcdir)/automake.in \ + | grep -v 'AM_MAKEFLAGS' \ + | grep -v '/am/header-vars\.am:.*am--echo.*| $$(MAKE) -f *-'; \ + then \ echo 'Use $$(MAKE) $$(AM_MAKEFLAGS).' 1>&2; \ exit 1; \ fi @@ -365,7 +368,7 @@ sc_tests_plain_autom4te: ## Tests should only use END and EOF for here documents ## (so that the next test is effective). sc_tests_here_document_format: - @if grep '<<' $(xtests) | grep -v 'END' | grep -v 'EOF'; then \ + @if grep '<<' $(xtests) | grep -Ev '\b(END|EOF)\b|\bstd::cout <<'; then \ echo 'Use here documents with "END" and "EOF" only, for greppability.' 1>&2; \ exit 1; \ fi -- 2.7.4