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 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
#! /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 user recursion works with "make -k".
. test-init.sh
cat >> configure.ac <<'END'
AM_EXTRA_RECURSIVE_TARGETS([foo])
AC_CONFIG_FILES([
sub1/Makefile
sub1/subsub1/Makefile
sub2/Makefile
sub2/subsub2/Makefile
sub3/Makefile
])
FAIL='@echo "FAIL $@ in `pwd`"; exit 1'
PASS='@echo "PASS $@ in `pwd`"; : > foo'
AC_SUBST([FAIL])
AC_SUBST([PASS])
AC_OUTPUT
END
mkdir sub1 sub1/subsub1 sub2 sub2/subsub2 sub3
cat > Makefile.am <<'END'
SUBDIRS = sub1 . sub2 sub3
foo-local:; @FAIL@
END
cat > sub1/Makefile.am <<'END'
SUBDIRS = subsub1
foo-local:; @PASS@
END
cat > sub2/Makefile.am <<'END'
SUBDIRS = subsub2
foo-local:; @FAIL@
END
echo 'foo-local:; @FAIL@' > sub1/subsub1/Makefile.am
echo 'foo-local:; @PASS@' > sub2/subsub2/Makefile.am
echo 'foo-local:; @PASS@' > sub3/Makefile.am
$ACLOCAL
$AUTOCONF
$AUTOMAKE
./configure
cat > exp <<END
./sub1/foo
./sub2/subsub2/foo
./sub3/foo
END
as_expected ()
{
find . -name foo > t || { cat t; exit 1; }
LC_ALL=C sort t > got
cat exp
cat got
diff exp got
}
# Without "-k", we fail in 'sub1/subsub1', and do nothing else.
# So, no 'foo' file gets created.
$MAKE foo && exit 1
find . -name foo | grep . && exit 1
if using_gmake; then
$MAKE -k foo && exit 1
as_expected
$MAKE --keep-going foo && exit 1
as_expected
else
# Don't trust the exit status of 'make -k' for non-GNU makes.
$MAKE -k foo || :
as_expected
fi
: