summaryrefslogtreecommitdiff
path: root/t/instdir-prog.sh
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2013-05-20 11:23:01 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2013-05-22 00:05:06 +0200
commitffd4ecc946c6b150f5ee5684fa04bd4f9e8b7af9 (patch)
tree72baf668f0a9a464de82c11eb5c610a411cb334a /t/instdir-prog.sh
parent12cfd38f0d234af0922408bdd5a95e590d0d8e84 (diff)
downloadautomake-ffd4ecc946c6b150f5ee5684fa04bd4f9e8b7af9.tar.gz
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 <stefano.lattarini@gmail.com>
Diffstat (limited to 't/instdir-prog.sh')
-rw-r--r--t/instdir-prog.sh17
1 files changed, 8 insertions, 9 deletions
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
index 2fa14e5c3..2c57157a9 100644
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@ -68,20 +68,19 @@ cd build
am_cv_python_pyexecdir="$instdir/pyexec"
$MAKE
-bindir= libdir= pyexecdir=
-export bindir libdir pyexecdir
-$MAKE -e install
+nukedirs='bindir= libdir= pyexecdir='
+
+run_make $nukedirs install
test ! -e "$instdir"
-$MAKE -e install DESTDIR="$destdir"
+run_make $nukedirs install DESTDIR="$destdir"
test ! -e "$instdir"
test ! -e "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; exit 1; }
-cat stdout
-# Creative quoting below to please maintainer-check.
-grep 'rm'' ' stdout && exit 1
-$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; }
+run_make $nukedirs uninstall > stdout \
+ || { cat stdout; exit 1; }
cat stdout
# Creative quoting below to please maintainer-check.
grep 'rm'' ' stdout && exit 1
+run_make $nukedirs uninstall DESTDIR="$destdir" > stdout \
+ || { cat stdout; exit 1; }
: