Hash :
ffd4ecc9
Author :
Date :
2013-05-20T11:23:01
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>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121
#! /bin/sh
# Copyright (C) 2012-2013 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# An empty "foo_PRIMARY" declaration should *not* cause "make install"
# to create directory $(foodir). See automake bug#10997 and bug#11030.
. test-init.sh
cat >> configure.ac <<'END'
AC_SUBST([CC], [whatever])
AC_SUBST([JAVAC], [whatever])
AM_PATH_PYTHON(,,:)
AC_OUTPUT
END
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = no-dependencies
mydir = $(prefix)/my
myexecdir = $(prefix)/myexec
javadir = $(prefix)/java
END
# Write Makefile.am.
{
for dir in sbin bin libexec pkglibexec myexec; do
for dst in '' dist_ nodist_; do
echo "${dst}${dir}_SCRIPTS ="
done
echo "${dir}_PROGRAMS ="
done
for dir in lib pkglib myexec my; do
echo "${dir}_LIBRARIES ="
echo "${dir}_LTLIBRARIES ="
done
for p1 in '' notrans_; do
for p2 in '' dist_ nodist_; do
for s in '' 1 2 3 4 5 6 7 8 9; do
echo "${p1}${p2}man${s}_MANS ="
done
done
done
for dst in '' dist_ nodist_; do
for dir in dataroot data pkgdata doc lisp my; do
echo "${dst}${dir}_DATA ="
done
for dir in include pkginclude oldinclude my; do
echo "${dst}${dir}_HEADERS ="
done
for dir in python my; do
echo "${dst}${dir}_PYTHON ="
done
for dir in info my; do
echo "${dst}${dir}_TEXINFOS ="
done
for dir in java my; do
echo "${dst}${dir}_JAVA ="
done
for dir in lisp my; do
echo "${dst}${dir}_LISP ="
done
done
} > t
cat t >> Makefile.am
sed 's/^/nobase_/' t >> Makefile.am
rm -f t
cat Makefile.am # For debugging.
# Sanity check.
grep '^oldinclude_HEADERS =' Makefile.am \
&& grep '^nodist_my_PYTHON =' Makefile.am \
&& grep '^notrans_dist_man5_MANS =' Makefile.am \
|| fatal_ "creating Makefile.am"
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
cwd=$(pwd) || fatal_ "getting current working directory"
doinst ()
{
run_make install install-pdf install-ps install-dvi ${1+"$@"}
}
: > foo.sh
./configure --prefix="$cwd/inst"
doinst
test ! -e inst || { find inst; exit 1; }
$MAKE uninstall
doinst bin_SCRIPTS=foo.sh
test -f inst/bin/foo.sh
./configure
doinst DESTDIR="$cwd/dest"
test ! -e dest || { find dest; exit 1; }
$MAKE uninstall
doinst DESTDIR="$cwd/dest" bin_SCRIPTS=foo.sh
test -f dest/usr/local/bin/foo.sh
: