From ed75689e10bfa552c0408754d1b8dde40aa707aa Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 16 Dec 2010 19:58:21 +0100 Subject: [PATCH] Avoid false positive in sc_tests_plain_make maintainer-check. * Makefile.am (sc_tests_plain_make): Ensure to only match full `make' words. Avoid false positive with remake11.test. Signed-off-by: Ralf Wildenhues --- ChangeLog | 6 ++++++ Makefile.am | 2 +- Makefile.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d605b228d..7b73d0a31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-12-16 Ralf Wildenhues + + Avoid false positive in sc_tests_plain_make maintainer-check. + * Makefile.am (sc_tests_plain_make): Ensure to only match full + `make' words. Avoid false positive with remake11.test. + 2010-12-06 Stefano Lattarini Tests: extend checks on remake rules. diff --git a/Makefile.am b/Makefile.am index d19d974be..8aed8d06f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -287,7 +287,7 @@ sc_tests_make_without_am_makeflags: ## Tests should never call make directly. sc_tests_plain_make: - @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*make'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | $(EGREP) ':[ ]*make( |$$)'; then \ echo 'Do not run "make" in the above tests. Use "$$MAKE" instead.' 1>&2; \ exit 1; \ fi diff --git a/Makefile.in b/Makefile.in index 241f9743e..9b6c6d19d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -993,7 +993,7 @@ sc_tests_make_without_am_makeflags: fi sc_tests_plain_make: - @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*make'; then \ + @if grep -v '^#' $(srcdir)/tests/*.test | $(EGREP) ':[ ]*make( |$$)'; then \ echo 'Do not run "make" in the above tests. Use "$$MAKE" instead.' 1>&2; \ exit 1; \ fi -- 2.47.2