From: Stefano Lattarini Date: Thu, 6 Oct 2011 11:56:49 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~112 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b27c5b5678b4502d15c0a6c8fdcda7a45ddbb16;p=thirdparty%2Fautomake.git Merge branch 'maint' * maint: fix: make a test script executable coverage: expose automake bug#9651 parallel-tests: automake error our on invalid TEST_EXTENSIONS fix: regenerate Makefile docs: don't suggest installing `.m4' files in hard-coded location distuninstallcheck: fail also when only one file is left installed --- 8b27c5b5678b4502d15c0a6c8fdcda7a45ddbb16 diff --cc Makefile.in index 6e03d9d58,e7ef86289..64664180e --- a/Makefile.in +++ b/Makefile.in @@@ -158,8 -150,9 +158,10 @@@ am__relativize = reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip distuninstallcheck_listfiles = find . -type f -print + am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|${prefix}/|' | grep -v '${infodir}/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ diff --cc automake.in index 5a44f3a79,a60bc9fca..4055e58d5 mode 100644,100755..100644 --- a/automake.in +++ b/automake.in diff --cc tests/Makefile.am index 4c9cf1351,bf17aeafc..530024b19 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -23,8 -20,9 +23,10 @@@ 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 \ @@@ -747,9 -633,8 +753,10 @@@ parallel-tests-harderror.test parallel-tests-log-override-1.test \ parallel-tests-log-override-2.test \ parallel-tests-log-override-recheck.test \ +parallel-tests-cmdline-override.test \ parallel-tests-log-compiler-example.test \ +parallel-tests-fork-bomb.test \ + test-extensions.test \ parse.test \ percent.test \ percent2.test \ diff --cc tests/Makefile.in index 779e0a264,f66a9c77a..5f78d77ae --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -299,83 -287,44 +299,84 @@@ target_alias = @target_alias top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -XFAIL_TESTS = \ -all.test \ -auxdir2.test \ -cond17.test \ -dist-auxfile.test \ -dist-auxfile-2.test \ -gcj6.test \ -java-nobase.test \ -pr8365-remake-timing.test \ -yacc-dist-nobuild-subdir.test \ -vala-vpath.test \ -txinfo5.test - -parallel_tests = \ -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 \ -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 - -MAINTAINERCLEANFILES = $(parallel_tests) +MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests) +EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \ + $(TESTS) 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 txinfo5.test $(instspc_xfail_tests) ++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 \ ++ $(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 +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 \ + instspc-sharp-build.test instspc-sharp-install.test \ + instspc-dollar-build.test instspc-dollar-install.test \ + instspc-bang-build.test instspc-bang-install.test \ + instspc-bslash-build.test instspc-bslash-install.test \ + instspc-ampersand-build.test instspc-ampersand-install.test \ + instspc-percent-build.test instspc-percent-install.test \ + instspc-leftpar-build.test instspc-leftpar-install.test \ + instspc-rightpar-build.test instspc-rightpar-install.test \ + instspc-pipe-build.test instspc-pipe-install.test \ + instspc-caret-build.test instspc-caret-install.test \ + instspc-tilde-build.test instspc-tilde-install.test \ + instspc-qmark-build.test instspc-qmark-install.test \ + instspc-star-build.test instspc-star-install.test \ + instspc-plus-build.test instspc-plus-install.test \ + instspc-minus-build.test instspc-minus-install.test \ + instspc-comma-build.test instspc-comma-install.test \ + instspc-colon-build.test instspc-colon-install.test \ + instspc-semicol-build.test instspc-semicol-install.test \ + instspc-equal-build.test instspc-equal-install.test \ + instspc-less-build.test instspc-less-install.test \ + instspc-more-build.test instspc-more-install.test \ + instspc-at-build.test instspc-at-install.test \ + instspc-lqbrack-build.test instspc-lqbrack-install.test \ + instspc-rqbrack-build.test instspc-rqbrack-install.test \ + instspc-lcbrack-build.test instspc-lcbrack-install.test \ + instspc-rcbrack-build.test instspc-rcbrack-install.test \ + instspc-space-build.test instspc-space-install.test \ + instspc-tab-build.test instspc-tab-install.test \ + instspc-linefeed-build.test instspc-linefeed-install.test \ + instspc-backspace-build.test instspc-backspace-install.test \ + instspc-formfeed-build.test instspc-formfeed-install.test \ + instspc-carriageret-build.test \ + instspc-carriageret-install.test \ + instspc-quadrigraph0-build.test \ + instspc-quadrigraph0-install.test \ + instspc-quadrigraph1-build.test \ + instspc-quadrigraph1-install.test \ + instspc-quadrigraph2-build.test \ + instspc-quadrigraph2-install.test \ + instspc-quadrigraph3-build.test \ + instspc-quadrigraph3-install.test \ + instspc-quadrigraph4-build.test \ + instspc-quadrigraph4-install.test instspc-a_b-build.test \ + instspc-a_b-install.test instspc-a__b-build.test \ + instspc-a__b-install.test instspc-a_lf_b-build.test \ + instspc-a_lf_b-install.test instspc-dotdotdot-build.test \ + instspc-dotdotdot-install.test instspc-dosdrive-build.test \ + instspc-dosdrive-install.test instspc-miscglob1-build.test \ + instspc-miscglob1-install.test instspc-miscglob2-build.test \ + instspc-miscglob2-install.test +instspc_xfail_tests = instspc-squote-build.test \ + instspc-dquote-build.test instspc-bquote-build.test \ + instspc-sharp-build.test instspc-dollar-build.test \ + instspc-bslash-build.test instspc-ampersand-build.test \ + instspc-linefeed-build.test instspc-quadrigraph0-build.test \ + instspc-a_lf_b-build.test instspc-squote-install.test \ + instspc-dquote-install.test instspc-bquote-install.test \ + instspc-sharp-install.test instspc-dollar-install.test \ + instspc-linefeed-install.test instspc-a_lf_b-install.test # Some testsuite-influential variables should be overridable from the # test scripts, but not from the environment. @@@ -1024,9 -917,8 +1029,10 @@@ parallel-tests-harderror.test parallel-tests-log-override-1.test \ parallel-tests-log-override-2.test \ parallel-tests-log-override-recheck.test \ +parallel-tests-cmdline-override.test \ parallel-tests-log-compiler-example.test \ +parallel-tests-fork-bomb.test \ + test-extensions.test \ parse.test \ percent.test \ percent2.test \