Hash :
6483ac07
Author :
Date :
2011-08-01T16:14:44
testsuite: optimize tests on TAP for speed and against duplication The creation and configuration of common files and data used by many tests on TAP is, with this change, factored out into a new dedicated auxiliary test, from which those tests will depend upon. This reduces code duplication in tests and, more importantly, offers a noticeable speedup in the involved tests (30-40%). * tests/tap-common-setup.test: New test, setting up the common files and data used by various tests on TAP support. * tests/tap-setup.sh: New file, to be sourced by tests wanting to bring in data generated by `tap-common-setup.test'. * tests/tap-autonumber.test: Update to use the pre-computed data files. * tests/tap-bailout.test: Likewise. * tests/tap-color.test: Likewise. * tests/tap-deps.test: Likewise. * tests/tap-diagnostic.test: Likewise. * tests/tap-empty-diagnostic.test: Likewise. * tests/tap-empty.test: Likewise. * tests/tap-escape-directive.test: Likewise. * tests/tap-exit.test: Likewise. * tests/tap-signal.test: Likewise. * tests/tap-fancy.test: Likewise. * tests/tap-fancy2.test: Likewise. * tests/tap-global-log.test: Likewise. * tests/tap-global-result.test: Likewise. * tests/tap-html.test: Likewise. * tests/tap-log.test: Likewise. * tests/tap-merge-stdout-stderr.test: Likewise. * tests/tap-no-merge-stdout-stderr.test: Likewise. * tests/tap-message-0.test: Likewise. * tests/tap-no-disable-hard-error.test: Likewise. * tests/tap-no-spurious-summary.test: Likewise. * tests/tap-no-spurious.test: Likewise. * tests/tap-not-ok-skip.test: Likewise. * tests/tap-numeric-description.test: Likewise. * tests/tap-out-of-order.test: Likewise. * tests/tap-passthrough.test: Likewise. * tests/tap-passthrough-exit.test: Likewise. * tests/tap-plan.test: Likewise. * tests/tap-plan-corner.test: Likewise. * tests/tap-plan-corner2.test: Likewise. * tests/tap-plan-errors.test: Likewise. * tests/tap-realtime.test: Likewise. * tests/tap-recheck-logs.test: Likewise. * tests/tap-skip-whole.test: Likewise. * tests/tap-todo-skip-together.test: Likewise. * tests/tap-todo-skip-whitespace.test: Likewise. * tests/tap-todo-skip.test: Likewise. * tests/tap-unplanned.test: Likewise. * tests/tap-with-and-without-number.test: Likewise. * tests/tap-xfail-tests.test: Likewise. * tests/tap-skip-whole-whitespace.test: Likewise, and remove redundant definitions of `$sp' and `$tab' (they are already defined in `tests/defs'). * tests/tap-whitespace-normalization.test: Likewise. * tests/Makefile.am (TESTS): Update. (EXTRA_DIST): Distribute `tap-setup.sh'. (tap_with_common_setup_tests, tap_with_common_setup_logs)): New variables, holding respectively the list of tests using the files pre-computed by `tap-common-setup.test', and the list of their corresponding log files. (tap_other_tests): New variable, holding the list of other tests on TAP support. ($(tap_with_common_setup_logs)): Depend on `tap-common-setup.log' and `tap-setup.sh'.
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 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165
#! /bin/sh
# Copyright (C) 2011 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: whitespace normalization (or lack thereof) in the testsuite
# progress output on console. We keep all these checks here in a single
# script so that a potential cosmetic change in the output format won't
# force us to tweak dozens of other tests (hopefully).
# See also related test 'tap-todo-skip-whitespace.test'.
parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am << 'END'
TEST_LOG_COMPILER = cat
TESTS =
END
: > exp
spaces_a=${sp}${tab}${tab}${sp}${sp}${tab}
spaces_b=${tab}${tab}${sp}${tab}${sp}${sp}${sp}
#-----------------------------------------------------------------------
echo TESTS += numbers.test >> Makefile.am
cat > numbers.test <<END
1..6
ok${spaces_a}1
ok 2${spaces_b}
ok${spaces_a}3${spaces_b}
not ok${spaces_b}4
not ok 5${spaces_a}
not ok${spaces_b}6${spaces_a}
END
cat >> exp <<END
PASS: numbers.test 1
PASS: numbers.test 2
PASS: numbers.test 3
FAIL: numbers.test 4
FAIL: numbers.test 5
FAIL: numbers.test 6
END
#-----------------------------------------------------------------------
echo TESTS += description.test >> Makefile.am
cat > description.test <<END
1..8
ok${spaces_a}+foo
ok +bar${spaces_b}
ok${spaces_a}+baz${spaces_b}
not ok${spaces_b}-foo
not ok -bar${spaces_a}
not ok${spaces_b}-baz${spaces_a}
ok u${spaces_b}v${spaces_a}w${sp}
not ok${spaces_a}x${spaces_a}y${tab}z${tab}
END
cat >> exp <<END
PASS: description.test 1 +foo
PASS: description.test 2 +bar
PASS: description.test 3 +baz
FAIL: description.test 4 -foo
FAIL: description.test 5 -bar
FAIL: description.test 6 -baz
PASS: description.test 7 u${spaces_b}v${spaces_a}w
FAIL: description.test 8 x${spaces_a}y${tab}z
END
#-----------------------------------------------------------------------
# "Bail out!" magic.
echo TESTS += bailout.test >> Makefile.am
cat > bailout.test <<END
1..1
Bail out!${tab}${sp}${sp}${tab}We're out of disk space.
ok 1
END
cat >> exp <<END
ERROR: bailout.test - Bail out! We're out of disk space.
END
echo TESTS += bailout2.test >> Makefile.am
cat > bailout2.test <<END
1..1
Bail out!foo${tab}${sp}
ok 1
END
cat >> exp <<END
ERROR: bailout2.test - Bail out! foo
END
#-----------------------------------------------------------------------
# Diagnostic lines.
echo AM_TEST_LOG_DRIVER_FLAGS = --comments >> Makefile.am
echo TESTS += cmnt.test >> Makefile.am
cat > cmnt.test <<END
1..1
ok 1
#Leading whitespace gets added
# ${tab}${tab} ${tab}Extra leading whitespace is stripped
# Trailing whitespace is stripped ${tab} ${tab}${tab}
# Middle${tab}whitespace is${tab} ${tab}${tab} kept
# ${tab} And only${tab}middle ${tab}whitespace ${tab}${tab} ${tab}
END
cat >> exp <<END
PASS: cmnt.test 1
# cmnt.test: Leading whitespace gets added
# cmnt.test: Extra leading whitespace is stripped
# cmnt.test: Trailing whitespace is stripped
# cmnt.test: Middle${tab}whitespace is${tab} ${tab}${tab} kept
# cmnt.test: And only${tab}middle ${tab}whitespace
END
#-----------------------------------------------------------------------
# TODO: we should have more checks here ... (but let's not over-do FTM).
#-----------------------------------------------------------------------
chmod a+x *.test
. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Don't care about exit status or number of test results, they should be
# checked for in many other tests.
$MAKE check >stdout || :
cat stdout
LC_ALL=C sort exp > t
mv -f t exp
# We need the sort below to account for parallel make usage.
LC_ALL=C grep '[a-z0-9][a-z0-9]*\.test' stdout | LC_ALL=C sort > got
cat exp
cat got
diff exp got
: