From ffd4ecc946c6b150f5ee5684fa04bd4f9e8b7af9 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 20 May 2013 11:23:01 +0200 Subject: tests: better idiom to override make macro defs on the cmdline We now do so with a new wrapper shell function 'run_make()', which relies on the use of AM_MAKEFLAGS, avoiding the use of the '-e' make option. The use of that option (that causes the environment variables to take precedence over the macro definitions in the Makefile) has proved to be quite brittle in the past, causing annoying and sometimes problematic spurious failures. This has worsened in some still unpublished work going on in development branches. It's time to solve the issue once and for all. Note that we do not convert all uses of $MAKE in the testsuite right away; we might do so in follow-up changes, with leisure, to avoid a "patch bomb" effect (this commit is already too much of a bomb itself). What we do in this commit is to get rid of all "$MAKE -e" invocations. We admit that the implementation and feature-set of 'run_make()' are far from perfect, but good enough for our current purposes. We'll improve 'run_make()' if and when the need arises. * syntax-checks.mk (sc_tests_no_make_e): New syntax check, guard against the use of "$MAKE -e". (syntax_check_rules): Add it. (sc_tests_overriding_macros_on_cmdline): Adjust. (lint): New, alias for 'maintainer-check', for lazy typists. Idea backported from the 'maint' branch (Automake 1.13a). * t/ax/am-test-lib.sh (run_make): New function. Run $MAKE with the given command-line arguments, handling command-line override of variable definitions in a smart way (using AM_MAKEFLAGS if a non-GNU make implementation is detected to be in use). (useless_vpath_rebuild): Adjust to use 'run_make', to avoid a spurious maintainer check failure. (yl_distcheck): Use 'run_make' rather than bare '$MAKE'. (single_quote, append_single_quoted, is_valid_varname): New auxiliary function, used, directly or indirectly, by it. * Many tests: Adjust to avoid the use of "$MAKE -e", and prefer the use of 'run_make' in few other contexts as well, where it makes sense. Other minor fixlets while at it. Signed-off-by: Stefano Lattarini --- t/exeext.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't/exeext.sh') diff --git a/t/exeext.sh b/t/exeext.sh index 35b1a2109..604e9a5fe 100644 --- a/t/exeext.sh +++ b/t/exeext.sh @@ -69,7 +69,7 @@ grep 'maude3__EXEEXT__OBJECTS' Makefile.in && exit 1 ./configure -EXEEXT=.foo $MAKE -e print > stdout +run_make EXEEXT=.foo print > stdout cat stdout grep '1BEG: maude.foo mt.foo :END1' stdout @@ -79,7 +79,7 @@ grep '4BEG: rmt.foo :END4' stdout ./configure revert=yes -EXEEXT=.foo $MAKE -e print > stdout +run_make EXEEXT=.foo print > stdout cat stdout grep '1BEG: maude.foo :END1' stdout -- cgit v1.2.1