Hash :
5ddf1007
Author :
Date :
2012-10-27T16:41:39
tests: prefer including 'test-init.sh' rather than './defs'
This is a follow-up to today's commit v1.12.4-22-g0610fc8,
"tests: prepare to move ./defs to t/ax/test-init.sh"
* All tests: To run the common setup, use the command:
. test-init.sh
instead of the older, "historical" one:
. ./defs || exit 1
Note that the "|| exit 1" wasn't really useful, since the 'errexit'
shell flag is in effect in both './defs' and 'test-init.sh', and all
the known shells that are good enough to run the automake testsuite
do automatically exit with error when a sourced file cannot be found
(at least, they do so in non-interactive mode, which is the only
mode that concerns us in the testsuite).
* t/ax/tap-summary-aux.sh, t/ax/testsuite-summary-checks.sh: Likewise.
* gen-testsuite-part: Do the same in the generated tests.
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
#! /bin/sh
# Copyright (C) 2012 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/>.
# Check that "aclocal --install" creates the local m4 directory if
# necessary.
# FIXME: this is a good candidate for a conversion to TAP.
am_create_testdir=empty
. test-init.sh
cat > configure.ac <<END
AC_INIT([$me], [1.0])
MY_MACRO
END
mkdir sys-acdir
cat > sys-acdir/my-defs.m4 <<END
AC_DEFUN([MY_MACRO], [:])
END
ACLOCAL="$ACLOCAL --system-acdir=sys-acdir"
$ACLOCAL -I foo --install
test -f foo/my-defs.m4
$ACLOCAL --install -I "$(pwd)/bar"
test -f bar/my-defs.m4
$ACLOCAL --install -I baz/sub/sub2
test -f baz/sub/sub2/my-defs.m4
# What should happen:
# * zardoz1 should be created, and required m4 files copied into there.
# * zardoz2 shouldn't be preferred to quux, even if the former exists
# while the latter does not.
mkdir zardoz2
$ACLOCAL --install -I zardoz1 -I zardoz2
test -d zardoz1
grep MY_MACRO zardoz1/my-defs.m4
ls zardoz2 | grep . && exit 1
# Directories in ACLOCAL_PATH should never be created if they don't
# exist.
ACLOCAL_PATH="$(pwd)/none:$(pwd)/none2" $ACLOCAL --install && exit 1
test ! -e none
test ! -e none2
ACLOCAL_PATH="$(pwd)/none:$(pwd)/none2" $ACLOCAL --install -I x
test -f x/my-defs.m4
test ! -e none
test ! -e none2
# It's better if aclocal doesn't create the first include dir on failure.
$ACLOCAL --install -I none -I none2 && exit 1
test ! -e none
test ! -e none2
: