From: Stefano Lattarini Date: Thu, 6 Oct 2011 12:29:31 +0000 (+0200) Subject: Merge branch 'master' into test-protocols X-Git-Tag: ng-0.5a~89^2~31^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0da79637931ff0abeffc3d6b8352e18ef72b3609;p=thirdparty%2Fautomake.git Merge branch 'master' into test-protocols --- 0da79637931ff0abeffc3d6b8352e18ef72b3609 diff --cc ChangeLog index 7a78db6fa,9105370a3..69bdc0183 --- a/ChangeLog +++ b/ChangeLog @@@ -1,13 -1,58 +1,68 @@@ + 2011-10-06 Stefano Lattarini + + fix: make a test script executable + * tests/nobase-nodist.test: Make executable. + + 2011-10-06 Stefano Lattarini + + coverage: expose automake bug#9651 + * tests/dist-auxfile.test: New test, xfailing. + * tests/dist-auxfile-2.test: Likewise. + * tests/Makefile.am (TESTS, XFAIL_TESTS): Add them. + + 2011-10-01 Stefano Lattarini + + parallel-tests: automake error our on invalid TEST_EXTENSIONS + This change fixes automake bug#9400. + * automake.in (handle_tests): Bail out if a suffix specified in + TEST_EXTENSIONS would produce an invalid `xxx_LOG_COMPILER' + variable or an invalid suffix rule. Before this change, automake + would have issued a confusing error messages (about invalid or + non-POSIX variables being defined), and in some situations would + have even produced a broken `Makefile.in' file. + ($TEST_EXTENSION_PATTERN): New helper variable. + * doc/automake.texi (Simple Tests using parallel-tests): Document + the limitations on TEST_EXTENSIONS explicitly. + * NEWS: Update. + * tests/test-extensions.test: New test. + * tests/Makefile.am (TESTS): Update. + + 2011-09-28 Stefano Lattarini + + docs: don't suggest installing `.m4' files in hard-coded location + This change fixes automake bug#7988. + * doc/automake.texi (aclocal Options): State that the use of + the `--print-ac-dir' option to determine the directory where + third-party packages can install their `.m4' files is discouraged + now. + (Extending aclocal): Suggest telling the user about ACLOCAL_PATH. + * THANKS: Update. + Report by Peter Johansson. + + 2011-09-26 Stefano Lattarini + + distuninstallcheck: fail also when only one file is left installed + This change fixes automake bug#9579. + * lib/am/distdir.am (distuninstallcheck): Be stricter in ignoring + a potential `dir' file created by install-info and left installed. + Also, be more careful about "this can't happen" kind of errors. + (am__distuninstallcheck_listfiles): New internal helper macro. + * tests/distcheck-pr9579.test: New test. + * tests/distcheck-override-infodir.test: Likewise. + * tests/Makefile.am (TESTS): Add them. + * NEWS, THANKS: Update. + Report by Nick Bowler. + +2011-09-28 Stefano Lattarini + + tap/awk: improve comments about Korn shell signal handling issues + * lib/tap-driver.sh: Link an Austin Group discussion about how + shells are allowed, and even encouraged, to set the special + variable `$?' to values greater than 256 to report termination + of a child by a signal. Improve and extend comments about our + workarounds for unusual korn shell signals' propagation. + Thanks to Eric Blake for the pointers. + 2011-09-28 Stefano Lattarini maintcheck: fix usage of `cd' instead of `$(am__cd)' diff --cc doc/automake.texi index c75b86688,21f4cfbd6..c60f3f024 --- a/doc/automake.texi +++ b/doc/automake.texi @@@ -9013,13 -8759,19 +9022,19 @@@ For best results, the tests should be v @vindex TEST_EXTENSIONS @vindex TEST_LOGS -Each log file is created when the corresponding test has completed. -The set of log files is listed in the read-only variable -@code{TEST_LOGS}, and defaults to @code{TESTS}, with the executable -extension if any (@pxref{EXEEXT}), as well as any suffix listed in -@code{TEST_EXTENSIONS} removed, and @file{.log} appended. Results -are undefined if a test file name ends in several concatenated suffixes. -@code{TEST_EXTENSIONS} defaults to @file{.test}; it can be overridden by -the user, in which case any extension listed in it must be constituted -by a dot, followed by a non-digit alphabetic character, followed by any -number of alphabetic characters. +Each couple of @file{.log} and @file{.trs} files is created when the +corresponding test has completed. The set of log files is listed in +the read-only variable @code{TEST_LOGS}, and defaults to @code{TESTS}, +with the executable extension if any (@pxref{EXEEXT}), as well as any +suffix listed in @code{TEST_EXTENSIONS} removed, and @file{.log} appended. - @code{TEST_EXTENSIONS} defaults to @file{.test}. Results are undefined - if a test file name ends in several concatenated suffixes. ++Results are undefined if a test file name ends in several concatenated ++suffixes. @code{TEST_EXTENSIONS} defaults to @file{.test}; it can be ++overridden by the user, in which case any extension listed in it must be ++constituted by a dot, followed by a non-digit alphabetic character, ++followed by any number of alphabetic characters. + @c Keep in sync with test-extensions.test. + For example, @samp{.sh}, @samp{.T} and @samp{.t1} are valid extensions, + while @samp{.x-y}, @samp{.6c} and @samp{.t.1} are not. @vindex _LOG_COMPILE @vindex _LOG_COMPILER diff --cc tests/Makefile.am index 748c6ed37,530024b19..2d63a3dec --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -754,44 -756,7 +760,45 @@@ parallel-tests-log-override-recheck.tes parallel-tests-cmdline-override.test \ parallel-tests-log-compiler-example.test \ parallel-tests-fork-bomb.test \ +parallel-tests-empty-testlogs.test \ +parallel-tests-driver-install.test \ +parallel-tests-no-color-in-log.test \ +parallel-tests-no-spurious-summary.test \ +parallel-tests-exit-statuses.test \ +parallel-tests-console-output.test \ +parallel-tests-once.test \ +tests-environment.test \ +am-tests-environment.test \ +tests-environment-backcompat.test \ +testsuite-summary-color.test \ +testsuite-summary-count.test \ +testsuite-summary-count-many.test \ +testsuite-summary-reference-log.test \ +test-driver-custom-no-extra-driver.test \ +test-driver-custom.test \ +test-driver-custom-xfail-tests.test \ +test-driver-custom-multitest.test \ +test-driver-custom-multitest-recheck.test \ +test-driver-custom-multitest-recheck2.test \ +test-driver-custom-html.test \ +test-driver-custom-no-html.test \ +test-driver-create-log-dir.test \ +test-driver-strip-vpath.test \ +test-driver-trs-suffix-registered.test \ +test-driver-fail.test \ +test-driver-is-distributed.test \ +test-harness-vpath-rewrite.test \ +test-log.test \ +test-metadata-global-log.test \ +test-metadata-global-result.test \ +test-metadata-recheck.test \ +test-metadata-results.test \ +test-missing.test \ +test-missing2.test \ +test-trs-basic.test \ +test-trs-recover.test \ +test-trs-recover2.test \ + test-extensions.test \ parse.test \ percent.test \ percent2.test \ diff --cc tests/Makefile.in index 90160d2d0,5f78d77ae..5b3a3dfc2 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -284,28 -299,22 +284,29 @@@ 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 \ + distcheck-hook-m4.am - XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \ - override-conditional-2.test java-nobase.test \ - pr8365-remake-timing.test yacc-dist-nobuild-subdir.test \ - vala-vpath.test test-driver-is-distributed.test txinfo5.test \ + XFAIL_TESTS = all.test auxdir2.test cond17.test dist-auxfile.test \ + dist-auxfile-2.test gcj6.test override-conditional-2.test \ + java-nobase.test pr8365-remake-timing.test \ - yacc-dist-nobuild-subdir.test vala-vpath.test txinfo5.test \ ++ yacc-dist-nobuild-subdir.test vala-vpath.test \ ++ test-driver-is-distributed.test txinfo5.test \ $(instspc_xfail_tests) -parallel_tests = backcompat5-p.test check-concurrency-bug9245-p.test \ - check-exported-srcdir-p.test check-tests-in-builddir-p.test \ - check-tests_environment-p.test check-p.test check10-p.test \ - check11-p.test check12-p.test check2-p.test check3-p.test \ - check4-p.test check5-p.test check6-p.test check7-p.test \ - check8-p.test check9-p.test color-p.test color2-p.test \ - comment9-p.test dejagnu-p.test exeext4-p.test maken3-p.test \ - maken4-p.test posixsubst-tests-p.test +parallel_tests = check-concurrency-bug9245-p.test \ + check-exported-srcdir-p.test check-fd-redirect-p.test \ + check-tests-in-builddir-p.test check-p.test check11-p.test \ + check12-p.test check2-p.test check3-p.test check4-p.test \ + check5-p.test check6-p.test check7-p.test check8-p.test \ + check9-p.test color-p.test color2-p.test comment9-p.test \ + dejagnu-p.test exeext4-p.test maken3-p.test maken4-p.test \ + posixsubst-tests-p.test tests-environment-p.test instspc_tests = instspc-squote-build.test instspc-squote-install.test \ instspc-dquote-build.test instspc-dquote-install.test \ instspc-bquote-build.test instspc-bquote-install.test \ @@@ -1018,44 -1032,7 +1023,45 @@@ parallel-tests-log-override-recheck.tes parallel-tests-cmdline-override.test \ parallel-tests-log-compiler-example.test \ parallel-tests-fork-bomb.test \ +parallel-tests-empty-testlogs.test \ +parallel-tests-driver-install.test \ +parallel-tests-no-color-in-log.test \ +parallel-tests-no-spurious-summary.test \ +parallel-tests-exit-statuses.test \ +parallel-tests-console-output.test \ +parallel-tests-once.test \ +tests-environment.test \ +am-tests-environment.test \ +tests-environment-backcompat.test \ +testsuite-summary-color.test \ +testsuite-summary-count.test \ +testsuite-summary-count-many.test \ +testsuite-summary-reference-log.test \ +test-driver-custom-no-extra-driver.test \ +test-driver-custom.test \ +test-driver-custom-xfail-tests.test \ +test-driver-custom-multitest.test \ +test-driver-custom-multitest-recheck.test \ +test-driver-custom-multitest-recheck2.test \ +test-driver-custom-html.test \ +test-driver-custom-no-html.test \ +test-driver-create-log-dir.test \ +test-driver-strip-vpath.test \ +test-driver-trs-suffix-registered.test \ +test-driver-fail.test \ +test-driver-is-distributed.test \ +test-harness-vpath-rewrite.test \ +test-log.test \ +test-metadata-global-log.test \ +test-metadata-global-result.test \ +test-metadata-recheck.test \ +test-metadata-results.test \ +test-missing.test \ +test-missing2.test \ +test-trs-basic.test \ +test-trs-recover.test \ +test-trs-recover2.test \ + test-extensions.test \ parse.test \ percent.test \ percent2.test \