From: Stefano Lattarini Date: Wed, 1 Jun 2011 18:23:45 +0000 (+0200) Subject: Merge branch 'master' into testsuite-work X-Git-Tag: ng-0.5a~89^2~209 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f703d92432c1f6a9014d7f632e06493d4768e22;p=thirdparty%2Fautomake.git Merge branch 'master' into testsuite-work * master: remake: behave better with non-GNU make in subdirectories --- 1f703d92432c1f6a9014d7f632e06493d4768e22 diff --cc ChangeLog index d719a78c4,5e82c6dc0..385c3cc3d --- a/ChangeLog +++ b/ChangeLog @@@ -1,111 -1,18 +1,126 @@@ + 2011-05-29 Stefano Lattarini + + remake: behave better with non-GNU make in subdirectories + Currently, with every decent make program, it is possible to + rebuild out-of-date autotools-generated files with a simple + "make Makefile" -- but for this to work reliably with non-GNU + make implementations, the command must be issued from the + top-level directory. This patch removes such limitation. + * lib/am/configure.am (am--refresh): Depend on `%MAKEFILE%'. + * tests/remake-subdir.test: New test. + * tests/remake-subdir2.test: Likewise. + * tests/remake-subdir-gnu.test: Likewise. + * tests/remake-subdir-from-subdir.test: Likewise. + * tests/Makefile.am (TESTS): Update. + +2011-06-01 Stefano Lattarini + + lex tests: fix spurious failures with Solaris lex + * tests/lex-lib.test (foo.l): Avoid empty "rules section", which + can confuse Solaris lex. + * tests/lex-libobj.test (foo.l): Likewise. + +2011-06-01 Stefano Lattarini + + lex tests: do not force the use of flex unconditionally + * tests/defs (lex): Act more similarly to what the `yacc' + requirement does, i.e., only force the use of flex if the + $LEX variable is left unset by the user. + (flex): Use `skip_' to skip the test if flex is not found. + +2011-06-01 Stefano Lattarini + + lex tests: avoid possible hang; fix and extend + * tests/lex3.test (foo.l:yywrap): Return 1, not 0, to avoid hangs. + Bug introduced in commit 'v1.11-871-geb147a1'. + (Makefile.am): Do not add `@LEXLIB@' to `$(LDADD)', as we define + our own `yywrap' function. + * tests/lex.test (tscan.l): In `yywrap', return 1, not 0, for + consistency with the default flex implementation. + * tests/lex-libobj.test (yywrap.c): Likewise. + * tests/lex-subobj-nodep.test (s1.l): Likewise. + * tests/lexvpath.test (foo.c): Likewise. + * tests/silent-lex-gcc (foo.l): Likewise. + * tests/silent-lex-generic (foo.l): Likewise. + * tests/silent-many-gcc (foo5.l): Likewise. + * tests/silent-many-generic (foo5.l): Likewise. + * tests/lex-lib.test (mu.c): Likewise. + Update heading comments, to refer to ... + * tests/lex-lib-external.test: ... this new test, which checks + that we can get use the `yywrap' function from a system-wide + library, if that's available. + +2011-06-01 Stefano Lattarini + + tests: prefer `skip_' over `echo ...; Exit 77' + * tests/self-check-cleanup.test: When the test must be skipped, + use `skip_ REASON' instead of `echo REASON; Exit 77'. Also, + make the skip message shorter and clearer. + +2011-06-01 Stefano Lattarini + + tests: fix spurious failures in self tests + Our ad-hoc usage of `tests/defs' in the testsuite's self tests + stopped working properly when we made the test scripts re-execute + themselves with the configure-time $SHELL. Fix this. + Fixes a bug introduced by commit 'v1.11-874-g1321be7'. + * tests/defs: Only check that we can find the client test script + when we must re-execute it. + * tests/self-check-cleanup.test: Export `AM_TESTS_REEXEC' to "no" + before running the self tests. + * tests/self-check-dir.test: Likewise. + * tests/self-check-explicit-skips.test: Likewise. + * tests/self-check-me.test: Likewise. + * tests/self-check-sanity.test: Likewise. + * tests/self-check-reexec.test: New test. + * tests/Makefile.am (TESTS): Update. + +2011-06-01 Stefano Lattarini + + tests: prefer ulimit over timeout in test on a memory-hogging bug + * tests/cond29.test: Use 'ulimit' instead of 'timeout' to ensure + that automake does not uses up too much resources. This is really + and improvement because the bug tested by this script wasn't just + a "it hangs" or "it runs too slow" bug, but rather a memory-hogging + bug (due to combinatorial explosion when many Automake conditionals + had to be handled) which could easily crash the whole system, which + is unacceptable. The requirement of a proper and working 'ulimit' + builtin might cause the test to be skipped on more systems, but + that shouldn't be a problem since the bug isn't about a portability + issue, but is rather an automake internal implementation problem. + I've verified that the test as updated by this patch still passes + with automake 1.8.5, automake 1.10.2, and obviously the development + version of automake, and that it fails with automake 1.7.9. + +2011-06-01 Stefano Lattarini + + testsuite: avoid generating `*-p.test' tests, use a wrapper script + The generated `*-p.test' tests had already become just thin layers + around the corresponding test scripts. This change makes the final + step, converting to the use of a generic wrapper script and thus + avoiding the extra test generation (similarly to what is done for + the `*.instspc' and `*.depmod' tests). + * tests/parallel-tests.sh: New file, driver script to run checks + the on the `parallel-tests' semantics by wrapping tests that use + the generic "Simple Tests" driver. + * tests/gen-parallel-tests: Update, mostly to reflect the new + `.ptest' extensions used for tests in $(parallel_tests). + * Makefile.am (TESTS_EXTENSIONS): Add `.ptest'. + (PTEST_LOG_COMPILER): Define, it calls `parallel-tests.sh'. + ($(parallel_tests)): Do not really generate `*-p.test' tests + anymore; this is now just a dummy dependency declaration required + in order to have make actually produce expected log files from + the `.ptest.log' suffix rule. + (EXTRA_DIST): Distribute `parallel-tests.sh'. + (MAINTAINERCLEANFILES): Don't remove the `$(parallel_tests)', it + is not necessary anymore. + (generated_tests): Variable definition removed. + (TESTS): Update, by listing `$(parallel_tests)' directly instead + of `$(generated_tests)' + (expected_list_of_tests): Remove `$(generated_tests)'. + (maintainer-check-list-of-tests): No need to explicitly depend on + `$(expected_list_of_tests)' anymore. + 2011-05-29 Stefano Lattarini automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE diff --cc tests/Makefile.am index 02a99b6f0,e68f6d70f..d863b2833 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -824,8 -807,10 +824,12 @@@ remake10b.test remake10c.test \ remake11.test \ remake12.test \ +remake-all-1.test \ +remake-all-2.test \ + remake-subdir-from-subdir.test \ + remake-subdir-gnu.test \ + remake-subdir.test \ + remake-subdir2.test \ remake-gnulib-add-acsubst.test \ remake-gnulib-add-header.test \ remake-gnulib-remove-header.test \ diff --cc tests/Makefile.in index 4e4d4a953,7e5fd0964..d2975d7ac --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -1112,8 -1074,10 +1112,12 @@@ remake10b.test remake10c.test \ remake11.test \ remake12.test \ +remake-all-1.test \ +remake-all-2.test \ + remake-subdir-from-subdir.test \ + remake-subdir-gnu.test \ + remake-subdir.test \ + remake-subdir2.test \ remake-gnulib-add-acsubst.test \ remake-gnulib-add-header.test \ remake-gnulib-remove-header.test \