From ee6eb9fa97eab1c826a2501fad564f5b28bc3cb9 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 11 Apr 2012 19:18:21 +0200 Subject: [PATCH] maintcheck: fix spurious failures * syntax-check.mk (sc_mkinstalldirs): Now the 'mkinstalldirs' is listed in the top-level 'Makefile.am', not in 'lib/Makefile.am'; adjust the "whitelist" accordingly. (sc_ensure_testsuite_has_run): The 'test-suite.log' file created by "make check" is now placed in the top-level directory, not in the 't/' subdirectory. Adjust by using '$(TEST_SUITE_LOG)' instead of an hand-crafted path for the 'test-suite.log' file. Signed-off-by: Stefano Lattarini --- syntax-checks.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax-checks.mk b/syntax-checks.mk index 11b2225..77bb6eb 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -206,7 +206,7 @@ sc_no_for_variable_in_macro: sc_mkinstalldirs: @if grep -n 'mkinstalldirs' $(ams) \ | grep -F -v '$$(mkinstalldirs)' \ - | grep -v '^\./lib/Makefile.am:[0-9][0-9]*: *mkinstalldirs \\$$'; \ + | grep -v '^\./Makefile.am:[0-9][0-9]*: *lib/mkinstalldirs \\$$'; \ then \ echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \ exit 1; \ @@ -500,7 +500,7 @@ sc_tests_no_configure_in: ## AM_RECURSIVE_TARGETS. Suggest keeping test directories around for ## greppability of the Makefile.in files. sc_ensure_testsuite_has_run: - @if test ! -f t/test-suite.log; then \ + @if test ! -f '$(TEST_SUITE_LOG)'; then \ echo 'Run "env keep_testdirs=yes make check" before' \ 'running "make maintainer-check"' >&2; \ exit 1; \ -- 2.7.4