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
#! /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/>.
# TAP support:
# - literal "0" and "0.0" in a test description and a TODO/SKIP message
# at the same time
. test-init.sh
. tap-setup.sh
cat > all.test << 'END'
1..14
ok 1 0
ok 2 0.0
ok 3 0 # TODO 0
ok 4 0.0 # TODO 0
ok 5 0 # TODO 0.0
ok 6 0.0 # TODO 0.0
not ok 7 0 # TODO 0
not ok 8 0.0 # TODO 0
not ok 9 0 # TODO 0.0
not ok 10 0.0 # TODO 0.0
ok 11 0 # SKIP 0
ok 12 0.0 # SKIP 0
ok 13 0 # SKIP 0.0
ok 14 0.0 # SKIP 0.0
END
$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=14 pass=2 fail=0 xpass=4 xfail=4 skip=4 error=0
sed '/^ *$/d' > exp << 'END'
PASS: all.test 1 0
PASS: all.test 2 0.0
XPASS: all.test 3 0 # TODO 0
XPASS: all.test 4 0.0 # TODO 0
XPASS: all.test 5 0 # TODO 0.0
XPASS: all.test 6 0.0 # TODO 0.0
XFAIL: all.test 7 0 # TODO 0
XFAIL: all.test 8 0.0 # TODO 0
XFAIL: all.test 9 0 # TODO 0.0
XFAIL: all.test 10 0.0 # TODO 0.0
SKIP: all.test 11 0 # SKIP 0
SKIP: all.test 12 0.0 # SKIP 0
SKIP: all.test 13 0 # SKIP 0.0
SKIP: all.test 14 0.0 # SKIP 0.0
END
$FGREP ': all.test' stdout > got
cat exp
cat got
diff exp got
: