From: Stefano Lattarini Date: Thu, 18 Aug 2011 19:47:11 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~136 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c4d0f0650486315359a63b2b6a832dcf4986147;p=thirdparty%2Fautomake.git Merge branch 'maint' * maint: * THANKS (Daniel Richard G.): Update e-mail address. java: avoid compilation errors when CLASSPATH is empty parallel-tests: no more spurious successes for FreeBSD make hacking: we now require autoconf 2.68 --- 8c4d0f0650486315359a63b2b6a832dcf4986147 diff --cc ChangeLog index 2d7e5d6ea,2ad9390fa..ea42a25c5 --- a/ChangeLog +++ b/ChangeLog @@@ -1,64 -1,44 +1,105 @@@ + 2011-08-17 Stefano Lattarini + + * THANKS (Daniel Richard G.): Update e-mail address. + + 2011-08-16 Daniel Richard G. (tiny change) + Stefano Lattarini + + java: avoid compilation errors when CLASSPATH is empty + * lib/am/java.am (CLASSPATH_ENV): When redefining `$CLASSPATH', + do not append an empty component in case the previous value of + CLASSPATH is empty or unset. + * tests/java-empty-classpath.test: New test. + * tests/Makefile.am (TESTS): Update. + Fixes automake bug#9306. + + 2011-08-16 Stefano Lattarini + + parallel-tests: no more spurious successes for FreeBSD make + Work around a bug of FreeBSD make bug that was causing the + automake-generated "check" target to complete with success + even if some tests failed; this happened only when FreeBSD + make was run in concurrent mode (as in, e.g., "make -j2 + check"). The bug is not present in NetBSD make. + This change fixes automake bug#9245: + + See also FreeBSD PR bin/159730: + + * lib/am/check.am [%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Use a + more "safe" (and apparently redundant) idiom to exit with error, + so that the non-zero exit status is picked up also by FreeBSD + make when it's running in concurrent mode. + * NEWS: Update. + * tests/check-concurrency-bug9245.test: New test. + * tests/Makefile.am (TESTS): Update. + + 2011-08-11 Stefano Lattarini + + hacking: we now require autoconf 2.68 + * HACKING ("Working in git"): Use autoconf and autom4te 2.68, + not 2.67, in the examples. + +2011-08-09 Stefano Lattarini + + coverage: possible infinite recursion in the test harness + Motivated by a regression in the 'test-protocols' branch. + * tests/parallel-tests-fork-bomb.test: New test, checking that + if $(TEST_SUITE_LOG) is in $(TEST_LOGS), we obtain a diagnosed + error rather than a make hang or a fork bomb. + * tests/Makefile.am (TESTS): Update. + +2011-08-09 Stefano Lattarini + + test defs: yet more environment cleanup + * tests/defs: Also unset the TEST_SUITE_LOG variable. + +2011-08-09 Stefano Lattarini + + tests: fix various blunders in 'suffix-chain.test' + * tests/suffix-chain.test: Fix various blunders that were causing + this test to fail spuriously: append to `configure.in', not to + `configure.ac'; add a `;' character after the `return' statement + in an input file; use tabs, not spaces, to indent Makefile recipes; + and use more uncommon suffixes that don't trigger built-in recipes + with FreeBSD make. + +2011-08-09 Stefano Lattarini + + tests: don't let a known Solaris make bug poison too many tests + See automake bug#7670 and bug#7824. + * tests/defs (make_can_chain_suffix_rules): New function, tell + whether the make implementation in use can chain suffix rules + automatically or not. + * tests/suffix3.test: Use it to avoid issuing calls to make that + are unportable to make implementations that are not smart enough + to chain suffix rules automatically. + * tests/suffix8.test: Use it to avoid issuing calls to make that + * tests/suffix10.test: Use it to avoid issuing calls to make that + * tests/suffix11.test: Use it to avoid issuing calls to make that + * tests/suffix-chain.test: New test, exposes the limitation that + we have papered over in the tests above. + +2011-08-09 Stefano Lattarini + + gitignore: more use of anchors + * .gitignore: Anchor files that are intended to be ignored only + if found in the same directory of the `.gitignore' file, not also + in its subdirectories. + * doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore, + lib/Automake/tests/.gitignore, tests/.gitignore: Likewise. Also, + where needed, add new entries that were once implied by the + non-anchored entries in the upper-level `.gitignore' files. + +2011-08-09 Stefano Lattarini + + testsuite: avoid spurious failure of self checks on Solaris + This is just a quick workaround to prevent having too much noise + in the testsuite; more proper fixes have been committed into the + 'testsuite-work' branch. + * tests/self-check-dir.test: Relax a test to avoid unimportant + failure on Solaris 10. + * tests/self-check-exit.test: Likewise. + 2011-08-08 Stefano Lattarini test defs: more environment cleanup diff --cc THANKS index 4f8950a3f,d91c5bb2c..54c2320d7 --- a/THANKS +++ b/THANKS @@@ -67,8 -67,7 +67,8 @@@ Dalibor Topic robilad@kaffe.or danbp danpb@nospam.postmaster.co.uk Daniel Jacobowitz drow@false.org Daniel Kahn Gillmor dkg@fifthhorseman.net - Daniel Richard G. danielg@teragram.com + Daniel Richard G. skunk@iskunk.org +Debarshi Ray rishi@gnu.org Dave Brolley brolley@redhat.com Dave Korn dave.korn.cygwin@googlemail.com Dave Morrison dave@bnl.gov diff --cc tests/Makefile.in index ede80e6eb,5a3259ee4..5b5714123 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -293,83 -281,40 +293,83 @@@ 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 \ -gcj6.test \ -pr8365-remake-timing.test \ -yacc-dist-nobuild-subdir.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) +XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \ + override-conditional-2.test pr8365-remake-timing.test \ + yacc-dist-nobuild-subdir.test txinfo5.test \ + $(instspc_xfail_tests) - parallel_tests = backcompat5-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 = 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. @@@ -1674,88 -1477,15 +1675,89 @@@ uninstall-am maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am recheck recheck-html uninstall uninstall-am +backcompat5-p.log: backcompat5.test ++check-concurrency-bug9245-p.log: check-concurrency-bug9245.test +check-exported-srcdir-p.log: check-exported-srcdir.test +check-tests-in-builddir-p.log: check-tests-in-builddir.test +check-tests_environment-p.log: check-tests_environment.test +check-p.log: check.test +check10-p.log: check10.test +check11-p.log: check11.test +check12-p.log: check12.test +check2-p.log: check2.test +check3-p.log: check3.test +check4-p.log: check4.test +check5-p.log: check5.test +check6-p.log: check6.test +check7-p.log: check7.test +check8-p.log: check8.test +check9-p.log: check9.test +color-p.log: color.test +color2-p.log: color2.test +comment9-p.log: comment9.test +dejagnu-p.log: dejagnu.test +exeext4-p.log: exeext4.test +maken3-p.log: maken3.test +maken4-p.log: maken4.test +posixsubst-tests-p.log: posixsubst-tests.test $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am - (cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@ - -$(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am - input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \ - sed 's|^\. \./defs.*|parallel_tests=yes; &|' \ - < $(srcdir)/$$input >$@ - chmod a+rx $@ + $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@ + +$(parallel_tests): Makefile.am + $(AM_V_at)rm -f $@ $@-t + $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \ + { echo '#!/bin/sh'; \ + echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \ + echo; \ + echo '# Ensure proper definition of $$testsrcdir.'; \ + echo '. ./defs-static || exit 99'; \ + echo 'test -n "$$testsrcdir" || exit 99 # sanity check'; \ + echo; \ + echo "# Run the test with Automake's parallel-tests driver enabled."; \ + echo 'parallel_tests=yes'; \ + echo "# In the spirit of VPATH, we prefer a test in the build tree"; \ + echo "# over one in the source tree."; \ + echo "if test -f \"./$$input\"; then"; \ + echo " . \"./$$input\""; \ + echo 'else'; \ + echo " . \"\$$testsrcdir/$$input\""; \ + echo 'fi'; \ + } > $@-t + $(AM_V_at)chmod a+rx $@-t && mv -f $@-t $@ + +$(srcdir)/instspc-tests.am: instspc-tests.sh Makefile.am + $(AM_V_GEN)($(am__cd) $(srcdir) \ + && $(SHELL) ./instspc-tests.sh --generate-makefile) >$@ + +$(instspc_tests): Makefile.am + $(AM_V_at)rm -f $@ $@-t + $(AM_V_GEN) :; \ + base=`expr 'x/$@' : 'x.*/instspc-\(.*\)\.test$$'`; \ + name=`expr x"$$base" : x'\(.*\)-'`; \ + action=`expr x"$$base" : x'.*-\(.*\)'`; \ + { \ + echo '#!/bin/sh'; \ + echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \ + echo; \ + echo '# Ensure proper definition of $$testsrcdir.'; \ + echo '. ./defs-static || exit 99'; \ + echo 'test -n "$$testsrcdir" || exit 99 # sanity check'; \ + echo; \ + echo "instspc_test_name='$$name'"; \ + echo "instspc_action='test-$$action'"; \ + echo ". \$$testsrcdir/instspc-tests.sh"; \ + } > $@-t + $(AM_V_at)chmod a+rx $@-t && mv -f $@-t $@ + +# All instspc-*.test tests work by sourcing the `instspc-tests.sh' +# script. Also, they all use shared data generated by the helper +# test `instspc-data.test', for reasons of speed. +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) clean-local: clean-local-check .PHONY: clean-local-check