From: Stefano Lattarini Date: Fri, 10 Dec 2010 21:26:03 +0000 (+0100) Subject: Merge branch 'tests-dejagnu-extend' X-Git-Tag: ng-0.5a~312 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eee3f059062cec0e2c9fcafa8f4ad711ae959509;p=thirdparty%2Fautomake.git Merge branch 'tests-dejagnu-extend' --- eee3f059062cec0e2c9fcafa8f4ad711ae959509 diff --cc ChangeLog index beb58484e,f17c01f6b..f7d9ba8a9 --- a/ChangeLog +++ b/ChangeLog @@@ -1,148 -1,44 +1,189 @@@ + 2010-12-10 Stefano Lattarini + + Extend and improve tests on DejaGnu support. + * tests/dejagnu.test: Do not create useless dummy test script. + Add trailing `:' command. In heading comments, add reference + to ... + * tests/check12.test: ... this new "semantic" test, covering + concurrent use of dejagnu tests, simple tests and `check-local' + target. + * tests/dejagnu2.test: Make test more reliable, by avoid weak + grepping of make output. Prefer `cat' over `echo' to append + to configure.in. Quote literal dots in grep regexps. Prefer + `grep -c ...' over `grep ... | wc -l'. Make grepping of + automake stderr slightly stricter. Add trailing `:' command. + * tests/dejagnu3.test: Prefer `cat' over `echo' to append to + configure.in. Check stderr of expected-to-fail "make" call. + Remove extra blank lines from Makefile.am. + * tests/dejagnu4.test: Prefer `cat' over `echo' to append to + configure.in. Prefer `mv -f' over plain `mv' when the target + file already exists. Avoid extra mkdir calls by creating more + directories at once. Better use of blank lines. Check that + the `*.log' and `*.sum' files are created by runtest also when + "make check" fails. + * tests/dejagnu7.test: Prefer `cat' over `echo' to append to + configure.in. Better use of blank lines. Add a trailing `:' + command. + * tests/dejagnu6.test: Likewise, and give the dejagnu test a + more descriptive name. + * tests/dejagnu5.test: Likewise. Also, simply define package + name to `$me' rather than using a non-obvious sed script to + extract it from `AC_INIT', and write the Makefile.am with only + one command. + * tests/Makefile.am (TESTS): Updated. + + 2010-12-10 Ralf Wildenhues + + Avoid running installed automake from 'libtool --help'. + * tests/subobj9.test: Export AUTOCONF and AUTOMAKE. + Together with fixed Libtool, this fixes check-coverage to not + invoke installed automake. + +2010-12-06 Stefano Lattarini + + Separate checks on target overriding into multiple test scripts. + * tests/overrid.test: Deleted, its contents separated into ... + * tests/override-suggest-local.test: ... this new test ... + * tests/override-html.test: ... and this new test ... + * tests/override-conditional-1.test: ... and this new test ... + * tests/override-conditional-2.test: ... and this new test (still + xfailing). + * tests/Makefile.am (TESTS, XFAIL_TESTS): Updated. + + Enable `set -e' in more tests (plus some tweakings). + * tests/implicit.test: Enable `errexit' shell flag, and related + changes. Add trailing `:' command. + * tests/insh2.test: Likewise. + * tests/instman2.test: Likewise. + * tests/interp.test: Likewise. + * tests/interp2.test: Likewise. + * tests/library.test: Likewise. + * tests/mclean.test: Likewise. + * tests/info.test: Enable `errexit' shell flag, and related + changes. Add trailing `:' command. Remove useless chaff from + generated Makefile.am. Add a "FIXME" comment. + * tests/include.test: Enable `errexit' shell flag, and related + changes. Add trailing `:' command. Prefer cat + here-doc over + echo to append to configure.in. Make tests more robust by using + longer and less common names to grep. Remove an useless call to + echo. Remove an useless subshell. + * tests/header.test: Enable `errexit' shell flag, and related + changes. Use proper m4 quoting. Add excerpts from the original + report of the bug tested for by this script. + * tests/gcj.test: Enable `errexit' shell flag, and related + changes. Use proper m4 quoting. Add trailing `:' command. + * tests/gcj3.test: Likewise. + * tests/ldflags.test: Likewise. + * tests/libtool.test: Likewise. + * tests/listval.test: Likewise. + * tests/javaprim.test: Likewise, and prefer cat + here-doc over + echo to append to configure.in. + * tests/javasubst.test: Likewise. + * tests/discorver.test: Enable `errexit' shell flag. Prefer + trailing `:' over trailing `Exit 0'. + * tests/instdat.test: Enable `errexit' shell flag, and related + changes. Use proper m4 quoting. Avoid usless subshell. Prefer + cat + here-doc over echo to append to configure.in. + * tests/libtool2.test: Enable `errexit' shell flag, and related + changes. Add trailing `:' command. Use the configure.in + stub provided by ./defs, rather than writing it from scratch. + + Modernize, improve and/or tweak some test scripts. + * tests/maintclean.test: Use proper m4 quoting. Add trailing `:' + command. + * tests/sinclude.test: Likewise, and add a couple of blank lines, + for clarity. + * tests/make.test: Move setting of `errexit' shell flag earlier in + the script (just after inclusion of ./defs). Use the configure.in + stub created by ./defs, rather than writing it from scratch. Some + cosmetic changes in spacing. Ensure we wait enough time before + touching configure.in to trigger the rebuild rules. + * tests/makej.test: Use `$me' instead of hard-coding the test + name. Add trailing `:' command. + * tests/version7.test: Likewise. + * tests/space.test: Enable `errexit' shell flag, and related + changes. + * tests/makevars.test: Likewise. Also, prefer trailing `:' over + trailing `Exit 0', and be more tolerant of white spaces when + grepping Makefile.in. + +2010-12-02 Stefano Lattarini + + * tests/silent8.test: Use "|| Exit 1" after ". ./defs". + + Enable `set -e' in more tests (plus some tweakings). + * tests/mkinstall.test: Enable `errexit' shell flag, and related + changes. Add a trailing `:' command, if needed. + * tests/mdate2.test: Likewise. + * tests/objc.test: Likewise. + * tests/noinst.test: Likewise. + * tests/outdir.test: Likewise. + * tests/number.test: Likewise. + * tests/pluseq.test: Likewise. + * tests/req.test: Likewise. + * tests/rulepat.test: Likewise. + * tests/specflg6.test: Likewise. + * tests/spell3.test: Likewise. + * tests/parse.test: Likewise, and ... + (configure.in): Use the stub created by ./defs, rather than + writing it from scratch. Remove useless calls to AC_PROG_RANLIB + and AC_OUTPUT. + * tests/mdate4.test: Likewise. + * tests/mkinstall.test: Likewise, and ... + (configure.in): ... drop useless call to `AC_OUTPUT'. + * tests/output.test: Enable `errexit' shell flag, and related + changes. Add a trailing `:' command. + (configure.in): Modernize. + * tests/output2.test: Likewise. + * tests/output3.test: Likewise. + * tests/output4.test: Likewise. + * tests/mdate3.test: Enable `errexit' shell flag, and related + changes. Prefer `$me' over hard-coded test name. Do not move + non-existent or useless files in the build auxiliary directory. + * tests/nodistdir.test: Enable `errexit' shell flag, and related + changes. Prefer trailing `:' over trailing `Exit 0'. + * tests/nodist.test: Likewise. Also, prefer cat + here-doc over + echo to create input test files, and do not create useless dummy + C source files. + * tests/nodist2.test: Likewise. + * tests/ppf77.test: Enable `errexit' shell flag, with related + changes. Add a trailing `:' command. Do not create useless + dummy source files. + * tests/spelling.test: Enable `errexit' shell flag, with related + changes. Add a trailing `:' command. Also, grep Automake error + message. + * tests/specflg3.test: Enable `errexit' shell flag, with related + changes. Avoid unportable use of `-e' option of fgrep. Prefer + trailing `:' over trailing `Exit 0'. Remove extra empty lines, + and cosmetic changes to whitespaces. + * tests/obsolete.test: Enable `errexit' shell flag, with related + changes. Improve verbosity. Other miscellanous changes. + +2010-11-30 Stefano Lattarini + + Improve and extend tests on `:=' variable assignments. + * tests/colneq.test: Avoid redundant use of variable assignments + in Makefile.am. Use command-line automake options instead of + editing AUTOMAKE_OPTIONS in Makefile.am. Make grepping of the + generated Makefile.in slightly stricter. Add a trailing `:' + command. + * tests/colneq2.test: Do not create unneeded dummy files. Run + also autoconf, ./configure and make. Add trailing `:' command. + * tests/colneq3.test: New test, similar to colneq.test, but + running also autoconf, ./configure and make. + * tests/Makefile.am (TESTS): Update. + +2010-11-26 Stefano Lattarini + + Remove long-deprecated options --Werror and --Wno-error. + These options has been deprecated at least since commit + "Release-1-6-1b-35-gc037f20", dated 2002-07-06. + * automake.in (parse_arguments): Do not recognize anymore options + `--Werror' and `--Wno-error' as synonyms of respectively `-Werror' + and `-Wno-error'. + * tests/werror.test: Update: use `-Werror' instead of `--Werror'. + * NEWS: Update. + 2010-11-25 Stefano Lattarini Fix spurious failures in `silent*.test' for $CC != gcc diff --cc tests/Makefile.in index 154e120d1,40b469793..55d144689 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -281,80 -272,38 +281,80 @@@ 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 \ -txinfo5.test - -parallel_tests = \ -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 \ -pr401-p.test \ -pr401b-p.test \ -pr401c-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 txinfo5.test \ + $(instspc_xfail_tests) +parallel_tests = backcompat5-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 \ - pr401-p.test pr401b-p.test pr401c-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 pr401-p.test pr401b-p.test pr401c-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 TESTS = \ aclibobj.test \ aclocal.test \ @@@ -1483,83 -1400,15 +1484,84 @@@ 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-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 +pr401-p.log: pr401.test +pr401b-p.log: pr401b.test +pr401c-p.log: pr401c.test $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am - (cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@ + $(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) >$@ -$(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 $@ +$(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. +$(instspc_tests:.test=.log): instspc-tests.sh + +# Each test case depends on defs, aclocal, and automake. +$(TEST_LOGS): defs aclocal-$(APIVERSION) automake-$(APIVERSION) clean-local: clean-local-check .PHONY: clean-local-check