From: Stefano Lattarini Date: Thu, 9 Feb 2012 19:07:06 +0000 (+0100) Subject: Merge branch 'master' into ng/master X-Git-Tag: ng-0.5a~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7898eaf2aeeeddf5e7fe6797064b4e732960b129;p=thirdparty%2Fautomake.git Merge branch 'master' into ng/master * master: (29 commits) tests: avoid wrong skips in dist-formats.tap tests: few tweakings and cosmetic changes tests: remove a couple of redundant 'set -e' calls tests: check if 'compress' is real or fake depcomp tests: avoid spurious failures with 'dashXmstdout' depmode depcomp: try to prevent whitespace regressions depcomp: recognize tabs as whitespace in the dashmstdout mode depcomp: quote 'like this', not `like this' tests: check the depmodes 'msvisualcpp' and 'msvcmsys' tests: better way to compare lists in Makefile rules tests: improve and rework tests on dependency tracking tests: fix a timestamp-related spurious failures dryrun: fix regression with '$(am__make_dryrun)' test defs: avoid spurious XPASS results with NetBSD make cosmetics: few whitespace fixlets cosmetics: various typofixes cosmetics: convert encoding from ISO-8859 to UTF-8 in some tests test defs: remove obsolete requirement 'rst2html' tests: workaround for shells with broken 'set -e' cosmetics: fix a typo in comments ... --- 7898eaf2aeeeddf5e7fe6797064b4e732960b129 diff --cc lib/am/check.am index c6d9a18db,777cb6ffc..9cb3b76a4 --- a/lib/am/check.am +++ b/lib/am/check.am @@@ -127,38 -127,8 +127,8 @@@ am__set_TESTS_bases = # to avoid problems with "make -n". .log.trs: rm -f $< $@ - $(MAKE) $(AM_MAKEFLAGS) $< + $(MAKE) $< - # Helper recipe used by $(TEST_SUITE_LOG) below, to avoid problems with - # "make -n". Break this recipe in multiple shell invocations too, to - # really work as expected with "make -n". - am--redo-logs: - @rm -f $$redo_logs - @rm -f $$redo_results - ## The use of the `am__remaking_logs' environment variable below is - ## required to ensure that we don't go into an infinite recursion in - ## case a test log in $(TEST_LOGS) is the same as $(TEST_SUITE_LOG). - ## Yes, this has already happened in practice. Sigh! - @if test -n "$$am__remaking_logs"; then \ - echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ - "recursion detected" >&2; \ - else \ - am__remaking_logs=yes $(MAKE) $$redo_logs; \ - fi; - ## Sanity check: each unreadable or non-existent test result file should - ## has been properly remade at this point, as should the corresponding log - ## file. - @st=0; \ - errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ - for i in $$redo_bases; do \ - test -f $$i.trs && test -r $$i.trs \ - || { echo "$$errmsg $$i.trs"; st=1; }; \ - test -f $$i.log && test -r $$i.log \ - || { echo "$$errmsg $$i.log"; st=1; }; \ - done; \ - test $$st -eq 0 - .PHONY: am--redo-logs - $(TEST_SUITE_LOG): $(TEST_LOGS) @$(am__set_TESTS_bases); \ ## Helper shell function, tells whether a path refers to an existing, @@@ -359,15 -361,11 +361,11 @@@ check-TESTS recheck ## with the files to recheck, so that those will be rerun by the ## "make test-suite.log" recursive invocation below. But use a proper ## hack to avoid extra files removal when running under "make -n". - if test $@ = recheck && test -n "$$list"; then \ - { \ - echo 'am--clean: am--clean-log am--clean-trs'; \ - echo 'am--clean-log: ; rm -f $$(am__logs)'; \ - echo 'am--clean-trs: ; rm -f $$(am__logs:.log=.trs)'; \ - } | $(MAKE) -f - am--clean am__logs="$$list" \ - || exit 1; \ + if test $@ != recheck || $(am__make_dryrun); then :; else \ + test -z "$$log_list" || rm -f $$log_list; \ + test -z "$$trs_list" || rm -f $$trs_list; \ fi; \ - $(MAKE) $(TEST_SUITE_LOG) TEST_LOGS="$$list" - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list" ++ $(MAKE) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list" ## Recheck must depend on $(check_SCRIPTS), $(check_PROGRAMS), etc. recheck: %CHECK_DEPS% diff --cc tests/check8.test index 97ed250f3,6906318d4..5476f362f --- a/tests/check8.test +++ b/tests/check8.test @@@ -65,8 -64,8 +65,8 @@@ $AUTOCON $AUTOMAKE -a ./configure - $MAKE check AM_COLOR_TESTS=always >stdout 2>stderr && -AM_COLOR_TESTS=always $MAKE check >stdout 2>stderr && -- { cat stdout; cat stderr >&2; Exit 1; } ++AM_COLOR_TESTS=always $MAKE check >stdout 2>stderr \ ++ && { cat stdout; cat stderr >&2; Exit 1; } cat stdout cat stderr >&2 grep 'XPASS.* foo$' stdout diff --cc tests/conffile-leading-dot.test index d1306be4b,382124e25..ff582db03 --- a/tests/conffile-leading-dot.test +++ b/tests/conffile-leading-dot.test @@@ -18,10 -18,9 +18,8 @@@ # with a dot (like "./Makefile"), since the remake rules might be subtly # broken in that case. -required=GNUmake . ./defs || Exit 1 - set -e - cat > configure.in << END AC_INIT([$me], [1.0]) AM_INIT_AUTOMAKE diff --cc tests/list-of-tests.mk index da40dab74,d2ad678c5..03477099b --- a/tests/list-of-tests.mk +++ b/tests/list-of-tests.mk @@@ -323,23 -324,14 +322,17 @@@ deleted-m4.test depacl2.test \ depcomp.test \ depcomp2.test \ - depcomp3.test \ - depcomp4.test \ - depcomp5.test \ - depcomp6.test \ - depcomp7.test \ depcomp8a.test \ depcomp8b.test \ +depcomp-recover.test \ +depcomp-shuffle.test \ +depcomp-shuffle-vpath.test \ +depcomp-shuffle-sub.test \ +depcomp-shuffle-sub-vpath.test \ depdist.test \ depend.test \ - depend2.test \ depend3.test \ depend4.test \ -depend5.test \ -depend6.test \ deprecated-acinit.test \ destdir.test \ dirlist.test \ diff --cc tests/test-driver-custom-multitest-recheck2.test index 94d8d3bec,e7c183d30..9f15d0e44 --- a/tests/test-driver-custom-multitest-recheck2.test +++ b/tests/test-driver-custom-multitest-recheck2.test @@@ -105,8 -105,9 +105,8 @@@ for vpath in : false; d done unset var - : a.test was sucessfull the first time, no need to re-run it. + : a.test was successful the first time, no need to re-run it. - env TESTS=a.test $MAKE -e recheck >stdout \ - || { cat stdout; Exit 1; } + $MAKE TESTS=a.test recheck >stdout || { cat stdout; Exit 1; } cat stdout count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0 test ! -r a.run