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 96 97 98 99 100 101 102 103
#! /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/>.
# parallel-tests: some checks on console output about testsuite
# progress.
. test-init.sh
cat >> configure.ac << 'END'
AC_OUTPUT
END
cat > Makefile.am << 'END'
XFAIL_TESTS = sub/xpass.test xfail.test error.test
TESTS = $(XFAIL_TESTS) fail.test pass.test a/b/skip.test sub/error2.test
pass.log: fail.log
error.log: pass.log
sub/xpass.log: error.log
sub/error2.log: xfail.log
a/b/skip.log: sub/error2.log
END
cat > exp <<'END'
FAIL: fail.test
PASS: pass.test
ERROR: error.test
XPASS: sub/xpass.test
XFAIL: xfail.test
ERROR: sub/error2.test
SKIP: a/b/skip.test
END
mkdir sub a a/b
cat > pass.test << 'END'
#!/bin/sh
exit 0
END
cp pass.test sub/xpass.test
cat > fail.test << 'END'
#!/bin/sh
exit 1
END
cat > xfail.test << 'END'
#!/bin/sh
# The sleep should ensure expected execution order of tests
# even when make is run in parallel mode.
# Creative quoting below to plase maintainer-check.
sleep '10'
exit 1
END
cat > error.test << 'END'
#!/bin/sh
exit 99
END
cp error.test sub/error2.test
cat > a/b/skip.test << 'END'
#!/bin/sh
exit 77
END
chmod a+x pass.test fail.test xfail.test sub/xpass.test \
a/b/skip.test error.test sub/error2.test
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
for vpath in : false; do
if $vpath; then
mkdir build
cd build
srcdir=..
else
srcdir=.
fi
$srcdir/configure
$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
LC_ALL=C grep '^[A-Z][A-Z]*:' stdout > got
cat got
diff $srcdir/exp got
cd $srcdir
done
: