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
#! /bin/sh
# Copyright (C) 2011-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 parallel-tests features:
# - empty TESTS
# - empty TEST_LOGS
. test-init.sh
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
SUBDIRS = sub1 sub2
END
mkdir sub1 sub2
cat > sub1/Makefile.am << 'END'
TESTS =
END
# When $(TESTS) is empty, NetBSD 5.1 make ends up defining $(TESTS_LOGS)
# to ".log" rather than to the empty string (as would be expected).
# But our recipes are smart enough to work around such a botched-up
# substitution, so let's not bother too much about it.
if using_gmake; then
unindent >> sub1/Makefile.am << 'END'
check-local:
echo $(TEST_LOGS) | grep . && exit 1; exit 0
END
fi
cat > sub2/Makefile.am << 'END'
TESTS = foo.test
END
cat > sub2/foo.test <<'END'
#! /bin/sh
exit 0
END
chmod a+x sub2/foo.test
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
no_test_has_run ()
{
ls -1 *.log | grep -v '^test-suite\.log$' | grep . && exit 1
grep '^# TOTAL: *0$' test-suite.log
:
}
for vpath in : false; do
if $vpath; then
mkdir build
cd build
srcdir=..
else
srcdir=.
fi
$srcdir/configure
cd sub1
VERBOSE=yes $MAKE check
no_test_has_run
cd ../sub2
VERBOSE=yes TESTS='' $MAKE -e check
no_test_has_run
VERBOSE=yes TEST_LOGS='' $MAKE -e check
no_test_has_run
cd ..
$MAKE check
cat sub2/foo.log
$MAKE distclean
cd $srcdir
done
: