From 6483ac07dfcca5ddd282113f23c3771a8027767c Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 1 Aug 2011 16:14:44 +0200 Subject: 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'. --- tests/tap-unplanned.test | 66 ++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 42 deletions(-) (limited to 'tests/tap-unplanned.test') diff --git a/tests/tap-unplanned.test b/tests/tap-unplanned.test index 696f73bef..177e36e96 100755 --- a/tests/tap-unplanned.test +++ b/tests/tap-unplanned.test @@ -20,27 +20,9 @@ parallel_tests=yes . ./defs || Exit 1 -cp "$top_testsrcdir"/lib/tap-driver . \ - || fatal_ "failed to fetch auxiliary script tap-driver" +. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" -cat >> configure.in < Makefile.am << 'END' -TEST_LOG_DRIVER = $(PERL) $(srcdir)/tap-driver -TEST_LOG_COMPILER = cat -TESTS = foo.test -END - -$ACLOCAL -$AUTOCONF -$AUTOMAKE - -./configure - -cat > foo.test < all.test <stdout && { cat stdout; Exit 1; } cat stdout count_test_results total=3 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=2 -grep '^ERROR: foo\.test - too many tests run (expected 1, got 2)$' stdout -grep '^ERROR: foo\.test 2 # UNPLANNED$' stdout +grep '^ERROR: all\.test - too many tests run (expected 1, got 2)$' stdout +grep '^ERROR: all\.test 2 # UNPLANNED$' stdout -cat > foo.test < all.test <stdout && { cat stdout; Exit 1; } cat stdout count_test_results total=4 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=2 -grep '^ERROR: foo\.test - too many tests run (expected 2, got 3)$' stdout -grep '^ERROR: foo\.test 3 # UNPLANNED$' stdout +grep '^ERROR: all\.test - too many tests run (expected 2, got 3)$' stdout +grep '^ERROR: all\.test 3 # UNPLANNED$' stdout # Interaction with XFAIL_TESTS. -cat > foo.test < all.test <stdout && { cat stdout; Exit 1; } +XFAIL_TESTS=all.test $MAKE -e check >stdout && { cat stdout; Exit 1; } cat stdout count_test_results total=6 pass=0 fail=0 xpass=0 xfail=1 skip=1 error=4 -grep '^ERROR: foo\.test - too many tests run (expected 2, got 5)$' stdout -grep '^ERROR: foo\.test 3 # UNPLANNED$' stdout -grep '^ERROR: foo\.test 4 # UNPLANNED$' stdout -grep '^ERROR: foo\.test 5 # UNPLANNED$' stdout +grep '^ERROR: all\.test - too many tests run (expected 2, got 5)$' stdout +grep '^ERROR: all\.test 3 # UNPLANNED$' stdout +grep '^ERROR: all\.test 4 # UNPLANNED$' stdout +grep '^ERROR: all\.test 5 # UNPLANNED$' stdout -cat > foo.test < all.test <stdout && { cat stdout; Exit 1; } cat stdout count_test_results total=22 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=21 -echo 'PASS: foo.test 1' > exp -sed -e '/^$/d' -e 's/.*/ERROR: foo.test & # UNPLANNED/' t >> exp -echo 'ERROR: foo.test - too many tests run (expected 1, got 21)' >> exp +echo 'PASS: all.test 1' > exp +sed -e '/^$/d' -e 's/.*/ERROR: all.test & # UNPLANNED/' t >> exp +echo 'ERROR: all.test - too many tests run (expected 1, got 21)' >> exp -$FGREP ': foo.test' stdout > got +$FGREP ': all.test' stdout > got cat exp cat got @@ -159,7 +141,7 @@ diff exp got # message about the unmatched number of tests once we've got the plan. for x in 'ok' 'ok 3' 'not ok' 'not ok # TODO' 'ok # TODO' 'ok # SKIP'; do - unindent > foo.test < all.test <stdout && { cat stdout; Exit 1; } cat stdout - test `$FGREP -c ': foo.test' stdout` -eq 4 - $EGREP '^PASS: foo\.test 1($| )' stdout - $EGREP '^SKIP: foo\.test 2($| )' stdout - $EGREP ': foo\.test 3($| )' stdout - grep '^ERROR: foo\.test - too many tests run (expected 2, got 3)$' stdout + test `$FGREP -c ': all.test' stdout` -eq 4 + $EGREP '^PASS: all\.test 1($| )' stdout + $EGREP '^SKIP: all\.test 2($| )' stdout + $EGREP ': all\.test 3($| )' stdout + grep '^ERROR: all\.test - too many tests run (expected 2, got 3)$' stdout done : -- cgit v1.2.1