From: Ralf Wildenhues Date: Fri, 5 Mar 2010 20:29:38 +0000 (+0100) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~439 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f44f0aa604ce8480eb9fad34c045362e9add012b;p=thirdparty%2Fautomake.git Merge branch 'maint' --- f44f0aa604ce8480eb9fad34c045362e9add012b diff --cc ChangeLog index 795f8394d,d198ee643..abd5fb1fe --- a/ChangeLog +++ b/ChangeLog @@@ -1,27 -1,50 +1,74 @@@ + 2010-03-03 Stefano Lattarini + Ralf Wildenhues + + Avoid generation of `tests/defs-p' file. + * tests/defs.in: In the generated `configure.in' snippet: call + `AM_INIT_AUTOMAKE' with the `parallel-tests' option if the shell + variable `parallel_tests' is set to `yes'. + * tests/Makefile.am (defs-p): Target removed. + (check_SCRIPTS): Removed `defs-p'. + (clean-local-check): Do not unlink `defs-p' anymore. + ($(parallel_tests)): Transformation rules for the test scripts + adjusted. + * tests/gen-parallel-tests: Selection rules for the test + scripts adjusted. + * tests/parallel-tests.test: Set `$parallel_tests' to `yes' + then include `./defs' (rather than simply including `./defs-p'). + * tests/parallel-tests2.test: Likewise. + * tests/parallel-tests3.test: Likewise. + * tests/parallel-tests4.test: Likewise. + * tests/parallel-tests5.test: Likewise. + * tests/parallel-tests6.test: Likewise. + * tests/parallel-tests7.test: Likewise. + * tests/parallel-tests8.test: Likewise. + * tests/parallel-tests9.test: Likewise. + * tests/parallel-tests10.test: Likewise. + * tests/README (Section "Writing Test Cases" subsection "Do"): + Adjusted the parts referring to tests checking `parallel-tests' + behaviour. Some other minor related improvements. + * tests/.gitignore (defs-p): Removed. + + 2010-03-04 Stefano Lattarini + + Remove redundant unset of variable TESTS from some test scripts. + * tests/color.test: Do not unset the `TESTS' variable, as it's + already unset in the `defs' file. + * tests/check5.test: Likewise. + * tests/check8.test: Likewise. + * tests/check9.test: Likewise. + * tests/check10.test: Likewise. + * tests/check11.test: Likewise. + * tests/parallel-tests.test: Likewise. + * tests/parallel-tests3.test: Likewise. + * tests/parallel-tests4.test: Likewise. + * tests/parallel-tests5.test: Likewise. + * tests/parallel-tests6.test: Likewise. + * tests/parallel-tests7.test: Likewise. + +2010-03-01 Ralf Wildenhues + + Fix cscope test on systems without working Fortran compiler. + * tests/cscope.test: Skip remainder of test if `$MAKE all' fails. + * THANKS: Update. + Report by Peter Johansson. + +2010-02-24 Antonio Diaz Diaz (tiny change) + Ralf Wildenhues + + Add lzip compression support. + * automake.in (handle_dist): Recognize dist-lzip. + (make_paragraphs): Map LZIP to dist-lzip. + * doc/automake.texi (Dist): Add dist-lzip. + (Options): Likewise. + * lib/Automake/Options.pm (_process_option_list): Add dist-lzip. + * lib/am/distdir.am + (dist dist-all): Add command to create an lzip-compressed tarball. + (distcheck): Handle lzip-compressed tarballs just like the others. + * tests/defs.in: Test for lzip, too. + * tests/lzip.test: New file, based on nogzip.test. + * tests/Makefile.am (TESTS): Add lzip.test. + * NEWS: Update. + 2010-02-22 Karl Berry Improve help message of mdate-sh. diff --cc tests/Makefile.am index 9d99d3a48,e721e66f6..acc979caa --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -26,12 -26,13 +26,13 @@@ txinfo5.tes include $(srcdir)/parallel-tests.am $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am - (cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@ + $(AM_V_GEN)(cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@ $(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am - input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \ + $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \ - sed 's,^\. \./defs,. ./defs-p,' < $(srcdir)/$$input > $@ + sed 's|^\. \./defs.*|parallel_tests=yes; &|' \ + < $(srcdir)/$$input >$@ - chmod a+rx $@ + $(AM_V_at)chmod a+rx $@ MAINTAINERCLEANFILES = $(parallel_tests) diff --cc tests/Makefile.in index a2d2931d1,682e13769..1d7015201 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -1372,16 -1351,14 +1372,14 @@@ uninstall-am $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am - (cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@ + $(AM_V_GEN)(cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@ $(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am - input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \ + $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \ - sed 's,^\. \./defs,. ./defs-p,' < $(srcdir)/$$input > $@ + sed 's|^\. \./defs.*|parallel_tests=yes; &|' \ + < $(srcdir)/$$input >$@ - chmod a+rx $@ + $(AM_V_at)chmod a+rx $@ - defs-p: defs Makefile.am - $(AM_V_GEN)sed 's,^AM_INIT_AUTOMAKE$$,&([parallel-tests]),' < defs >$@ - clean-local: clean-local-check .PHONY: clean-local-check clean-local-check: