From: Stefano Lattarini Date: Mon, 8 Aug 2011 12:42:42 +0000 (+0200) Subject: Merge branch 'master' into test-protocols X-Git-Tag: ng-0.5a~89^2~129^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cf22db73f5374bd0f528abfaf65987eab12a665;p=thirdparty%2Fautomake.git Merge branch 'master' into test-protocols * master: test defs: more environment cleanup --- 2cf22db73f5374bd0f528abfaf65987eab12a665 diff --cc ChangeLog index 232230d56,a8a671141..f7b195fb2 --- a/ChangeLog +++ b/ChangeLog @@@ -1,35 -1,9 +1,41 @@@ + 2011-08-08 Stefano Lattarini + + test defs: more environment cleanup + * tests/defs: Also unset variables AM_COLOR_TESTS and + AM_TESTS_ENVIRONMENT. + +2011-08-08 Stefano Lattarini + + test harness: more minor VPATH-rewrite issues + * tests/am/check.am (am__set_TESTS_bases, $(TEST_SUITE_LOGS), + am--redo-logs, recheck, recheck-html): Cosmetic fixlets to + minimize the risk of unwanted VPATH rewrites. + (check-TESTS): Likewise, and normalize trailing whitespace + since we are at it. + Bugs exposed by test cases `check6-p.test' and `check7-p.test'. + +2011-08-08 Stefano Lattarini + + test harness: "make -n check" works correctly with Solaris make + To avoid some recipes being executed with "make -n", we used the + trick of issuing recursive make calls not directly with $(MAKE), + but with a simple indirection instead: + ... + am__stealth_MAKE = $(MAKE) + ... + target: + ... $(am__stealth_MAKE) ... + ... + This hack worked with GNU make, but, unfortunately, not with + Solaris make. The present change removes the hack, and uses more + proper idioms to avoid unwanted recipe executions with "make -n". + Bug exposed by test case `parallel-tests-dry-run.test'. + * lib/am/check.am (am__stealth_MAKE): Remove, no more used. + (.log.trs): Break recipe in multiple shell invocations. + ($(TEST_SUITE_LOG)): Likewise, and move some corner-case parts of + the recipe to ... + (am--redo-logs): ... this new internal helper .PHONY target. + 2011-08-08 Stefano Lattarini tests: fix spurious failure with Solaris make