From: Stefano Lattarini Date: Fri, 9 Sep 2011 09:54:22 +0000 (+0200) Subject: Merge branch 'master' into test-protocols X-Git-Tag: ng-0.5a~89^2~59^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac2300d4878e0342fb292d9c2fbeaf717c15febb;p=thirdparty%2Fautomake.git Merge branch 'master' into test-protocols * master: coverage: distcheck-hook to catch missing/outdated *.m4 files --- ac2300d4878e0342fb292d9c2fbeaf717c15febb diff --cc tests/Makefile.am index f2062264d,fe89caaf5..d1164f8e5 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -1115,129 -1075,12 +1117,132 @@@ $(parallel_tests EXTRA_DIST += $(TESTS) -# Dependencies valid for each test case. -$(TEST_LOGS): defs defs-static aclocal-$(APIVERSION) automake-$(APIVERSION) +## Files containing auxiliary functions used by our test cases. +EXTRA_DIST += tap-functions.sh plain-functions.sh + +test-driver-custom-multitest.log: trivial-test-driver +test-driver-custom-multitest-recheck.log: trivial-test-driver +test-driver-custom-multitest-recheck2.log: trivial-test-driver +test-driver-custom-html.log: trivial-test-driver +EXTRA_DIST += trivial-test-driver + +testsuite-summary-color.log testsuite-summary-count.log: \ + testsuite-summary-checks.sh extract-testsuite-summary +EXTRA_DIST += testsuite-summary-checks.sh +EXTRA_DIST += extract-testsuite-summary + +testsuite-summary-count-many.log: trivial-test-driver +testsuite-summary-count-many.log: extract-testsuite-summary + +# List of tests on TAP support that use the files pre-computed by +# `tap-common-setup.test', and sources the `tap-setup.sh' helper +# script. +tap_with_common_setup_tests = \ +tap-ambiguous-directive.test \ +tap-autonumber.test \ +tap-bailout.test \ +tap-bailout-and-logging.test \ +tap-bailout-suppress-badexit.test \ +tap-bailout-suppress-later-diagnostic.test \ +tap-bailout-suppress-later-errors.test \ +tap-color.test \ +tap-deps.test \ +tap-diagnostic.test \ +tap-empty-diagnostic.test \ +tap-empty.test \ +tap-escape-directive.test \ +tap-escape-directive-2.test \ +tap-exit.test \ +tap-signal.test \ +tap-fancy.test \ +tap-fancy2.test \ +tap-global-log.test \ +tap-global-result.test \ +tap-html.test \ +tap-log.test \ +tap-msg0-result.test \ +tap-msg0-directive.test \ +tap-msg0-planskip.test \ +tap-msg0-bailout.test \ +tap-msg0-misc.test \ +tap-merge-stdout-stderr.test \ +tap-no-merge-stdout-stderr.test \ +tap-no-disable-hard-error.test \ +tap-no-spurious-summary.test \ +tap-no-spurious-numbers.test \ +tap-no-spurious.test \ +tap-not-ok-skip.test \ +tap-number-wordboundary.test \ +tap-numeric-description.test \ +tap-negative-numbers.test \ +tap-numbers-leading-zero.test \ +tap-out-of-order.test \ +tap-passthrough.test \ +tap-passthrough-exit.test \ +tap-plan.test \ +tap-plan-corner.test \ +tap-plan-errors.test \ +tap-plan-middle.test \ +tap-plan-whitespace.test \ +tap-plan-leading-zero.test \ +tap-plan-malformed.test \ +tap-missing-plan-and-bad-exit.test \ +tap-planskip.test \ +tap-planskip-late.test \ +tap-planskip-and-logging.test \ +tap-planskip-unplanned.test \ +tap-planskip-unplanned-corner.test \ +tap-planskip-case-insensitive.test \ +tap-planskip-whitespace.test \ +tap-planskip-badexit.test \ +tap-planskip-bailout.test \ +tap-planskip-later-errors.test \ +tap-realtime.test \ +tap-test-number-0.test \ +tap-recheck-logs.test \ +tap-result-comment.test \ +tap-todo-skip-together.test \ +tap-todo-skip-whitespace.test \ +tap-todo-skip.test \ +tap-unplanned.test \ +tap-whitespace-normalization.test \ +tap-with-and-without-number.test \ +tap-xfail-tests.test + +# Their log files. +tap_with_common_setup_logs = $(tap_with_common_setup_tests:.test=.log) + +# Their dependencies. +$(tap_with_common_setup_logs): tap-common-setup.log tap-setup.sh +EXTRA_DIST += tap-setup.sh + +# Other tests on TAP support. +tap_other_tests = \ +tap-common-setup.test \ +tap-bad-prog.tap \ +tap-basic.test \ +tap-diagnostic-custom.test \ +tap-driver-stderr.test \ +tap-doc.test \ +tap-doc2.test \ +tap-more.test \ +tap-more2.test \ +tap-recheck.test \ +tap-summary.test \ +tap-summary-color.test + +tap-summary.log tap-summary-color.log: tap-summary-aux.sh +EXTRA_DIST += tap-summary-aux.sh + distcheck-missing-m4.log distcheck-outdated-m4.log: distcheck-hook-m4.am + EXTRA_DIST += distcheck-hook-m4.am + +# Dependencies valid for each test case. +$(TEST_LOGS): defs defs-static aclocal-$(APIVERSION) automake-$(APIVERSION) +# FIXME: this should be made more granular once we have a cleaner +# subdivision of the tests. +$(TEST_LOGS): plain-functions.sh tap-functions.sh + clean-local: clean-local-check .PHONY: clean-local-check clean-local-check: diff --cc tests/Makefile.in index 0e226d1c4,da0702a8d..639356ee6 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -278,14 -293,9 +278,15 @@@ target_alias = @target_alias top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +TEST_EXTENSIONS = .test .tap +TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh +AM_TAP_LOG_DRIVER_FLAGS = --merge MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests) EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \ - $(TESTS) distcheck-hook-m4.am + $(TESTS) tap-functions.sh plain-functions.sh \ + trivial-test-driver testsuite-summary-checks.sh \ - extract-testsuite-summary tap-setup.sh tap-summary-aux.sh ++ extract-testsuite-summary tap-setup.sh tap-summary-aux.sh \ ++ distcheck-hook-m4.am XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \ override-conditional-2.test pr8365-remake-timing.test \ yacc-dist-nobuild-subdir.test vala-vpath.test txinfo5.test \ @@@ -1937,28 -1751,11 +1940,30 @@@ $(instspc_tests): Makefile.a instspc-data.log: instspc-tests.sh $(instspc_tests:.test=.log): instspc-tests.sh instspc-data.log -# Dependencies valid for each test case. -$(TEST_LOGS): defs defs-static aclocal-$(APIVERSION) automake-$(APIVERSION) +test-driver-custom-multitest.log: trivial-test-driver +test-driver-custom-multitest-recheck.log: trivial-test-driver +test-driver-custom-multitest-recheck2.log: trivial-test-driver +test-driver-custom-html.log: trivial-test-driver + +testsuite-summary-color.log testsuite-summary-count.log: \ + testsuite-summary-checks.sh extract-testsuite-summary + +testsuite-summary-count-many.log: trivial-test-driver +testsuite-summary-count-many.log: extract-testsuite-summary + +# Their dependencies. +$(tap_with_common_setup_logs): tap-common-setup.log tap-setup.sh + +tap-summary.log tap-summary-color.log: tap-summary-aux.sh + distcheck-missing-m4.log distcheck-outdated-m4.log: distcheck-hook-m4.am + +# Dependencies valid for each test case. +$(TEST_LOGS): defs defs-static aclocal-$(APIVERSION) automake-$(APIVERSION) +# FIXME: this should be made more granular once we have a cleaner +# subdivision of the tests. +$(TEST_LOGS): plain-functions.sh tap-functions.sh + clean-local: clean-local-check .PHONY: clean-local-check clean-local-check: