From 608ba821f480ad3e0b5b1a10baf0ebea6b85eb34 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 20 May 2013 10:53:11 +0200 Subject: [PATCH] maintcheck: minor tweaks and fixlets * syntax-checks.mk: Here. Signed-off-by: Stefano Lattarini --- syntax-checks.mk | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/syntax-checks.mk b/syntax-checks.mk index 9cd46cad7..8808ae7e3 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -207,8 +207,7 @@ sc_AMDEP_TRUE_in_automake_in: ## 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' \ - | grep -v '/am/header-vars\.am:.*am--echo.*| $$(MAKE) -f *-'; \ + | grep -Fv '$$(AM_MAKEFLAGS)'; \ then \ echo 'Use $$(MAKE) $$(AM_MAKEFLAGS).' 1>&2; \ exit 1; \ @@ -346,11 +345,11 @@ sc_tests_automake_fails: exit 1; \ fi -## Setting 'required' after sourcing './defs' is a bug. +## Setting 'required' after sourcing 'test-init.sh' is a bug. sc_tests_required_after_defs: @for file in $(xtests); do \ - if out=`sed -n '/defs/,$${/required=/p;}' $$file`; test -n "$$out"; then \ - echo 'Do not set "required" after sourcing "defs" in '"$$file: $$out" 1>&2; \ + if out=`sed -n '/test-init\.sh/,$${/required=/p;}' $$file`; test -n "$$out"; then \ + echo 'Do not set "required" after sourcing "test-init.sh" in '"$$file: $$out" 1>&2; \ exit 1; \ fi; \ done @@ -402,7 +401,7 @@ sc_tests_ls_t: fi ## Never use 'sleep 1' to create files with different timestamps. -## Use '$sleep' instead. Some filesystems (e.g., Windows) have only +## Use '$sleep' instead. Some file systems (e.g., Windows) have only ## a 2sec resolution. sc_tests_plain_sleep: @if grep -E '\bsleep +[12345]\b' $(xtests); then \ -- 2.47.2