[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11-1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11-1988-g0e03530 |
|
Date: |
Thu, 16 Feb 2012 14:28:39 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=0e035304b3cac2e3087ee08ed2b21ce8dcb1ab85
The branch, ng/master has been updated
via 0e035304b3cac2e3087ee08ed2b21ce8dcb1ab85 (commit)
via f85330b2baa5b56301a4401f36084e8bed3de651 (commit)
via 8817647ecd144e93b74b753ff197bb75c606640d (commit)
via 4bcab4a0be1fa930be89f1e4b31eb3f98d17f7d0 (commit)
via 85d414318eddf5ba4f91fe65bdbf4c4e7cdc6e37 (commit)
via ab42f4a402242ee6f2b93a92dc133e7ef664b060 (commit)
via 22b28b638a2d7d9d05bf7f2741367fc36f8bb8c0 (commit)
via a0be183729db528716a92665cf4332d616c132a9 (commit)
via ba5a89bec39d85b9033b9a2f7193221b7a2ba3db (commit)
via acde2706ea7644f16b2c686ce3c0c8cf95774ff5 (commit)
via 641a5a4bf09cdc07acf1539caa86f6197feb032e (commit)
via 0313d37bd0f5016e85aaea03bb5b1309cf03db19 (commit)
via 957b720009f29b248e1c7303bf2d684af75c3a1f (commit)
via db5ddc2bfceeb4470d02c2ff2375cf5900415493 (commit)
via 355e607b4d97870e16c470f273c92b7fad14d81c (commit)
via 9179b6d0484f7c5535123096fd206dc22019be9b (commit)
via e05e1beda210998a42625662b852f995d5b2e82a (commit)
via 8dd5009996be46270a58bde8be4343410ea5df51 (commit)
via 7726b2e999d2064546f258db607233ae3aac04f1 (commit)
via fd0ca827e7acbbb89aed74f057e4c23a4223f3b3 (commit)
via 8f41580e5d039d9549f7e73f51c2e82de4075015 (commit)
via f4d2f3b76702ee43025c809d3588662859146943 (commit)
via de839e5b0f4a95242f03f731110ac07e72cf146c (commit)
via 43b8af82db9fb7077ae687998bf96e9781460665 (commit)
via 7604b2eede07b84b2f22c81a11db2078f8ffe3da (commit)
via b2c1adfe1e118ed8fb5fc68ced68ef69ea39b543 (commit)
via 02ce5d5a0ce42563e8aa8ea03a977d35f3a30f72 (commit)
via ff8269e114bcee4070b8837c1e8715dd5c22d04f (commit)
via df79bb4b0414009e212e7189ba732d347ba536ee (commit)
via 2a2500cef5aaea77789a0f7bfc5d9b12c7a1b61f (commit)
via 4ced60d7fc474f008d642e280f7205f75f7c04d9 (commit)
via 06684c510ab3115093178cdcfb28c2fff41b324c (commit)
via f874f9eeb7d996a7fc56c11342e9a094a87a402a (commit)
via b42514b48a5104785737cb4459e177b98d023ed7 (commit)
via 4933232e195fa4650400990bfba4c88fae9b8a29 (commit)
via 2c430b160d34f6d27bdbf92dbde3b7fbae8b12a9 (commit)
via 79b2c6a58577662070f8f8827f5e6f665ebd102a (commit)
via ee07d99289e9da3f601fe3f5512d20516fdb4f58 (commit)
via 36eef89b91db0eff6a1cb9f51df8d50f728e54f0 (commit)
via b3f34caa4a4b9ff6862f3b4f1d45560ea4ffee5f (commit)
via ee29b576923c240a951b7f0d93b7cb5d6a33face (commit)
via a2437fee3612a2186005d361c84d62a9859278d7 (commit)
via 568a1a5e0bfc5bbe1e6d683fe38871a906c2f2a8 (commit)
via dae8578ed1fbdff7e60e4bb069700182d5ede6a5 (commit)
via 682d5ce5382ab50d63eaf9fe373a1370bb435b6f (commit)
via e0906b7e17bc34b1183d273ca0571c10d5619c08 (commit)
via 0b34421dc2d78a163ce9eaca41348dd672c302ed (commit)
via e6c40d4bba3155a8dd2406806a7be51d3ac73ed0 (commit)
via abe0587b12ac59561d011640d998e7dd74b1820f (commit)
via bdfd2295149398a2872f1794abffd1292f8c0492 (commit)
via 19bab32531bc8c41e984460a2fa59205ecb623cd (commit)
via 818bc406278a138da6480412d3c289f91e6dbfda (commit)
via df6841b7d543abc9731b4b42a2392089a41fb838 (commit)
via 9f2642d4f91d5d6191b21ae1df5842b261c0b854 (commit)
via 65a1bf9980d62187708f78b53a4e92907677aa99 (commit)
via f0645e2ddf6327fafdd072d1c30d15f48510e605 (commit)
via 1560265e1ca8d5c542d27a4143e1879379831e12 (commit)
via 0a8cfb4c59d2523ecd7a8f253afce8f8e436594f (commit)
via a9edac6c6e0c33d6571d6ef5ce0bbf682459c3bc (commit)
via 91ea62abccb87e2a1ae989bae95640d8913d2970 (commit)
via 0f3b3e840715c4a287e1f467ce552820d07253fd (commit)
via d3612a83d0db6f570450da176c828fed0501e8df (commit)
via 6399e59a930314ef6b4945fbcae4d76dfa74af87 (commit)
via 5f2ec6ccb226272ab94077ab0898af188b5999cf (commit)
via c2ee522f4555e2ac326e5b07c03a2f5b56b556d3 (commit)
via ebb212043205b4ce9d1ec025e0bd99b4de9cbdb2 (commit)
via 94f3f898ff4bac2c67c254b7bf933a2698f0115c (commit)
via 3efb29e48c0721a6d270c3c2a3e91c71792f1e2c (commit)
via f2ed2817e85bb9e174889171cbc8d2bcb2694f59 (commit)
via 1d76d3f56efbaf6152ce5a6795fd0b2a3d0d92dd (commit)
via 73c31733ff88493f751938451600d6950f9fb0b7 (commit)
via e79aed067f344f7431346ef6d97859abd30e18f4 (commit)
via 9474426b7637f2d6dcfa454f0e77bb0ebe1fd741 (commit)
via 9ef5f5ffede710fe01cab5e4a62773a763c2eafd (commit)
via b50458a6f8766aa2369995f8f664334f97f94a23 (commit)
via fea854ed044c3bdb3f7d85fafa35e1d17a9e63fc (commit)
via b67712acad6d2b0be448687c76e69a43b71e27b4 (commit)
via 68da6ae8ce04258668e63aee320011c8bf130d18 (commit)
via 1e6914a488ba23c9a098510d100de7cbe6edb79d (commit)
via 4a187a50b89839f823f174256afa0903e0040a97 (commit)
via f88a6ca185c106aecf11953b044acc7ae40599b4 (commit)
via 83974491df282581b9d5c4ded42153043ee53a8a (commit)
via 34d2d2f08ed9891e50fd99d35645afdd038c5402 (commit)
via 80cafde38274058f6194632d2719e64e9446f488 (commit)
via 916b5702472d1282c6ef8895503cfb72a71b8113 (commit)
via 978b6989d59e31c516421f82fbca64b99d48f741 (commit)
via d986a8006ff7ce7fbe6f50b3242167cefa94448b (commit)
via 92efa457efce86a1b9c4dfa928d6c9e37c0736ea (commit)
via a0e045d60639b630b06214a3f05f9f353ed73a63 (commit)
via d6186ffa1f4b9889f2b30fd52fca1b26d2cbf3af (commit)
via 87918bb4fd5b4a9d93e710454525300f372c9057 (commit)
via 21e109d87e24c23dc88f39294a8fb0f83151f192 (commit)
via 69513875e7847a5b6b89ffb58721daee9a49f06b (commit)
via 2f16c2e9bb84027e6b42d74f7906db5ccdcd086d (commit)
via 395e5abd368bba4ecd6a1934ad5ceeebc73ba4b3 (commit)
via 7ad822a39190682bc159c2f9c21c25a4273d037c (commit)
via f02ce8d9f9c1c287915a8acef067cc2e30875b05 (commit)
via 7c0d9cbbffbbe11bf1d863b7fe2c63cd6e86b584 (commit)
via 2b1609fc05d829fa8bf10dda48de81396515ddc1 (commit)
via 4ed586c011158cb60ba310fb20604184c5b25ebc (commit)
via 0f4005f0838abb58e77a5a352225efebdb28464c (commit)
via da7f6125bd8dffa08c10a0fc7baeb812f8c6aada (commit)
via 06efe9c467768a25c374b5d47dc8f1412874352d (commit)
via 34ca92b99405c5d0361a64a2eb9a70d0f6f0c3cd (commit)
via 076f8a295193344e77e1f9e37a908978688c3600 (commit)
via 05aa7398db64e97090b0ba5fbccd4a31ebaf9c8c (commit)
via d47433523cced767f8c48fa39aa0556d552d323d (commit)
via 478d8f99b33b22809f7e04245869a60507e8207b (commit)
via aa9a269b397af1c29de1f1fa40bd36b8d2759699 (commit)
via d86a273998952c09a569121c252512556b00d985 (commit)
via 0283a956cd5f0a4522e2c3f1fa7155944464348e (commit)
via 0532535cad4197145cef54918b641e373629b264 (commit)
via a33290b3dd6726e3d8c09975053e841338ec2b67 (commit)
from d5e4bc2a07ff82288ef79c8f3959618506b6a1ac (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0e035304b3cac2e3087ee08ed2b21ce8dcb1ab85
Author: Stefano Lattarini <address@hidden>
Date: Thu Feb 16 15:21:40 2012 +0100
[ng] maintcheck: fix some failures
* tests/cscope.tap: Don't use 'using_gmake', simply assume we are
indeed using GNU make.
* tests/yacc-nodist.test: Likewise.
* tests/yacc-bison-skeleton.test: Don't use "make -e".
* tests/yacc-bison-skeleton-cxx.test: Likewise.
commit f85330b2baa5b56301a4401f36084e8bed3de651
Merge: d5e4bc2 8817647
Author: Stefano Lattarini <address@hidden>
Date: Thu Feb 16 15:12:41 2012 +0100
Merge branch 'master' into ng/master
With lots of edits to solve *spurious* failures.
-----------------------------------------------------------------------
Summary of changes:
.gitattributes | 2 +-
.gitignore | 44 +-
COPYING | 2 +-
ChangeLog.00 | 2 +-
ChangeLog.01 | 2 +-
ChangeLog.02 | 2 +-
ChangeLog.03 | 2 +-
ChangeLog.04 | 2 +-
ChangeLog.09 | 2 +-
ChangeLog.11 | 592 ++++++++++-
ChangeLog.96 | 2 +-
ChangeLog.98 | 2 +-
HACKING | 6 +-
INSTALL | 3 +-
Makefile.am | 58 +-
NEWS | 24 +-
README | 3 +-
TODO | 3 +-
aclocal.in | 4 +-
automake.in | 37 +-
bootstrap | 3 +-
configure.ac | 18 +-
contrib/check-html.am | 3 +-
contrib/multilib/config-ml.in | 3 +-
contrib/multilib/multi.m4 | 3 +-
contrib/multilib/symlink-tree | 2 +-
doc/Makefile.am | 6 +-
doc/amhello/Makefile.am | 2 +-
doc/amhello/configure.ac | 2 +-
doc/amhello/src/Makefile.am | 2 +-
doc/amhello/src/main.c | 2 +-
doc/automake-history.texi | 1214 ++++++++++++++++++++
doc/automake.texi | 1196 +-------------------
doc/fdl.texi | 2 +-
lib/Automake/ChannelDefs.pm | 3 +-
lib/Automake/Channels.pm | 3 +-
lib/Automake/Condition.pm | 3 +-
lib/Automake/Config.in | 2 +-
lib/Automake/Configure_ac.pm | 3 +-
lib/Automake/DisjConditions.pm | 2 +-
lib/Automake/FileUtils.pm | 3 +-
lib/Automake/General.pm | 2 +-
lib/Automake/Item.pm | 2 +-
lib/Automake/ItemDef.pm | 2 +-
lib/Automake/Location.pm | 2 +-
lib/Automake/Makefile.am | 3 +-
lib/Automake/Options.pm | 3 +-
lib/Automake/Rule.pm | 3 +-
lib/Automake/RuleDef.pm | 2 +-
lib/Automake/Struct.pm | 2 +-
lib/Automake/VarDef.pm | 2 +-
lib/Automake/Variable.pm | 3 +-
lib/Automake/Version.pm | 2 +-
lib/Automake/Wrap.pm | 2 +-
lib/Automake/XFile.pm | 3 +-
lib/Makefile.am | 5 +-
lib/acinstall | 2 +-
lib/am/Makefile.am | 3 +-
lib/am/check.am | 7 +-
lib/am/check2.am | 2 +-
lib/am/clean-hdr.am | 3 +-
lib/am/clean.am | 3 +-
lib/am/compile.am | 3 +-
lib/am/configure.am | 3 +-
lib/am/data.am | 3 +-
lib/am/dejagnu.am | 3 +-
lib/am/depend.am | 3 +-
lib/am/depend2.am | 4 +-
lib/am/distdir.am | 3 +-
lib/am/footer.am | 2 +-
lib/am/header-vars.am | 7 +-
lib/am/header.am | 2 +-
lib/am/inst-vars.am | 2 +-
lib/am/install.am | 3 +-
lib/am/java.am | 3 +-
lib/am/lang-compile.am | 2 +-
lib/am/lex.am | 3 +-
lib/am/library.am | 3 +-
lib/am/libs.am | 3 +-
lib/am/libtool.am | 3 +-
lib/am/lisp.am | 3 +-
lib/am/ltlib.am | 3 +-
lib/am/ltlibrary.am | 3 +-
lib/am/mans-vars.am | 2 +-
lib/am/mans.am | 3 +-
lib/am/program.am | 3 +-
lib/am/progs.am | 3 +-
lib/am/python.am | 3 +-
lib/am/remake-hdr.am | 3 +-
lib/am/scripts.am | 3 +-
lib/am/subdirs.am | 3 +-
lib/am/tags.am | 3 +-
lib/am/texi-vers.am | 3 +-
lib/am/texibuild.am | 3 +-
lib/am/texinfos.am | 3 +-
lib/am/vala.am | 2 +-
lib/am/yacc.am | 15 +-
lib/ar-lib | 2 +-
lib/compile | 3 +-
lib/config.guess | 16 +-
lib/config.sub | 19 +-
lib/depcomp | 3 +-
lib/elisp-comp | 3 +-
lib/mdate-sh | 3 +-
lib/missing | 3 +-
lib/py-compile | 3 +-
lib/tap-driver.pl | 2 +-
lib/tap-driver.sh | 2 +-
lib/test-driver | 2 +-
lib/texinfo.tex | 89 +-
lib/update-copyright | 274 +++++
lib/ylwrap | 3 +-
m4/Makefile.am | 3 +-
m4/amversion.in | 3 +-
m4/amversion.m4 | 3 +-
m4/ar-lib.m4 | 2 +-
m4/as.m4 | 2 +-
m4/auxdir.m4 | 2 +-
m4/ccstdc.m4 | 3 +-
m4/cond-if.m4 | 2 +-
m4/cond.m4 | 3 +-
m4/depend.m4 | 3 +-
m4/dmalloc.m4 | 3 +-
m4/gcj.m4 | 3 +-
m4/header.m4 | 3 +-
m4/init.m4 | 3 +-
m4/install-sh.m4 | 3 +-
m4/lead-dot.m4 | 2 +-
m4/lex.m4 | 3 +-
m4/lispdir.m4 | 3 +-
m4/maintainer.m4 | 3 +-
m4/minuso.m4 | 3 +-
m4/missing.m4 | 3 +-
m4/mkdirp.m4 | 3 +-
m4/obsol-gt.m4 | 2 +-
m4/obsol-lt.m4 | 2 +-
m4/obsolete.m4 | 2 +-
m4/options.m4 | 3 +-
m4/protos.m4 | 3 +-
m4/python.m4 | 3 +-
m4/runlog.m4 | 2 +-
m4/sanity.m4 | 3 +-
m4/silent.m4 | 2 +-
m4/strip.m4 | 2 +-
m4/substnot.m4 | 2 +-
m4/tar.m4 | 2 +-
m4/upc.m4 | 2 +-
m4/vala.m4 | 2 +-
tests/ChangeLog-old | 7 +
tests/CheckListOfTests.am | 2 +-
tests/Makefile.am | 8 +-
tests/ac-output-old.tap | 3 +-
tests/acloca10.test | 3 +-
tests/acloca11.test | 2 +-
tests/acloca12.test | 2 +-
tests/acloca13.test | 2 +-
tests/acloca14.test | 2 +-
tests/acloca15.test | 5 +-
tests/acloca16.test | 2 +-
tests/acloca17.test | 2 +-
tests/acloca18.test | 3 +-
tests/acloca19.test | 2 +-
tests/acloca20.test | 2 +-
tests/acloca21.test | 2 +-
tests/acloca22.test | 2 +-
tests/acloca23.test | 2 +-
tests/aclocal-acdir.test | 2 +-
tests/aclocal-install-absdir.test | 2 +-
tests/aclocal-path-install-serial.test | 2 +-
tests/aclocal-path-install.test | 2 +-
tests/aclocal-path-nonexistent.test | 2 +-
tests/aclocal-path-precedence.test | 2 +-
tests/aclocal-path.test | 2 +-
tests/aclocal-print-acdir.test | 2 +-
tests/aclocal.in | 15 +
tests/aclocal.test | 3 +-
tests/aclocal3.test | 3 +-
tests/aclocal4.test | 2 +-
tests/aclocal5.test | 2 +-
tests/aclocal6.test | 2 +-
tests/aclocal7.test | 2 +-
tests/aclocal8.test | 3 +-
tests/aclocal9.test | 2 +-
tests/acsilent.test | 3 +-
tests/acsubst.test | 2 +-
tests/acsubst2.test | 2 +-
tests/add-missing.tap | 2 +-
tests/all.test | 3 +-
tests/all2.test | 2 +-
tests/alloca.test | 2 +-
tests/alloca2.test | 2 +-
tests/alpha.test | 3 +-
tests/alpha2.test | 2 +-
tests/am-tests-environment.test | 2 +-
tests/amassign.test | 2 +-
tests/amhello-binpkg.test | 2 +-
tests/amhello-cflags.test | 2 +-
tests/amhello-cross-compile.test | 2 +-
tests/ammissing.test | 3 +-
tests/amopt.test | 2 +-
tests/amopts-location.test | 2 +-
tests/amopts-variable-expansion.test | 2 +-
tests/amsubst.test | 2 +-
tests/ansi2knr-no-more.test | 2 +-
tests/ar-lib.test | 2 +-
tests/ar-lib2.test | 2 +-
tests/ar-lib3.test | 2 +-
tests/ar-lib4.test | 2 +-
tests/ar-lib5a.test | 2 +-
tests/ar-lib5b.test | 2 +-
tests/ar-lib6a.test | 2 +-
tests/ar-lib6b.test | 2 +-
tests/ar-lib7.test | 2 +-
tests/ar.test | 3 +-
tests/ar2.test | 2 +-
tests/ar3.test | 2 +-
tests/ar4.test | 2 +-
tests/ar5.test | 2 +-
tests/asm.test | 3 +-
tests/asm2.test | 3 +-
tests/asm3.test | 3 +-
tests/autodist-acconfig-no-subdir.test | 2 +-
tests/autodist-acconfig.test | 2 +-
tests/autodist-aclocal-m4.test | 2 +-
tests/autodist-config-headers.test | 2 +-
tests/autodist-configure-no-subdir.test | 2 +-
tests/autodist-no-duplicate.test | 2 +-
tests/autodist-stamp-vti.test | 2 +-
tests/autodist-subdir.test | 2 +-
tests/autodist.test | 2 +-
tests/autohdr.test | 2 +-
tests/autohdr2.test | 2 +-
tests/autohdr3.test | 2 +-
tests/autohdr4.test | 2 +-
tests/autohdrdry.test | 2 +-
tests/automake-cmdline.tap | 2 +-
tests/automake.in | 15 +
tests/auxdir-autodetect.test | 2 +-
tests/auxdir-computed.tap | 2 +-
tests/auxdir-misplaced.test | 2 +-
tests/auxdir-nonexistent.test | 2 +-
tests/auxdir-unportable.tap | 2 +-
tests/auxdir.test | 3 +-
tests/auxdir6.test | 2 +-
tests/auxdir7.test | 2 +-
tests/auxdir8.test | 3 +-
tests/backcompat.test | 2 +-
tests/backcompat2.test | 2 +-
tests/backcompat3.test | 2 +-
tests/backcompat4.test | 2 +-
tests/backcompat5.test | 2 +-
tests/backcompat6.test | 2 +-
tests/backsl.test | 3 +-
tests/backsl2.test | 3 +-
tests/backsl3.test | 2 +-
tests/backsl4.test | 2 +-
tests/badline.test | 3 +-
tests/badopt.test | 3 +-
tests/badprog.test | 3 +-
tests/block.test | 3 +-
tests/bsource.test | 2 +-
tests/candist.test | 2 +-
tests/canon-name.test | 2 +-
tests/canon.test | 3 +-
tests/canon2.test | 3 +-
tests/canon3.test | 3 +-
tests/canon4.test | 3 +-
tests/canon5.test | 3 +-
tests/canon6.test | 3 +-
tests/canon7.test | 2 +-
tests/canon8.test | 3 +-
tests/ccnoco.test | 2 +-
tests/ccnoco2.test | 2 +-
tests/ccnoco3.test | 3 +-
tests/check-concurrency-bug9245.test | 2 +-
tests/check-exported-srcdir.test | 2 +-
tests/check-fd-redirect.test | 2 +-
tests/check-no-test-driver.test | 2 +-
tests/check-subst-prog.test | 2 +-
tests/check-subst.test | 2 +-
tests/check-tests-in-builddir.test | 2 +-
tests/check.test | 2 +-
tests/check10.test | 3 +-
tests/check11.test | 2 +-
tests/check12.test | 7 +-
tests/check2.test | 2 +-
tests/check3.test | 2 +-
tests/check4.test | 2 +-
tests/check5.test | 3 +-
tests/check6.test | 2 +-
tests/check7.test | 2 +-
tests/check8.test | 3 +-
tests/checkall.test | 3 +-
tests/clean.test | 3 +-
tests/clean2.test | 2 +-
tests/colneq2.test | 3 +-
tests/colon.test | 3 +-
tests/colon2.test | 3 +-
tests/colon3.test | 3 +-
tests/colon4.test | 3 +-
tests/colon5.test | 3 +-
tests/colon6.test | 3 +-
tests/colon7.test | 3 +-
tests/color.test | 3 +-
tests/color2.test | 2 +-
tests/commen10.test | 2 +-
tests/commen11.test | 2 +-
tests/comment.test | 3 +-
tests/comment2.test | 3 +-
tests/comment3.test | 2 +-
tests/comment4.test | 2 +-
tests/comment5.test | 2 +-
tests/comment6.test | 2 +-
tests/comment7.test | 2 +-
tests/comment8.test | 2 +-
tests/comment9.test | 2 +-
tests/comments-in-var-def.test | 2 +-
tests/compile.test | 2 +-
tests/compile2.test | 2 +-
tests/compile3.test | 2 +-
tests/compile4.test | 2 +-
tests/compile5.test | 2 +-
tests/compile6.test | 2 +-
tests/compile_f90_c_cxx.test | 3 +-
tests/compile_f_c_cxx.test | 3 +-
tests/cond-basic.test | 3 +-
tests/cond.test | 3 +-
tests/cond10.test | 2 +-
tests/cond11.test | 3 +-
tests/cond13.test | 2 +-
tests/cond14.test | 2 +-
tests/cond15.test | 2 +-
tests/cond16.test | 2 +-
tests/cond17.test | 2 +-
tests/cond18.test | 2 +-
tests/cond19.test | 2 +-
tests/cond2.test | 3 +-
tests/cond20.test | 2 +-
tests/cond21.test | 2 +-
tests/cond22.test | 2 +-
tests/cond23.test | 2 +-
tests/cond24.test | 2 +-
tests/cond25.test | 2 +-
tests/cond26.test | 2 +-
tests/cond27.test | 2 +-
tests/cond28.test | 2 +-
tests/cond29.test | 2 +-
tests/cond3.test | 3 +-
tests/cond30.test | 2 +-
tests/cond31.test | 2 +-
tests/cond32.test | 2 +-
tests/cond33.test | 2 +-
tests/cond34.test | 2 +-
tests/cond35.test | 4 +-
tests/cond36.test | 2 +-
tests/cond37.test | 2 +-
tests/cond38.test | 2 +-
tests/cond39.test | 2 +-
tests/cond4.test | 3 +-
tests/cond40.test | 2 +-
tests/cond41.test | 2 +-
tests/cond42.test | 2 +-
tests/cond43.test | 2 +-
tests/cond44.test | 2 +-
tests/cond45.test | 2 +-
tests/cond46.test | 2 +-
tests/cond5.test | 3 +-
tests/cond6.test | 3 +-
tests/cond7.test | 3 +-
tests/cond8.test | 3 +-
tests/cond9.test | 3 +-
tests/condd.test | 3 +-
tests/condhook.test | 2 +-
tests/condhook2.test | 2 +-
tests/condinc.test | 3 +-
tests/condinc2.test | 3 +-
tests/condlib.test | 3 +-
tests/condman2.test | 3 +-
tests/condman3.test | 2 +-
tests/confdeps.test | 2 +-
tests/conff.test | 2 +-
tests/conff2.test | 2 +-
tests/conffile-leading-dot.test | 2 +-
tests/confh.test | 3 +-
tests/confh4.test | 3 +-
tests/confh5.test | 2 +-
tests/confh6.test | 3 +-
tests/confh7.test | 3 +-
tests/confh8.test | 2 +-
tests/configure.test | 2 +-
tests/confincl.test | 3 +-
tests/conflnk.test | 2 +-
tests/conflnk2.test | 2 +-
tests/conflnk3.test | 2 +-
tests/conflnk4.test | 2 +-
tests/confsub.test | 3 +-
tests/confvar.test | 3 +-
tests/confvar2.test | 3 +-
tests/copy.test | 3 +-
tests/cscope.tap | 160 +++
tests/cscope.test | 107 --
tests/cscope2.test | 2 +-
tests/cscope3.test | 2 +-
tests/cxx.test | 2 +-
tests/cxx2.test | 2 +-
tests/cxxcpp.test | 3 +-
tests/cxxlibobj.test | 3 +-
tests/cxxlink.test | 3 +-
tests/cxxnoc.test | 3 +-
tests/cxxo.test | 3 +-
tests/cygnus-check-without-all.test | 2 +-
tests/cygnus-dependency-tracking.test | 2 +-
tests/cygnus-imply-foreign.test | 2 +-
tests/cygnus-no-dist.test | 2 +-
tests/cygnus-no-installinfo.test | 2 +-
tests/cygnus-requires-maintainer-mode.test | 2 +-
tests/cygwin32.test | 3 +-
tests/dash.test | 3 +-
tests/defs | 89 +-
tests/defs-static.in | 6 +-
tests/defun.test | 3 +-
tests/defun2.test | 3 +-
tests/dejagnu-absolute-builddir.test | 2 +-
tests/dejagnu-relative-srcdir.test | 2 +-
tests/dejagnu-siteexp-append.test | 2 +-
tests/dejagnu-siteexp-extend.test | 2 +-
tests/dejagnu-siteexp-useredit.test | 2 +-
tests/dejagnu.test | 3 +-
tests/dejagnu2.test | 3 +-
tests/dejagnu3.test | 2 +-
tests/dejagnu4.test | 2 +-
tests/dejagnu5.test | 2 +-
tests/dejagnu6.test | 2 +-
tests/dejagnu7.test | 2 +-
tests/deleted-am.test | 2 +-
tests/deleted-m4.test | 2 +-
tests/depacl2.test | 3 +-
tests/depcomp-shuffle-sub-vpath.test | 2 +-
tests/depcomp-shuffle-sub.test | 2 +-
tests/depcomp-shuffle-vpath.test | 2 +-
tests/depcomp-shuffle.test | 2 +-
tests/depcomp.sh | 58 +-
tests/depcomp.test | 2 +-
tests/depcomp2.test | 2 +-
tests/depcomp8a.test | 2 +-
tests/depcomp8b.test | 2 +-
tests/depdist.test | 2 +-
tests/depend.test | 3 +-
tests/depend3.test | 3 +-
tests/depend4.test | 3 +-
tests/deprecated-acinit.test | 2 +-
tests/destdir.test | 2 +-
tests/dirlist-abspath.test | 2 +-
tests/dirlist.test | 2 +-
tests/dirlist2.test | 3 +-
tests/discover.test | 3 +-
tests/dist-auxdir-many-subdirs.test | 2 +-
tests/dist-auxfile-2.test | 2 +-
tests/dist-auxfile.test | 2 +-
tests/dist-formats.tap | 11 +-
tests/dist-included-parent-dir.test | 2 +-
tests/dist-missing-am.test | 2 +-
tests/dist-missing-included-m4.test | 2 +-
tests/dist-missing-m4.test | 2 +-
tests/dist-readonly.test | 2 +-
tests/dist-repeated.test | 2 +-
tests/distcheck-configure-flags-am.test | 2 +-
tests/distcheck-configure-flags-subpkg.test | 2 +-
tests/distcheck-configure-flags.test | 2 +-
tests/distcheck-hook-m4.am | 2 +-
tests/distcheck-hook.test | 2 +-
tests/distcheck-hook2.test | 2 +-
tests/distcheck-missing-m4.test | 2 +-
tests/distcheck-outdated-m4.test | 2 +-
tests/distcheck-override-infodir.test | 2 +-
tests/distcheck-pr9579.test | 2 +-
tests/distcleancheck.test | 2 +-
tests/distcom-subdir.test | 2 +-
tests/distcom2.test | 3 +-
tests/distcom3.test | 3 +-
tests/distcom4.test | 2 +-
tests/distcom5.test | 2 +-
tests/distdir.test | 3 +-
tests/distlinks.test | 2 +-
tests/distlinksbrk.test | 2 +-
tests/distname.test | 3 +-
tests/dmalloc.test | 2 +-
tests/doc-parsing-buglets-tabs.test | 2 +-
tests/dollar.test | 2 +-
tests/double.test | 3 +-
tests/dup2.test | 2 +-
tests/else.test | 3 +-
tests/empty.test | 3 +-
tests/empty2.test | 3 +-
tests/empty3.test | 3 +-
tests/empty4.test | 3 +-
tests/exdir.test | 3 +-
tests/exdir2.test | 3 +-
tests/exdir3.test | 2 +-
tests/exeext.test | 3 +-
tests/exeext2.test | 3 +-
tests/exeext3.test | 2 +-
tests/exeext4.test | 3 +-
tests/exsource.test | 3 +-
tests/ext.test | 3 +-
tests/ext2.test | 2 +-
tests/ext3.test | 2 +-
tests/extra-portability.test | 2 +-
tests/extra-portability2.test | 2 +-
tests/extra-programs-empty.test | 2 +-
tests/extra.test | 3 +-
tests/extra10.test | 14 +-
tests/extra11.test | 28 +-
tests/extra12.test | 2 +-
tests/extra2.test | 2 +-
tests/extra3.test | 3 +-
tests/extra4.test | 3 +-
tests/extra5.test | 2 +-
tests/extra6.test | 2 +-
tests/extra7.test | 2 +-
tests/extra8.test | 2 +-
tests/extra9.test | 2 +-
tests/extract-testsuite-summary | 15 +
tests/extradep.test | 2 +-
tests/extradep2.test | 2 +-
tests/f90only.test | 3 +-
tests/flavor.test | 2 +-
tests/flibs.test | 3 +-
tests/fn99.test | 2 +-
tests/fn99subdir.test | 2 +-
tests/fnoc.test | 3 +-
tests/fo.test | 3 +-
tests/fonly.test | 3 +-
tests/forcemiss.test | 3 +-
tests/forcemiss2.test | 3 +-
tests/fort1.test | 2 +-
tests/fort2.test | 3 +-
tests/fort4.test | 2 +-
tests/fort5.test | 2 +-
tests/fortdep.test | 3 +-
tests/gcj.test | 3 +-
tests/gcj2.test | 3 +-
tests/gcj3.test | 2 +-
tests/gcj4.test | 2 +-
tests/gcj5.test | 2 +-
tests/gcj6.test | 2 +-
tests/gen-testsuite-part | 2 +-
tests/get-sysconf.test | 2 +-
tests/gettext-macros.test | 2 +-
tests/gettext.test | 2 +-
tests/gettext2.test | 3 +-
tests/gettext3.test | 2 +-
tests/gnits.test | 3 +-
tests/gnits2.test | 3 +-
tests/gnits3.test | 2 +-
tests/gnumake.test | 2 +-
tests/gnuwarn.test | 2 +-
tests/gnuwarn2.test | 2 +-
tests/hdr-vars-defined-once.test | 3 +-
tests/header.test | 3 +-
tests/help-depend.test | 2 +-
tests/help-depend2.test | 2 +-
tests/help-dmalloc.test | 2 +-
tests/help-init.test | 2 +-
tests/help-lispdir.test | 2 +-
tests/help-multilib.test | 2 +-
tests/help-python.test | 2 +-
tests/help-silent.test | 2 +-
tests/help-upc.test | 2 +-
tests/help.test | 2 +-
tests/help2.test | 2 +-
tests/help3.test | 2 +-
tests/help4.test | 2 +-
tests/hfs.test | 2 +-
tests/implicit.test | 3 +-
tests/info.test | 3 +-
tests/init.test | 2 +-
tests/init2.test | 2 +-
tests/insh2.test | 3 +-
tests/install-info-dir.test | 2 +-
tests/install2.test | 3 +-
tests/installdir.test | 2 +-
tests/instdat.test | 3 +-
tests/instdat2.test | 2 +-
tests/instdir-java.test | 2 +-
tests/instdir-lisp.test | 2 +-
tests/instdir-ltlib.test | 2 +-
tests/instdir-prog.test | 2 +-
tests/instdir-python.test | 2 +-
tests/instdir-texi.test | 2 +-
tests/instdir.test | 2 +-
tests/instdir2.test | 2 +-
tests/instexec.test | 3 +-
tests/instfail-info.test | 2 +-
tests/instfail-java.test | 2 +-
tests/instfail-libtool.test | 2 +-
tests/instfail.test | 2 +-
tests/insthook.test | 3 +-
tests/instman.test | 3 +-
tests/instman2.test | 3 +-
tests/instmany-mans.test | 3 +-
tests/instmany-python.test | 3 +-
tests/instmany.test | 3 +-
tests/instsh.test | 3 +-
tests/instsh2.test | 3 +-
tests/instsh3.test | 2 +-
tests/instspc.tap | 2 +-
tests/interp.test | 3 +-
tests/interp2.test | 3 +-
tests/java-check.test | 2 +-
tests/java-clean.test | 2 +-
tests/java-compile-install.test | 2 +-
tests/java-compile-run-flat.test | 2 +-
tests/java-compile-run-nested.test | 2 +-
tests/java-empty-classpath.test | 2 +-
tests/java-extra.test | 2 +-
tests/java-mix.test | 2 +-
tests/java-no-duplicate.test | 2 +-
tests/java-nobase.test | 2 +-
tests/java-noinst.test | 2 +-
tests/java-rebuild.test | 2 +-
tests/java-sources.test | 2 +-
tests/java-uninstall.test | 2 +-
tests/java.test | 3 +-
tests/java2.test | 2 +-
tests/java3.test | 2 +-
tests/javadir-undefined.test | 2 +-
tests/javaflags.test | 2 +-
tests/javaprim.test | 3 +-
tests/javasubst.test | 3 +-
tests/ldadd.test | 3 +-
tests/ldflags.test | 3 +-
tests/lex-clean-cxx.test | 125 ++
tests/lex-clean.test | 113 ++
tests/lex-depend-cxx.test | 94 ++
tests/{lex4.test => lex-depend-grep.test} | 19 +-
tests/lex-depend.test | 88 ++
tests/lex-lib-external.test | 2 +-
tests/lex-lib.test | 3 +-
tests/lex-libobj.test | 3 +-
tests/lex-line.test | 122 ++
tests/{yacc-nodist.test => lex-nodist.test} | 78 +-
tests/lex-noyywrap.test | 3 +-
tests/lex-pr204.test | 88 ++
tests/lex-subobj-nodep.test | 4 +-
tests/lex.test | 3 +-
tests/lex2.test | 3 +-
tests/lex3.test | 7 +-
tests/lex5.test | 14 +-
tests/lexcpp.test | 2 +-
tests/lexvpath.test | 6 +-
tests/lflags.test | 2 +-
tests/lflags2.test | 2 +-
tests/libexec.test | 2 +-
tests/libobj-basic.test | 2 +-
tests/libobj10.test | 3 +-
tests/libobj12.test | 2 +-
tests/libobj13.test | 2 +-
tests/libobj14.test | 2 +-
tests/libobj15a.test | 2 +-
tests/libobj15b.test | 2 +-
tests/libobj15c.test | 2 +-
tests/libobj16a.test | 2 +-
tests/libobj16b.test | 2 +-
tests/libobj17.test | 2 +-
tests/libobj18.test | 2 +-
tests/libobj19.test | 2 +-
tests/libobj2.test | 3 +-
tests/libobj20a.test | 2 +-
tests/libobj20b.test | 2 +-
tests/libobj20c.test | 2 +-
tests/libobj3.test | 3 +-
tests/libobj4.test | 3 +-
tests/libobj5.test | 3 +-
tests/libobj7.test | 3 +-
tests/library.test | 3 +-
tests/library2.test | 2 +-
tests/library3.test | 2 +-
tests/libtoo10.test | 2 +-
tests/libtoo11.test | 2 +-
tests/libtool-macros.test | 2 +-
tests/libtool.test | 2 +-
tests/libtool2.test | 2 +-
tests/libtool3.test | 2 +-
tests/libtool4.test | 2 +-
tests/libtool5.test | 2 +-
tests/libtool6.test | 2 +-
tests/libtool7.test | 2 +-
tests/libtool8.test | 2 +-
tests/libtool9.test | 2 +-
tests/license.test | 2 +-
tests/license2.test | 2 +-
tests/link_c_cxx.test | 3 +-
tests/link_dist.test | 2 +-
tests/link_f90_only.test | 3 +-
tests/link_f_only.test | 3 +-
tests/link_fc.test | 3 +-
tests/link_fccxx.test | 3 +-
tests/link_fcxx.test | 3 +-
tests/link_override.test | 2 +-
tests/lisp2.test | 2 +-
tests/lisp3.test | 2 +-
tests/lisp4.test | 2 +-
tests/lisp5.test | 2 +-
tests/lisp6.test | 2 +-
tests/lisp7.test | 2 +-
tests/lisp8.test | 2 +-
tests/lispdry.test | 2 +-
tests/list-of-tests.mk | 51 +-
tests/listval.test | 3 +-
tests/location.test | 2 +-
tests/longlin2.test | 2 +-
tests/longline.test | 2 +-
tests/ltcond.test | 2 +-
tests/ltcond2.test | 2 +-
tests/ltconv.test | 2 +-
tests/ltdeps.test | 2 +-
tests/ltinit.test | 2 +-
tests/ltinstloc.test | 3 +-
tests/ltlibobjs.test | 3 +-
tests/ltlibsrc.test | 2 +-
tests/ltorder.test | 2 +-
tests/lzma.test | 2 +-
tests/m4-inclusion.test | 3 +-
tests/maintclean-vpath.test | 2 +-
tests/maintclean.test | 3 +-
tests/maintmode-configure-msg.test | 2 +-
tests/makefile-deps.test | 2 +-
tests/makej.test | 2 +-
tests/makej2.test | 2 +-
tests/maken.test | 2 +-
tests/maken3.test | 2 +-
tests/makevars.test | 2 +-
tests/man.test | 3 +-
tests/man2.test | 3 +-
tests/man3.test | 2 +-
tests/man4.test | 2 +-
tests/man5.test | 2 +-
tests/man6.test | 2 +-
tests/man7.test | 2 +-
tests/man8.test | 2 +-
tests/mdate.test | 3 +-
tests/mdate2.test | 3 +-
tests/mdate3.test | 3 +-
tests/mdate4.test | 2 +-
tests/mdate5.test | 3 +-
tests/mdate6.test | 2 +-
.../missing-auxfile-stops-makefiles-creation.test | 2 +-
tests/missing.test | 3 +-
tests/missing2.test | 3 +-
tests/missing3.test | 2 +-
tests/missing4.test | 3 +-
tests/missing5.test | 2 +-
tests/missing6.test | 2 +-
tests/mkinst2.test | 3 +-
tests/mkinst3.test | 2 +-
tests/mkinstall.test | 3 +-
tests/mmode.test | 2 +-
tests/mmodely.test | 3 +-
tests/multlib.test | 3 +-
tests/no-extra-makefile-code.test | 3 +-
tests/no-outdir-option.test | 2 +-
tests/nobase-libtool.test | 3 +-
tests/nobase-nodist.test | 2 +-
tests/nobase-python.test | 2 +-
tests/nobase.test | 3 +-
tests/nodef.test | 2 +-
tests/nodef2.test | 2 +-
tests/nodep.test | 3 +-
tests/nodep2.test | 2 +-
tests/nodepcomp.test | 3 +-
tests/nodist.test | 3 +-
tests/nodist2.test | 2 +-
tests/nodist3.test | 2 +-
tests/noinst.test | 3 +-
tests/noinstdir.test | 2 +-
tests/nolink.test | 2 +-
tests/nostdinc.test | 3 +-
tests/notrans.test | 2 +-
tests/number.test | 3 +-
tests/objc.test | 3 +-
tests/objc2.test | 2 +-
tests/obsolete.test | 3 +-
tests/oldvars.test | 2 +-
tests/order.test | 2 +-
tests/output-order.test | 2 +-
tests/output.test | 3 +-
tests/output10.test | 2 +-
tests/output11.test | 2 +-
tests/output12.test | 2 +-
tests/output13.test | 2 +-
tests/output2.test | 3 +-
tests/output3.test | 3 +-
tests/output4.test | 3 +-
tests/output5.test | 3 +-
tests/output6.test | 2 +-
tests/output7.test | 2 +-
tests/output8.test | 2 +-
tests/output9.test | 2 +-
tests/override-conditional-1.test | 2 +-
tests/override-conditional-2.test | 2 +-
tests/override-html.test | 2 +-
tests/override-suggest-local.test | 2 +-
tests/parallel-am.test | 2 +-
tests/parallel-am2.test | 2 +-
tests/parallel-am3.test | 2 +-
tests/parallel-tests-cmdline-override.test | 2 +-
tests/parallel-tests-console-output.test | 2 +-
tests/parallel-tests-driver-install.test | 2 +-
tests/parallel-tests-dry-run-2.test | 2 +-
tests/parallel-tests-empty-testlogs.test | 2 +-
tests/parallel-tests-exeext.test | 2 +-
tests/parallel-tests-exit-statuses.test | 2 +-
tests/parallel-tests-extra-programs.test | 4 +-
tests/parallel-tests-fd-redirect-exeext.test | 8 +-
tests/parallel-tests-fd-redirect.test | 2 +-
tests/parallel-tests-fork-bomb.test | 2 +-
tests/parallel-tests-harderror.test | 2 +-
tests/parallel-tests-interrupt.tap | 2 +-
tests/parallel-tests-log-compiler-1.test | 2 +-
tests/parallel-tests-log-compiler-2.test | 2 +-
tests/parallel-tests-log-compiler-example.test | 2 +-
tests/parallel-tests-log-override-1.test | 2 +-
tests/parallel-tests-log-override-2.test | 2 +-
tests/parallel-tests-log-override-recheck.test | 2 +-
tests/parallel-tests-no-color-in-log.test | 2 +-
tests/parallel-tests-no-spurious-summary.test | 2 +-
tests/parallel-tests-once.test | 2 +-
tests/parallel-tests-reset-term.test | 2 +-
tests/parallel-tests-subdir.test | 2 +-
tests/parallel-tests-suffix-prog.test | 2 +-
tests/parallel-tests-suffix.test | 2 +-
tests/parallel-tests-unreadable.test | 2 +-
tests/parallel-tests.test | 2 +-
tests/parallel-tests10.test | 2 +-
tests/parallel-tests2.test | 2 +-
tests/parallel-tests3.test | 2 +-
tests/parallel-tests5.test | 2 +-
tests/parallel-tests6.test | 2 +-
tests/parallel-tests8.test | 2 +-
tests/parallel-tests9.test | 2 +-
tests/parse.test | 3 +-
tests/pattern-rules.test | 2 +-
tests/pattern-rules2.test | 2 +-
tests/phony.test | 2 +-
tests/plain-functions.sh | 2 +-
tests/pluseq.test | 3 +-
tests/pluseq10.test | 2 +-
tests/pluseq11.test | 2 +-
tests/pluseq2.test | 3 +-
tests/pluseq3.test | 3 +-
tests/pluseq4.test | 3 +-
tests/pluseq5.test | 3 +-
tests/pluseq6.test | 3 +-
tests/pluseq7.test | 3 +-
tests/pluseq8.test | 3 +-
tests/pluseq9.test | 2 +-
tests/pm/Cond2.pl | 2 +-
tests/pm/Cond3.pl | 2 +-
tests/pm/Condition-t.pl | 3 +-
tests/pm/Condition.pl | 3 +-
tests/pm/DisjCon2.pl | 2 +-
tests/pm/DisjCon3.pl | 2 +-
tests/pm/DisjConditions-t.pl | 3 +-
tests/pm/DisjConditions.pl | 3 +-
tests/pm/Version.pl | 2 +-
tests/pm/Version2.pl | 2 +-
tests/pm/Version3.pl | 2 +-
tests/pm/Wrap.pl | 2 +-
tests/posixsubst-data.test | 2 +-
tests/posixsubst-extradist.test | 2 +-
tests/posixsubst-ldadd.test | 2 +-
tests/posixsubst-libraries.test | 2 +-
tests/posixsubst-ltlibraries.test | 2 +-
tests/posixsubst-programs.test | 2 +-
tests/posixsubst-scripts.test | 2 +-
tests/posixsubst-sources.test | 2 +-
tests/posixsubst-tests.test | 2 +-
tests/ppf77.test | 3 +-
tests/pr2.test | 3 +-
tests/pr211.test | 3 +-
tests/pr220.test | 3 +-
tests/pr224.test | 2 +-
tests/pr229.test | 2 +-
tests/pr279-2.test | 2 +-
tests/pr279.test | 2 +-
tests/pr287.test | 2 +-
tests/pr300-lib.test | 3 +-
tests/pr300-ltlib.test | 3 +-
tests/pr300-prog.test | 3 +-
tests/pr307.test | 2 +-
tests/pr401.test | 3 +-
tests/pr401b.test | 3 +-
tests/pr401c.test | 3 +-
tests/pr72.test | 3 +-
tests/pr8365-remake-timing.test | 2 +-
tests/pr87.test | 3 +-
tests/pr9.test | 3 +-
tests/prefix.test | 3 +-
tests/primary-prefix-couples-documented-valid.test | 2 +-
tests/primary-prefix-couples-force-valid.test | 2 +-
tests/primary-prefix-invalid-couples.tap | 2 +-
tests/primary-prefix-valid-couples.test | 2 +-
tests/primary.test | 3 +-
tests/primary2.test | 3 +-
tests/primary3.test | 2 +-
tests/proginst.test | 3 +-
tests/programs-primary-rewritten.test | 2 +-
tests/prove-runner | 15 +
tests/py-compile-basedir.test | 2 +-
tests/py-compile-basic.test | 2 +-
tests/py-compile-basic2.test | 2 +-
tests/py-compile-destdir.test | 2 +-
tests/py-compile-env.test | 2 +-
tests/py-compile-option-terminate.test | 2 +-
tests/py-compile-usage.test | 2 +-
tests/python-dist.test | 2 +-
tests/python-vars.test | 2 +-
tests/python-virtualenv.test | 2 +-
tests/python.test | 2 +-
tests/python10.test | 2 +-
tests/python11.test | 3 +-
tests/python12.test | 2 +-
tests/python2.test | 2 +-
tests/python3.test | 2 +-
tests/python4.test | 2 +-
tests/python5.test | 2 +-
tests/python5b.test | 2 +-
tests/python6.test | 2 +-
tests/python7.test | 2 +-
tests/python8.test | 2 +-
tests/python9.test | 2 +-
tests/recurs.test | 3 +-
tests/recurs2.test | 3 +-
tests/remake-all-1.test | 2 +-
tests/remake-am-pr10111.test | 2 +-
tests/remake-deleted-am-2.test | 2 +-
tests/remake-deleted-am-subdir.test | 2 +-
tests/remake-deleted-am.test | 2 +-
tests/remake-deleted-m4-file.test | 2 +-
tests/remake-gnulib-add-acsubst.test | 2 +-
tests/remake-gnulib-add-header.test | 2 +-
tests/remake-gnulib-remove-header.test | 2 +-
tests/remake-m4-pr10111.test | 2 +-
tests/remake-moved-m4-file.test | 2 +-
tests/remake-renamed-am.test | 2 +-
tests/remake-renamed-m4-file.test | 2 +-
tests/remake-renamed-m4-macro-and-file.test | 2 +-
tests/remake-renamed-m4-macro.test | 2 +-
tests/remake-subdir-from-subdir.test | 2 +-
tests/remake-subdir-gnu.test | 2 +-
tests/remake-subdir-long-time.test | 2 +-
tests/remake-subdir.test | 2 +-
tests/remake.test | 3 +-
tests/remake10a.test | 2 +-
tests/remake10b.test | 2 +-
tests/remake10c.test | 2 +-
tests/remake11.test | 2 +-
tests/remake12.test | 2 +-
tests/remake1a.test | 2 +-
tests/remake2.test | 3 +-
tests/remake3.test | 2 +-
tests/remake3a.test | 2 +-
tests/remake4.test | 2 +-
tests/remake5.test | 2 +-
tests/remake6.test | 2 +-
tests/remake7.test | 2 +-
tests/remake8a.test | 2 +-
tests/remake8b.test | 2 +-
tests/remake9a.test | 2 +-
tests/remake9b.test | 2 +-
tests/remake9c.test | 2 +-
tests/remake9d.test | 2 +-
tests/repeated-options.test | 2 +-
tests/req.test | 3 +-
tests/reqd.test | 2 +-
tests/reqd2.test | 2 +-
tests/rst-formatting.test | 93 ++
tests/rulepat.test | 3 +-
tests/sanity.test | 2 +-
tests/scripts.test | 3 +-
tests/seenc.test | 3 +-
tests/self-check-cleanup.tap | 2 +-
tests/self-check-configure-help.test | 2 +-
tests/self-check-dir.tap | 2 +-
tests/self-check-env-sanitize.tap | 2 +-
tests/self-check-exit.tap | 2 +-
tests/self-check-explicit-skips.test | 2 +-
tests/self-check-is-blocked-signal.tap | 2 +-
tests/self-check-is_newest.tap | 2 +-
tests/self-check-me.tap | 2 +-
tests/self-check-reexec.tap | 2 +-
tests/self-check-report.test | 2 +-
tests/self-check-sanity.test | 2 +-
tests/self-check-seq.tap | 2 +-
tests/self-check-tap.test | 2 +-
tests/self-check-unindent.tap | 2 +-
tests/silent-configsite.test | 2 +-
tests/silent-lex-gcc.test | 144 ---
tests/silent-lex-generic.test | 148 ---
tests/silent-lex.test | 138 +++
tests/silent-many-gcc.test | 16 +-
tests/silent-many-generic.test | 17 +-
tests/silent-yacc-gcc.test | 143 ---
tests/silent-yacc-generic.test | 143 ---
tests/silent-yacc-headers.test | 175 +++
tests/silent-yacc.test | 138 +++
tests/silent.test | 2 +-
tests/silent2.test | 2 +-
tests/silent3.test | 2 +-
tests/silent4.test | 2 +-
tests/silent6.test | 2 +-
tests/silent7.test | 2 +-
tests/silent8.test | 2 +-
tests/silent9.test | 2 +-
tests/silentcxx-gcc.test | 2 +-
tests/silentcxx.test | 2 +-
tests/silentf77.test | 2 +-
tests/silentf90.test | 2 +-
tests/space.test | 3 +-
tests/specflg-dummy.test | 2 +-
tests/specflg.test | 3 +-
tests/specflg10.test | 2 +-
tests/specflg2.test | 3 +-
tests/specflg3.test | 3 +-
tests/specflg6.test | 3 +-
tests/specflg7.test | 2 +-
tests/specflg8.test | 2 +-
tests/specflg9.test | 2 +-
tests/spell.test | 3 +-
tests/spell2.test | 3 +-
tests/spell3.test | 3 +-
tests/spelling.test | 3 +-
tests/spy.test | 2 +-
tests/srcsub.test | 3 +-
tests/srcsub2.test | 2 +-
tests/stamph2.test | 3 +-
tests/stdinc.test | 2 +-
tests/stdlib.test | 3 +-
tests/stdlib2.test | 2 +-
tests/strictness-override.test | 2 +-
tests/strictness-precedence.test | 2 +-
tests/strip.test | 2 +-
tests/strip2.test | 2 +-
tests/strip3.test | 2 +-
tests/subcond.test | 3 +-
tests/subcond2.test | 2 +-
tests/subcond3.test | 2 +-
tests/subdir.test | 3 +-
tests/subdir10.test | 2 +-
tests/subdir2.test | 3 +-
tests/subdir3.test | 3 +-
tests/subdir4.test | 3 +-
tests/subdir5.test | 3 +-
tests/subdir6.test | 2 +-
tests/subdir8.test | 3 +-
tests/subdir9.test | 2 +-
tests/subdirbuiltsources.test | 2 +-
tests/subobj.test | 3 +-
tests/subobj10.test | 2 +-
tests/subobj11a.test | 2 +-
tests/subobj11c.test | 2 +-
tests/subobj2.test | 3 +-
tests/subobj4.test | 3 +-
tests/subobj5.test | 3 +-
tests/subobj6.test | 3 +-
tests/subobj7.test | 3 +-
tests/subobj8.test | 2 +-
tests/subobj9.test | 3 +-
tests/subobjname.test | 2 +-
tests/subpkg-yacc.test | 3 +-
tests/subpkg.test | 3 +-
tests/subpkg2.test | 2 +-
tests/subpkg3.test | 2 +-
tests/subpkg4.test | 2 +-
tests/subst-no-trailing-empty-line.test | 2 +-
tests/subst.test | 3 +-
tests/subst3.test | 3 +-
tests/subst4.test | 2 +-
tests/subst5.test | 2 +-
tests/substre2.test | 2 +-
tests/substref.test | 2 +-
tests/substtarg.test | 3 +-
tests/suffix-chain.tap | 2 +-
tests/suffix.test | 3 +-
tests/suffix10.tap | 4 +-
tests/suffix11.tap | 3 +-
tests/suffix12.test | 3 +-
tests/suffix13.test | 3 +-
tests/suffix2.test | 3 +-
tests/suffix3.tap | 4 +-
tests/suffix4.test | 2 +-
tests/suffix5.test | 2 +-
tests/suffix6.test | 2 +-
tests/suffix6b.test | 2 +-
tests/suffix6c.test | 3 +-
tests/suffix7.test | 2 +-
tests/suffix8.tap | 3 +-
tests/suffix9.test | 2 +-
tests/symlink.test | 3 +-
tests/symlink2.test | 3 +-
tests/syntax.test | 3 +-
tests/tags.test | 3 +-
tests/tags2.test | 2 +-
tests/tagsub.test | 3 +-
tests/tap-ambiguous-directive.test | 2 +-
tests/tap-autonumber.test | 2 +-
tests/tap-bad-prog.tap | 2 +-
tests/tap-bailout-and-logging.test | 2 +-
tests/tap-bailout-leading-space.test | 2 +-
tests/tap-bailout-suppress-badexit.test | 2 +-
tests/tap-bailout-suppress-later-diagnostic.test | 2 +-
tests/tap-bailout-suppress-later-errors.test | 2 +-
tests/tap-bailout.test | 2 +-
tests/tap-basic.test | 2 +-
tests/tap-color.test | 2 +-
tests/tap-common-setup.test | 2 +-
tests/tap-deps.test | 2 +-
tests/tap-diagnostic-custom.test | 2 +-
tests/tap-diagnostic.test | 2 +-
tests/tap-doc.test | 2 +-
tests/tap-doc2.test | 2 +-
tests/tap-driver-stderr.test | 2 +-
tests/tap-empty-diagnostic.test | 2 +-
tests/tap-empty.test | 2 +-
tests/tap-escape-directive-2.test | 2 +-
tests/tap-escape-directive.test | 2 +-
tests/tap-exit.test | 2 +-
tests/tap-fancy.test | 2 +-
tests/tap-fancy2.test | 2 +-
tests/tap-functions.sh | 2 +-
tests/tap-global-log.test | 2 +-
tests/tap-global-result.test | 2 +-
tests/tap-log.test | 2 +-
tests/tap-merge-stdout-stderr.test | 2 +-
tests/tap-missing-plan-and-bad-exit.test | 2 +-
tests/tap-more.test | 2 +-
tests/tap-more2.test | 2 +-
tests/tap-msg0-bailout.test | 2 +-
tests/tap-msg0-directive.test | 2 +-
tests/tap-msg0-misc.test | 2 +-
tests/tap-msg0-planskip.test | 2 +-
tests/tap-msg0-result.test | 2 +-
tests/tap-negative-numbers.test | 2 +-
tests/tap-no-disable-hard-error.test | 2 +-
tests/tap-no-merge-stdout-stderr.test | 2 +-
tests/tap-no-spurious-numbers.test | 2 +-
tests/tap-no-spurious-summary.test | 2 +-
tests/tap-no-spurious.test | 2 +-
tests/tap-not-ok-skip.test | 2 +-
tests/tap-number-wordboundary.test | 2 +-
tests/tap-numbers-leading-zero.test | 2 +-
tests/tap-numeric-description.test | 2 +-
tests/tap-out-of-order.test | 2 +-
tests/tap-passthrough-exit.test | 2 +-
tests/tap-passthrough.test | 2 +-
tests/tap-plan-corner.test | 2 +-
tests/tap-plan-errors.test | 2 +-
tests/tap-plan-leading-zero.test | 2 +-
tests/tap-plan-malformed.test | 2 +-
tests/tap-plan-middle.test | 2 +-
tests/tap-plan-whitespace.test | 2 +-
tests/tap-plan.test | 2 +-
tests/tap-planskip-and-logging.test | 2 +-
tests/tap-planskip-badexit.test | 2 +-
tests/tap-planskip-bailout.test | 2 +-
tests/tap-planskip-case-insensitive.test | 2 +-
tests/tap-planskip-late.test | 2 +-
tests/tap-planskip-later-errors.test | 2 +-
tests/tap-planskip-unplanned-corner.test | 2 +-
tests/tap-planskip-unplanned.test | 2 +-
tests/tap-planskip-whitespace.test | 2 +-
tests/tap-planskip.test | 2 +-
tests/tap-realtime.test | 2 +-
tests/tap-recheck-logs.test | 2 +-
tests/tap-recheck.test | 2 +-
tests/tap-result-comment.test | 2 +-
tests/tap-setup.sh | 2 +-
tests/tap-signal.tap | 24 +-
tests/tap-summary-aux.sh | 2 +-
tests/tap-summary-color.test | 2 +-
tests/tap-summary.test | 2 +-
tests/tap-test-number-0.test | 2 +-
tests/tap-todo-skip-together.test | 2 +-
tests/tap-todo-skip-whitespace.test | 2 +-
tests/tap-todo-skip.test | 2 +-
tests/tap-unplanned.test | 2 +-
tests/tap-whitespace-normalization.test | 2 +-
tests/tap-with-and-without-number.test | 2 +-
tests/tap-xfail-tests.test | 2 +-
tests/tar-override.test | 2 +-
tests/tar.test | 2 +-
tests/tar2.test | 2 +-
tests/tar3.test | 2 +-
tests/target-cflags.test | 3 +-
tests/targetclash.test | 2 +-
tests/test-driver-acsubst.test | 2 +-
tests/test-driver-cond.test | 2 +-
tests/test-driver-create-log-dir.test | 2 +-
tests/test-driver-custom-multitest-recheck.test | 2 +-
tests/test-driver-custom-multitest-recheck2.test | 2 +-
tests/test-driver-custom-multitest.test | 2 +-
tests/test-driver-custom-no-extra-driver.test | 2 +-
tests/test-driver-custom-xfail-tests.test | 2 +-
tests/test-driver-custom.test | 2 +-
tests/test-driver-fail.test | 2 +-
tests/test-driver-is-distributed.test | 131 ++--
tests/test-driver-strip-vpath.test | 2 +-
tests/test-driver-trs-suffix-registered.test | 2 +-
tests/test-extensions-cond.test | 2 +-
tests/test-extensions.test | 2 +-
tests/test-harness-vpath-rewrite.test | 2 +-
tests/test-log.test | 2 +-
tests/test-logs-repeated.test | 2 +-
tests/test-metadata-global-log.test | 2 +-
tests/test-metadata-global-result.test | 2 +-
tests/test-metadata-recheck.test | 2 +-
tests/test-metadata-results.test | 2 +-
tests/test-missing.test | 2 +-
tests/test-missing2.test | 2 +-
tests/test-trs-basic.test | 2 +-
tests/test-trs-recover.test | 2 +-
tests/test-trs-recover2.test | 2 +-
tests/tests-environment-and-log-compiler.test | 2 +-
tests/tests-environment-backcompat.test | 2 +-
tests/tests-environment-fd-redirect.test | 2 +-
tests/tests-environment.test | 2 +-
tests/testsuite-summary-checks.sh | 2 +-
tests/testsuite-summary-color.test | 2 +-
tests/testsuite-summary-count-many.test | 2 +-
tests/testsuite-summary-count.test | 2 +-
tests/testsuite-summary-reference-log.test | 2 +-
tests/transform.test | 3 +-
tests/transform2.test | 3 +-
tests/trivial-test-driver | 2 +-
tests/txinfo-unrecognized-extension.test | 2 +-
tests/txinfo.test | 3 +-
tests/txinfo10.test | 2 +-
tests/txinfo13.test | 3 +-
tests/txinfo16.test | 2 +-
tests/txinfo17.test | 2 +-
tests/txinfo18.test | 2 +-
tests/txinfo19.test | 2 +-
tests/txinfo2.test | 3 +-
tests/txinfo20.test | 2 +-
tests/txinfo21.test | 3 +-
tests/txinfo22.test | 3 +-
tests/txinfo23.test | 2 +-
tests/txinfo24.test | 2 +-
tests/txinfo25.test | 2 +-
tests/txinfo26.test | 2 +-
tests/txinfo27.test | 2 +-
tests/txinfo28.test | 2 +-
tests/txinfo29.test | 2 +-
tests/txinfo3.test | 3 +-
tests/txinfo30.test | 2 +-
tests/txinfo31.test | 2 +-
tests/txinfo32.test | 2 +-
tests/txinfo33.test | 2 +-
tests/txinfo4.test | 3 +-
tests/txinfo5.test | 3 +-
tests/txinfo5b.test | 3 +-
tests/txinfo6.test | 2 +-
tests/txinfo7.test | 2 +-
tests/txinfo8.test | 3 +-
tests/txinfo9.test | 2 +-
tests/uninstall-fail.test | 2 +-
tests/uninstall-pr9578.test | 2 +-
tests/unused.test | 3 +-
tests/upc.test | 2 +-
tests/upc2.test | 2 +-
tests/upc3.test | 2 +-
tests/vala-vpath.test | 2 +-
tests/vala.test | 3 +-
tests/vala1.test | 3 +-
tests/vala2.test | 3 +-
tests/vala3.test | 3 +-
tests/vala4.test | 2 +-
tests/vala5.test | 3 +-
tests/vars-assign.test | 2 +-
tests/vars.test | 2 +-
tests/vartar.test | 3 +-
tests/vartypo2.test | 2 +-
tests/vartypos.test | 2 +-
tests/version.test | 3 +-
tests/version2.test | 3 +-
tests/version3.test | 3 +-
tests/version4.test | 2 +-
tests/version6.test | 2 +-
tests/version7.test | 2 +-
tests/version8.test | 2 +-
tests/vpath.test | 3 +-
tests/vtexi.test | 3 +-
tests/vtexi2.test | 3 +-
tests/vtexi3.test | 2 +-
tests/vtexi4.test | 2 +-
tests/warning-groups-win-over-strictness.test | 2 +-
tests/warnings-override.test | 2 +-
tests/warnings-precedence.test | 2 +-
tests/warnings-strictness-interactions.test | 2 +-
tests/warnings-unknown.test | 2 +-
tests/warnings-win-over-strictness.test | 2 +-
tests/warnopts.test | 3 +-
tests/werror.test | 2 +-
tests/werror2.test | 2 +-
tests/werror3.test | 2 +-
tests/werror4.test | 2 +-
tests/whoami.test | 2 +-
tests/xsource.test | 3 +-
tests/{dist-auxfile-2.test => yacc-auxdir.test} | 56 +-
tests/yacc-basic.test | 44 +-
tests/yacc-bison-skeleton-cxx.test | 100 ++
tests/{yacc4.test => yacc-bison-skeleton.test} | 64 +-
tests/yacc-clean-cxx.test | 165 +++
tests/yacc-clean.test | 10 +-
tests/yacc-cxx.test | 139 +++
tests/yacc-d-basic.test | 13 +-
tests/yacc-d-cxx.test | 233 ++++
tests/yacc-d-vpath.test | 8 +-
tests/yacc-deleted-headers.test | 165 +++
tests/{yacc-dist-nobuild.test => yacc-depend.test} | 75 +-
tests/yacc-depend2.test | 88 ++
tests/yacc-dist-nobuild-subdir.test | 6 +-
tests/yacc-dist-nobuild.test | 3 +-
tests/yacc-line.test | 115 ++
tests/yacc-mix-c-cxx.test | 208 ++++
tests/yacc-nodist.test | 14 +-
tests/{pr204.test => yacc-pr204.test} | 13 +-
tests/{cond17.test => yacc-weirdnames.test} | 36 +-
tests/yacc.test | 3 +-
tests/yacc2.test | 3 +-
tests/yacc4.test | 4 +-
tests/yacc5.test | 3 +-
tests/yacc6.test | 108 --
tests/yacc7.test | 3 +-
tests/yacc8.test | 5 +-
tests/yaccdry.test | 4 +-
tests/yaccpp.test | 44 +-
tests/yaccvpath.test | 11 +-
tests/yflags-cmdline-override.test | 2 +-
tests/yflags-conditional.test | 2 +-
tests/yflags-d-false-positives.test | 2 +-
tests/yflags-force-conditional.test | 2 +-
tests/yflags-force-override.test | 4 +-
tests/yflags-var-expand.test | 2 +-
tests/yflags.test | 2 +-
tests/yflags2.test | 2 +-
1347 files changed, 6804 insertions(+), 4164 deletions(-)
create mode 100644 doc/automake-history.texi
create mode 100755 lib/update-copyright
create mode 100755 tests/cscope.tap
delete mode 100755 tests/cscope.test
create mode 100755 tests/lex-clean-cxx.test
create mode 100755 tests/lex-clean.test
create mode 100755 tests/lex-depend-cxx.test
rename tests/{lex4.test => lex-depend-grep.test} (61%)
create mode 100755 tests/lex-depend.test
create mode 100755 tests/lex-line.test
copy tests/{yacc-nodist.test => lex-nodist.test} (50%)
create mode 100755 tests/lex-pr204.test
create mode 100755 tests/rst-formatting.test
delete mode 100755 tests/silent-lex-gcc.test
delete mode 100755 tests/silent-lex-generic.test
create mode 100755 tests/silent-lex.test
delete mode 100755 tests/silent-yacc-gcc.test
delete mode 100755 tests/silent-yacc-generic.test
create mode 100755 tests/silent-yacc-headers.test
create mode 100755 tests/silent-yacc.test
copy tests/{dist-auxfile-2.test => yacc-auxdir.test} (52%)
create mode 100755 tests/yacc-bison-skeleton-cxx.test
copy tests/{yacc4.test => yacc-bison-skeleton.test} (54%)
create mode 100755 tests/yacc-clean-cxx.test
create mode 100755 tests/yacc-cxx.test
create mode 100755 tests/yacc-d-cxx.test
create mode 100755 tests/yacc-deleted-headers.test
copy tests/{yacc-dist-nobuild.test => yacc-depend.test} (50%)
create mode 100755 tests/yacc-depend2.test
create mode 100755 tests/yacc-line.test
create mode 100755 tests/yacc-mix-c-cxx.test
rename tests/{pr204.test => yacc-pr204.test} (78%)
copy tests/{cond17.test => yacc-weirdnames.test} (55%)
delete mode 100755 tests/yacc6.test
diff --git a/.gitattributes b/.gitattributes
index b6c3614..5126add 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-ChangeLog merge=merge-changelog
+NEWS merge=union
*.texi* diff=texinfo
diff --git a/.gitignore b/.gitignore
index c95a193..59e80ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,32 +12,32 @@ Makefile
/aclocal
/automake
/doc/amhello-*.tar.gz
-/doc/automake.info
-/doc/automake.info-[0-9]
+/doc/automake*.info
+/doc/automake*.info-[0-9]
/doc/automake*.1
/doc/aclocal*.1
/doc/stamp-vti
/doc/version.texi
-/doc/automake.ac
-/doc/automake.aux
-/doc/automake.cm
-/doc/automake.cp
-/doc/automake.cps
-/doc/automake.dvi
-/doc/automake.fn
-/doc/automake.fns
-/doc/automake.html
-/doc/automake.ky
-/doc/automake.log
-/doc/automake.op
-/doc/automake.pdf
-/doc/automake.pg
-/doc/automake.ps
-/doc/automake.toc
-/doc/automake.tp
-/doc/automake.tr
-/doc/automake.vr
-/doc/automake.vrs
+/doc/automake*.ac
+/doc/automake*.aux
+/doc/automake*.cm
+/doc/automake*.cp
+/doc/automake*.cps
+/doc/automake*.dvi
+/doc/automake*.fn
+/doc/automake*.fns
+/doc/automake*.html
+/doc/automake*.ky
+/doc/automake*.log
+/doc/automake*.op
+/doc/automake*.pdf
+/doc/automake*.pg
+/doc/automake*.ps
+/doc/automake*.toc
+/doc/automake*.tp
+/doc/automake*.tr
+/doc/automake*.vr
+/doc/automake*.vrs
/doc/amhello/Makefile.in
/doc/amhello/aclocal.m4
/doc/amhello/config.h.in
diff --git a/COPYING b/COPYING
index d511905..a9a3ea0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ Copyright (C) 1989-2012 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/ChangeLog.00 b/ChangeLog.00
index 756107d..c50c4eb 100644
--- a/ChangeLog.00
+++ b/ChangeLog.00
@@ -2205,7 +2205,7 @@
-----
-Copyright 1999, 2000 Free Software Foundation, Inc.
+Copyright 1999-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.01 b/ChangeLog.01
index 2bd9d47..cb7b37a 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -4931,7 +4931,7 @@
-----
-Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.02 b/ChangeLog.02
index 45a7c67..b99f757 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -3219,7 +3219,7 @@
-----
-Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.03 b/ChangeLog.03
index 0152d56..b7e8c6a 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -2965,7 +2965,7 @@
-----
-Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 2003-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.04 b/ChangeLog.04
index ee393ca..111f87b 100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@ -1613,7 +1613,7 @@
-----
-Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2004-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.09 b/ChangeLog.09
index 7b07c36..2238005 100644
--- a/ChangeLog.09
+++ b/ChangeLog.09
@@ -5757,7 +5757,7 @@
-----
-Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.11 b/ChangeLog.11
index 9c2af31..a5c3a95 100644
--- a/ChangeLog.11
+++ b/ChangeLog.11
@@ -784,6 +784,45 @@
* tests/remake-am-pr10111.test: Make executable.
* tests/remake-m4-pr10111.test: Likewise.
+2011-12-27 Stefano Lattarini <address@hidden>
+
+ yacc/lex tests: remove an unneeded workaround for bug#8485
+
+ * tests/yacc-d-cxx.test: Remove the workaround previously required
+ to avoid spurious failures due to automake bug#8485: that bug has
+ been solved with commit `v1.11-512-g40c3432'.
+
+2011-12-27 Stefano Lattarini <address@hidden>
+
+ yacc/lex tests: avoid too much failures with FreeBSD make
+
+ In various Yacc/Lex tests, we used to run "make distcheck" commands
+ whose value was mostly dubious, and, even when it was there, was
+ very, very little. The presence of these extra distchecks had two
+ disadvantages: it slowed down our already-too-slow testsuite even
+ more, and, much worse, caused a lot of extra failures with FreeBSD,
+ all due to automake bug#7884, which is already exposed by the test
+ case `yacc-dist-nobuild.test'.
+
+ We can improve this situation by simply removing "make distcheck"
+ calls from a few testcases, or making them conditional to the use
+ of GNU make.
+
+ * tests/lex-clean-cxx.test: Do not call "make distcheck".
+ * tests/lex-clean.test: Likewise.
+ * tests/yacc-clean-cxx.test: Likewise.
+ * tests/yacc-clean.test: Likewise.
+ * tests/yflags-force-override.test: Likewise.
+ * tests/yacc-nodist.test: Only run "make distcheck" if make
+ is GNU make.
+
+2011-12-15 Stefano Lattarini <address@hidden>
+
+ Merge branch 'maint' into 'yacc-work'
+ * tests/silent-lex.test: Provide a dummy `yywrap()' function, to
+ avoid link errors on systems that doesn't provide a "lex library".
+ See also commit `v1.11-546-gca0ba5d'.
+
2011-12-14 Stefano Lattarini <address@hidden>
readme: reference webpages for automake mailing lists
@@ -1983,6 +2022,10 @@
complaints from the `sc_no_brace_variable_expansions' maintainer
check.
+2011-10-18 Stefano Lattarini <address@hidden>
+
+ * tests/yacc-dist-nobuild.test: Add reference to relevant bug#7884.
+
2011-10-06 Stefano Lattarini <address@hidden>
tests: fix spurious error in 'test-extensions.test'
@@ -5699,6 +5742,34 @@
example, simpler this time, but still inspired to real-world
usage (the GNU coreutils testsuite).
+2011-06-28 Stefano Lattarini <address@hidden>
+
+ yacc tests: fix bug in 'yacc-cxx.test'
+ * tests/yacc-cxx.test: Enable `errexit' shell flag (the lack of
+ which was masking the bug).
+ (bar.cxx): Rename to ...
+ (bar2.cxx): ... this, otherwise automake will (correctly) complain
+ that object `bar.o' is created by both `bar.cxx' and `bar.c++'.
+ (Makefile.am): Adjust.
+
+2011-06-28 Stefano Lattarini <address@hidden>
+
+ lex tests: fix spurious link errors on Solaris
+ On Solaris 10, linking of lex-generated programs was failing in a
+ couple of lex tests with errors like this:
+ g++ -g -O2 -o joe joe.o -ll
+ Undefined symbol first referenced in file
+ yywrap() joe.o
+ ld: fatal: Symbol referencing errors. No output written to joe
+ collect2: ld returned 1 exit status
+ This change fixes it, also fixing at once potential problems for
+ systems that don't have a "lex library" (this happens for example
+ when cross-compiling from GNU/Linux to MinGW).
+ * tests/lex-depend-cxx.test (joe.ll, moe.l++): Define a dummy
+ `yywrap()' function.
+ * tests/lex-clean-cxx.test (mainfoo.cc, mainbar.cpp, mainbaz.c++,
+ mainqux.cxx): Likewise.
+
2011-06-23 Stefano Lattarini <address@hidden>
docs: avoid a footnote, some related rewordings and improvements
@@ -7435,6 +7506,99 @@
* tests/dejagnu4.test: Likewise.
* tests/installdir.test: Likewise.
+2011-05-13 Stefano Lattarini <address@hidden>
+
+ lex: "make clean" removes .c files from non-distributed .l
+ Previously, while automake did *not* distribute C source and header
+ files derived from non-distributed Lex sources, it still caused
+ them to be removed only by "make maintainer-clean" only, and not by
+ simply "make clean" or "make distclean".
+ This caused "make distcheck" to fail, unless the developer put
+ those generated .c files in CLEANFILES or in DISTCLEANFILES by
+ hand.
+ This change fixes this issue, by making non-distributed `.c' files
+ generated by non-distributed Lex sources cleaned by "make clean".
+ A similar problem for Yacc support had been fixed with the commit
+ v1.11-263-ged2c8bc.
+ * tests/automake.in (lang_lex_target_hook): Make C source files
+ derived from non-distributed Lex files cleaned by "make clean",
+ not only by "make maintainer-clean".
+ * tests/lex-clean.test: New test.
+ * tests/lex-clean-cxx.test: Likewise.
+ * tests/lex-nodist.test: Likewise.
+ * tests/lex-pr204.test: Likewise.
+ * tests/pr204.test: For consistency, renamed ...
+ * tests/yacc-pr204.test: ... to this, and updated to keep it
+ more in sync with 'lex-pr204.test'.
+ * tests/yacc-nodist.test: Updated to keep it more in sync with
+ 'lex-nodist.test'.
+ * tests/Makefile.am (TESTS): Update.
+ * NEWS: Update.
+
+2011-05-13 Stefano Lattarini <address@hidden>
+
+ lex tests: make test on Lex dependency tracking more "semantic"
+ * tests/lex4.test: Renamed ...
+ * tests/lex-depend-grep.test: ... to this, and extended.
+ * tests/lex-depend.test, tests/lex-depend-cxx.test: ... these
+ new tests.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-05-13 Stefano Lattarini <address@hidden>
+
+ lex tests: remove erroneous check about ylwrap distribution
+ * tests/lex5.test: Do not check that the ylwrap script is *not*
+ distributed when there is only one lexer, as ylwrap is in fact
+ expected to distributed unconditionally (at least starting from
+ commit `Release-1-9-323-gc5881cc' of 19-08-2006). Note that this
+ bogus check wasn't triggering any failure because it was done at
+ the wrong time (i.e. from the VPATH build directory), so that it
+ could never fail anyway.
+ Instead, check that ylwrap is distributed even when there is only
+ one lexer.
+ Since we are at it, add a couple of `ls -l' calls, to get better
+ debugging info.
+
+2011-05-13 Stefano Lattarini <address@hidden>
+
+ yacc tests: "make clean" removes C++ files from non-distributed .y
+ * tests/yacc-clean-cxx.test: New test, sister of `yacc-clean.test'.
+ * tests/yacc-clean.test: Update heading comment to reference the
+ new sister test.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-05-06 Stefano Lattarini <address@hidden>
+
+ tests: add a workaround for automake bug#8485
+ * tests/yacc-d-cxx.test (Makefile.am): Add temporary workaround
+ for automake bug#8485. The bug is still exposed by the testcase
+ 'yacc-dist-nobuild-subdir.test'.
+
+2011-05-04 Stefano Lattarini <address@hidden>
+
+ tests: add a couple of inter-tests reference
+ * tests/yacc-nodist.test, tests/pr204.test: These tests are
+ related, so add references to each other in heading comments.
+
+2011-05-04 Stefano Lattarini <address@hidden>
+
+ lex tests: require just `lex' instead of `flex'
+ * tests/lex-subobj-nodep.test ($required): Require `lex',
+ not `flex', as this test is expected to work with any lex
+ implementation.
+ * tests/silent-lex.test: Likewise.
+
+2011-05-04 Stefano Lattarini <address@hidden>
+
+ tests defs: use `skip_' for skipping yacc/lex related tests
+ * tests/defs.in (lex, bison): Use `skip_' to signal test skipping.
+
+2011-05-04 Stefano Lattarini <address@hidden>
+
+ tests defs: merge cleanup
+ * tests/defs.in (flex, bison): Requirements removed, we have real
+ `lex' and `yacc' requirements now.
+
2011-05-04 Stefano Lattarini <address@hidden>
tests defs: allow requirements for compilers (mostly dummy)
@@ -8079,9 +8243,19 @@
2011-04-12 Stefano Lattarini <address@hidden>
- coverage: test for automake bug#8485 (known regression)
- * tests/yacc-dist-nobuild-subdir.test: New test.
- * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+ lex/yacc tests: remove redundant $distdir definition
+ * tests/lex3.test ($distdir): Remove definition, that's already
+ done in `tests/defs'.
+ * tests/lexvpath.test: Likewise.
+ * tests/yacc-basic.test: Likewise.
+ * tests/yacc-cxx.test: Likewise.
+ * tests/yacc-d-basic.test: Likewise.
+ * tests/yacc-d-cxx.test: Likewise.
+ * tests/yacc-d-vpath.test: Likewise.
+ * tests/yacc-dist-nobuild-subdir.test: Likewise.
+ * tests/yacc-dist-nobuild.test: Likewise.
+ * tests/yacc-mix-c-cxx.test: Likewise.
+ * tests/yaccvpath.test: Likewise.
2011-04-14 Stefano Lattarini <address@hidden>
@@ -8134,6 +8308,416 @@
* tests/vtexi3.test: Add comment explaining why we redefine
$distdir in this test.
+2011-04-14 Stefano Lattarini <address@hidden>
+
+ coverage: test lex-generated "#line" directives postprocessing
+ * tests/yacc-line.test: In heading comments, add reference to new
+ sister test `lex-line.test'.
+ * tests/lex-line.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-04-14 Stefano Lattarini <address@hidden>
+
+ tests: minor improvements to a couple of yacc tests
+ * tests/yacc-auxdir.test: Avoid running autoconf, it's not
+ needed.
+ * tests/yacc-line.test: Also check that the yacc-generated C
+ and header files do not contain "#line" directives referencing
+ `y.tab.c' or `y.tab.h'. Add a couple of explicative comments.
+
+2011-04-11 Stefano Lattarini <address@hidden>
+
+ tests: split yacc6.test, for better separation and coverage
+ * tests/yacc6.test: Test removed, its content extended and split
+ into ...
+ * tests/yacc-auxdir.test, tests/yacc-depend.test,
+ tests/yacc-line.test: ... these new tests.
+ * tests/yacc-depend2.test: New test, exposes the failure that
+ FreeBSD used to encounter in yacc6.test.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-04-11 Stefano Lattarini <address@hidden>
+
+ tests: do not uselessly require GNU make or gcc in a few tests
+ * tests/lex3.test: Remove gcc from requirements, as any working C
+ compiler should be ok. Consequently, do not clobber user CFLAGS.
+ Also, remove GNUmake from requirements; it was added (see commit
+ `Release-1-8-103-g0d2f592') because this test fails with FreeBSD
+ make due to VPATH issues -- but so do many other yacc-related and
+ lex-related tests currently, and requiring GNU make in all of
+ them would unacceptably reduce coverage.
+ * tests/lexvpath.test: Remove gcc from requirements, as any
+ working C compiler should be ok.
+ * tests/yacc4.test: Likewise.
+ * tests/yacc8.test: Likewise.
+ * tests/lex5.test: Likewise. Also, do not require anymore GNU
+ make; to compensate, explicitly call "$MAKE Makefile" to update
+ the out-of-date Makefile if $MAKE is not GNU make.
+
+2011-04-12 Stefano Lattarini <address@hidden>
+
+ tests: fix spurious failure in test 'yacc-d-cxx.test'
+ * tests/yacc-d-cxx.test: Create ylwrap script before calling
+ automake for the first time, so that the script gets correctly
+ distributed. Add checks verifying it indeed is.
+
+2011-04-12 Stefano Lattarini <address@hidden>
+
+ tests cosmetics: remove redundant definitions of variable $tab
+ * tests/yacc-d-basic.test ($tab): Remove definition: it's already
+ defined in `tests/defs'.
+ * tests/yacc-d-cxx.test: Likewise.
+
+2011-04-12 Stefano Lattarini <address@hidden>
+
+ yacc: add some tests on bison support (still xfailing)
+ Related to automake bug#7648 and PR automake/491.
+ * tests/bison-skeleton-cxx.test: New test.
+ * tests/bison-skeleton.test: New test.
+ * tests/Makefile.am (TESTS, XFAIL_TESTS): Updated.
+
+2011-04-12 Stefano Lattarini <address@hidden>
+
+ coverage: test for automake bug#8485 (known regression)
+ * tests/yacc-dist-nobuild-subdir.test: New test.
+ * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+
+2011-04-10 Stefano Lattarini <address@hidden>
+
+ coverage: test mixed C/C++ yacc-generated parsers in the same dir
+ * tests/yacc-mix-c-cxx.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-04-10 Stefano Lattarini <address@hidden>
+
+ cosmetics: fix typos and wording in some yacc tests
+ * tests/yacc-cxx.test (foo.cc): Clarify comment about the content
+ of this file being valid C++ but invalid C.
+ (parse1.yy): Likewise. Also, remove redundant parentheses in a
+ `return' statement.
+ * tests/yacc-d-cxx.test (write_parse): Clarify comment about the
+ content of the generated files being valid C++ but invalid C.
+ (write_main): Likewise.
+ * tests/yacc-basic.test: Remove redundant parentheses in a
+ `return' statement.
+ * tests/yacc-d-vpath.test: Adjust spacing around curly brackets.
+ * tests/yaccvpath.test: Likewise.
+ * tests/yaccdry.test: Likewise.
+ * tests/yacc8.test: Likewise.
+ * tests/yacc4.test: Likewise.
+ Suggested by Ralf Wildenhues.
+
+2011-04-10 Stefano Lattarini <address@hidden>
+
+ yacc: update NEWS and docs about yacc-generated headers extensions
+ * doc/automake.texi (Yacc and Lex): Document explicitly that
+ extensions of yacc-generated headers are modelled after the
+ extension of the corresponding sources.
+ * NEWS: Update.
+
+2011-01-28 Stefano Lattarini <address@hidden>
+
+ yacc: extension of headers modelled after extension of sources
+ With this change, if '-d' is in *YFLAGS, a yacc input file named
+ foo.y++ will cause a foo.h++ header to be generated, instead of a
+ foo.h header. Similarly for foo.ypp, foo.yxx and foo.yy.
+ This way, the name of the files generated by an automake-created
+ `ylwrap' invocation should be consistent with those generated by
+ a `bison -o' call.
+ Related to automake bug#7648 and PR automake/491.
+ * lib/am/yacc.am (am__yacc_c2h): New internal variable.
+ (?GENERIC?%EXT%%DERIVED-EXT%, ?!GENERIC?%OBJ%): Get the name of
+ the header dynamically at make runtime, so that its extension is
+ modelled after the extension of the source.
+ * automake.in (lang_yacc_target_hook): Adjust the calculation of
+ `$header' accordingly.
+ * tests/yacc-cxx.test: New test.
+ * tests/yacc-d-cxx.test: Likewise.
+ * tests/yacc-weirdnames.test: Likewise.
+ * tests/yacc-basic.test: Update comments.
+ * tests/yacc-d-basic.test: Likewise.
+ * tests/yaccpp.test: Updated and extended.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-01-29 Stefano Lattarini <address@hidden>
+
+ tests: don't define YACC and LEX in the Makefiles
+ We don't want YACC and LEX defined as make variables, otherwise
+ the values determined at configure time will override those from
+ the environment, even in the make-spawned testcases. For example,
+ before this change, with the following usage:
+ $ ./configure YACC=yacc
+ $ export YACC='bison -y'
+ $ make check
+ the testsuite would have ended up, very counterintuitively, with
+ YACC defined to 'yacc' in the testcases' environment.
+ * configure.ac: Call `AM_SUBST_NOTMAKE' on YACC and LEX.
+
+2011-01-29 Stefano Lattarini <address@hidden>
+
+ tests: fix spurious failures in lflags*.test
+ * tests/lflags.test: Remove 'LEX' from the environment, so
+ that it won't be erroneously picked up by `make -e'.
+ * tests/lflags2.test: Likewise.
+
+2011-01-29 Stefano Lattarini <address@hidden>
+
+ coverage: more on 'yacc -d' and recovery from deleted headers
+ * tests/yacc-deleted-headers.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-01-29 Stefano Lattarini <address@hidden>
+
+ tests: remove redundancy from silent lex/yacc tests
+ * tests/silent-yacc-gcc.test, tests/silent-yacc-generic.test: Merge
+ these two testcases into ...
+ * tests/silent-yacc.test: ... this new one, which doesn't fiddle
+ which dependency tracking, as that shouldn't impact on generation
+ of yacc-derived C source and header files (and, for what concerns
+ compilation of C files, is already tested in other testcases).
+ * tests/silent-lex-gcc.test, tests/silent-lex-generic.test: Merge
+ these two testcases into ...
+ * tests/silent-lex.test: ... this new test, for similar reasons.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-01-29 Stefano Lattarini <address@hidden>
+ Ralf Wildenhues <address@hidden>
+
+ tests init: better messages for 'yacc' and 'lex' requirements
+ * tests/defs.in: Give better diagnostic messages when a test must
+ be skipped to the unavailability of yacc or lex program. Also,
+ improve syncing between code for requiring yacc and lex.
+
+2011-01-28 Stefano Lattarini <address@hidden>
+
+ configure: look for a lex program to be used by the testsuite
+ This will allow the testcases requiring a 'lex' program to run also
+ with vendor/legacy lex implementations, not only with 'flex'.
+ * configure.ac: Look for a lex program, using AC_CHECK_PROGS.
+ * tests/defs.in: New required entry 'lex'.
+ ($LEX): Let the user override the lex program to be used by the
+ testsuite.
+ * tests/cond35.test ($required): Require 'lex', not 'flex'.
+ * tests/cond36.test: Likewise.
+ * tests/lexv3.test: Likewise.
+ * tests/lexv3.test: Likewise.
+ * tests/silent-lex-gcc.test: Likewise.
+ * tests/silent-lex-generic.test: Likewise.
+ * tests/silent-many-gcc.test: Likewise.
+ * tests/silent-many-generic.test:likewise.
+ * tests/lexvpath.test: Likewise, and fix typo in comments.
+
+2011-01-22 Stefano Lattarini <address@hidden>
+
+ configure: look for a yacc program to be used by the testsuite
+ Instead of forcing the user to manually export 'YACC' in the
+ testsuite to use a non-bison yacc, we now look for a yacc program
+ at configure time, and use that as the default in the testsuite.
+ * configure.ac: Look for a yacc program, using AC_CHECK_PROGS.
+ * tests/defs.in: Updated to use the value of $YACC precomputed by
+ configure, unless the user overrides that in the environment.
+
+2011-01-22 Stefano Lattarini <address@hidden>
+
+ tests: more coverage on yacc/lex silent-rules, plus minor cleanups
+ * tests/silent-yacc-gcc.test: Add sanity checks verifying that the
+ generated Makefile.in files really contains the non-generic rules
+ we expect. Do not redundantly manually remove files we know to be
+ already removed "make maintainer-clean".
+ (Makefile.am): Ensure we cover also non-generic yacc rules, by
+ setting target-specific YFLAGS.
+ (sub/Makefile.am): Likewise.
+ * tests/silent-yacc-generic.test: Likewise.
+ * tests/silent-lex-gcc.test: Likewise, but with LFLAGS instead of
+ YFLAGS.
+ * tests/silent-lex-generic.test: Likewise.
+ * tests/silent-many-gcc.test: Likewise, but with both LFLAGS and
+ YFLAGS. Also ...
+ (do_and_check_verbose_build): Remove redundant blank line.
+ * tests/silent-many-generic.test: Likewise.
+ * tests/silent-yacc-headers.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-01-22 Stefano Lattarini <address@hidden>
+
+ tests: fix spurious failures in yflags*.test
+ * tests/yflags.test: Remove 'YACC' from the environment, so
+ that it won't be erroneously picked up by `make -e'.
+ * tests/yflags2.test: Likewise.
+
+2011-01-22 Stefano Lattarini <address@hidden>
+
+ tests: cover yacc target-specific flags, and `-v' flag handling
+ * tests/yacc-basic.test: Also try to build a parser having `-v'
+ as target-specific flags. Add a couple of `ls -l' commands, for
+ debugging. Update and extend comments. Escape literal dots in
+ grep regular expressions.
+
+2011-01-12 Stefano Lattarini <address@hidden>
+
+ docs: clustered '-d' not recognized in YFLAGS
+ This change fixes automake bug#7828.
+ * doc/automake.texi (Yacc and Lex): Document that automake
+ recognizes '-d' in AM_YFLAGS only if it's not clustered with
+ other options.
+ From a report by ЮÑий ÐÑÑ
алÑÑкий.
+
+2011-01-11 Stefano Lattarini <address@hidden>
+
+ tests: do not force yacc-requiring tests to use bison
+ * tests/defs.in: New required entry 'yacc'. Remove old
+ required entry 'bison'.
+ * tests/cond35.test ($required): Require yacc, not bison.
+ * tests/cond36.test: Likewise.
+ * tests/pr204.test: Likewise.
+ * tests/silent-many-gcc.test: Likewise.
+ * tests/silent-many-generic.test: Likewise.
+ * tests/silent-yacc-gcc.test: Likewise.
+ * tests/silent-yacc-generic.test: Likewise.
+ * tests/subpkg.test: Likewise.
+ * tests/suffix10.test: Likewise.
+ * tests/yacc-basic.test: Likewise.
+ * tests/yacc-clean.test: Likewise.
+ * tests/yacc-d-basic.test: Likewise.
+ * tests/yacc-d-vpath.test: Likewise.
+ * tests/yacc-dist-nobuild.test: Likewise.
+ * tests/yacc-nodist.test: Likewise.
+ * tests/yacc4.test: Likewise.
+ * tests/yacc6.test: Likewise.
+ * tests/yacc7.test: Likewise.
+ * tests/yacc8.test: Likewise.
+ * tests/yaccdry.test: Likewise.
+ * tests/yaccvpath.test: Likewise.
+
+2011-01-10 Stefano Lattarini <address@hidden>
+
+ yacc: warn about conditional content in *YFLAGS variables
+ This change fixes automake bug#7804.
+ * automake.in (lang_yacc_target_hook): Warn if any of the relevant
+ *YFLAGS variables has conditional contents (not only a conditional
+ definition). Related refactoring.
+ * NEWS: Updated.
+ * tests/yflags-conditional.test: Updated and extended.
+ * tests/yflags-conditional-force.test: New test.
+ * tests/Makefile.am (TESTS): Updated.
+
+2011-01-08 Stefano Lattarini <address@hidden>
+
+ yacc: support variable expansions in *YFLAGS definition.
+ This change fixes automake bug#7800.
+ * automake.in (lang_yacc_target_hook): Use 'value_as_list_recursive'
+ instead of 'variable_value' to get the value of *YFLAGS variables.
+ Related changes.
+ ($DASH_D_PATTERN): Removed.
+ * tests/Makefile.am (XFAIL_TESTS): Remove yflags-var-expand.test.
+ * tests/yacc-clean.test: Remove workaround for now-fixed bug.
+ * NEWS: Update.
+
+2011-01-08 Stefano Lattarini <address@hidden>
+
+ yacc: more tests on *YFLAGS support
+ * tests/yflags-var-expand.test: New test, still xfailing. It
+ exposes automake bug#7800 -- "automake fails to honor `-d' in
+ AM_YFLAGS when variable expansions are involved".
+ * tests/yflags-d-false-positive.test: New test, checking that
+ automake do not spuriously see `-d' in *YFLAGS when that isn't
+ really there.
+ * tests/yflags-force-override.test: New test, checking that
+ automake can cope with definition of the YFLAGS variable in
+ Makefile.am (even if that is an extremely bad practice, as that
+ variable is user-reserved).
+ * tests/yflags-cmdline-override.test: New test, checking that
+ automake can cope with user-redefinition of YFLAGS at configure
+ time and/or at make time.
+ * tests/yflags-conditional.test: New test, checks that automake
+ warns on conditionally-defined *YFLAGS variables.
+ * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+
+2011-01-08 Stefano Lattarini <address@hidden>
+
+ yacc: extend and improve tests
+ * tests/yacc-basic.test: Also check that the intermediate C file
+ is mentioned in the generated Makefile.in, and that it is created
+ by the first make invocation.
+ * tests/yacc3.test: Test removed, superseded by ...
+ * tests/yacc-d-basic.test: ... this new test.
+ * tests/yacc2.test: Add reference to that new test in the heading
+ comments.
+ * tests/yacc-d-vpath.test: New test.
+ * tests/yaccvpath.test: Updated heading comments. Do not require
+ gcc anymore, as any working C compiler should be enough. Remove
+ redundant comments.
+ * tests/yacc-nodist.test: New test.
+ * tests/yacc-dist-nobuild.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+
+2010-12-13 Stefano Lattarini <address@hidden>
+
+ Extend, fix and improve tests on Lex and Yacc support.
+ * tests/lexcpp.test: New test script, on support for Lex + C++.
+ * tests/lexvpath.test: New test script, test build and rebuild
+ rules for lexers in VPATH setup.
+ * tests/yacc-basic.test: New test script, run simple "semantic"
+ checks on basic Yacc support (similarly to what lex3.test does
+ for Lex support).
+ * tests/lex.test: Don't create useless dummy source file joe.l.
+ Remove extra blank lines.
+ * tests/lex4.test: Add trailing `:' command. Do not create dummy
+ useless lex source file.
+ * tests/lex2.test: Likewise. Call automake with the `-a' option,
+ so that it doesn't fail for the absence of `ylwrap' script. Make
+ grepping of automake stderr stricter.
+ * tests/yacc7.test: Add trailing `:' command. Enable `errexit'
+ shell flag earlier (just after having sourced ./defs).
+ * tests/yacc4.test: Likewise. Also ...
+ (configure.in): Use pre-populated skeleton set up by ./defs,
+ instead of writing one from scratch.
+ Other minor cosmetic changes.
+ * tests/yacc5.test: Likewise.
+ * tests/yaccvpath.test: Likewise. Also ...
+ ($distdir): New variable.
+ Use it throughout.
+ * tests/lex5.test: Likewise.
+ * tests/lex3.test: Likewise. Check the distdir, rather than
+ grepping the distribution tarball. Extend the test on the
+ created binary, and be sure to avoid hangs. Add some comments.
+ * tests/yacc.test: Use stricter grepping. Add trailing `:'.
+ * tests/yacc6.test: Likewise.
+ * tests/yacc3.test: Likewise. Do not create the unused file
+ `Makefile.sed'. Remove useless rules from Makefile.am. Other
+ minor cosmetic changes.
+ * tests/yacc2.test: Make grepping of generated `Makefile.in' and
+ of automake error messages stricter. Do not redirect output of
+ grep to /dev/null. Move call to aclocal earlier. Reduce the
+ number of empty blank lines. Fix a typo in comments.
+ * tests/yacc8.test: Fixed bugs that reduced the completeness of
+ the tests. Added trailing `:' command.
+ (configure.in): Use pre-populated skeleton set up by ./defs,
+ instead of writing one from scratch.
+ * tests/yaccpp.test: Test also extensions `.y++', `.ypp', and
+ `.yxx', rather than only `.yy'.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-01-07 Stefano Lattarini <address@hidden>
+
+ yacc: "make clean" removes .c and .h files from non-distributed .y
+ Previously, while automake did *not* distribute C source and header
+ files derived from non-distributed Yacc sources, it still caused
+ them to be removed only by "make maintainer-clean" only, and not by
+ simply "make clean" or "make distclean".
+ This caused "make distcheck" to fail, unless the developer put
+ those generated .c and .h files in CLEANFILES or in DISTCLEANFILES
+ by hand.
+ This change fixes this issue, by making non-distributed `.c' and
+ `.h' files generated by non-distributed Yacc sources cleaned by
+ "make clean".
+ * tests/automake.in (lang_yacc_target_hook): Make C source and
+ header files derived from non-distributed Yacc files cleaned by
+ "make clean", not only by "make maintainer-clean".
+ * tests/yacc-clean.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+ * NEWS: Update.
+
2011-04-11 Stefano Lattarini <address@hidden>
depcomp: fix bugs in tests and in the depcomp script
@@ -12513,7 +13097,7 @@
-----
-Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 2010-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.96 b/ChangeLog.96
index c721146..d89c2e3 100644
--- a/ChangeLog.96
+++ b/ChangeLog.96
@@ -3679,7 +3679,7 @@ Mon Sep 19 23:39:21 1994 djm <address@hidden>
-----
-Copyright 1994, 1995, 1996 Free Software Foundation, Inc.
+Copyright 1994-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.98 b/ChangeLog.98
index 717b7f5..3eeb353 100644
--- a/ChangeLog.98
+++ b/ChangeLog.98
@@ -2185,7 +2185,7 @@ Thu Jan 2 14:16:17 1997 Tom Tromey <address@hidden>
-----
-Copyright 1997, 1998 Free Software Foundation, Inc.
+Copyright 1997-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/HACKING b/HACKING
index 5420fbc..87318fd 100644
--- a/HACKING
+++ b/HACKING
@@ -200,9 +200,6 @@
* Run this:
./bootstrap && ./configure && make && make check && make distcheck
-* Run `make release-stats' if release statistics in doc/automake.texi
- have not been updated yet.
-
* Run `make git-release'.
This will run "make dist" to create the tarballs, commit the last
changes to NEWS, configure.ac and m4/amversion.m4, tag the repository,
@@ -237,8 +234,7 @@
-----
-Copyright (C) 2003, 2007, 2008, 2010, 2011, 2012 Free Software
-Foundation, Inc.
+Copyright (C) 2003-2012 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index a1e89e1..414d0e5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
-Inc.
+Copyright (C) 1994-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
diff --git a/Makefile.am b/Makefile.am
index 868253f..44d73c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,7 @@
## Makefile for Automake.
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -269,9 +267,9 @@ autodiffs:
{ \
rev=$$1 dir=$$2 \
&& echo "$@: will get files from revision $$rev" \
- && git clone -q --depth 1 "$$am_gitdir" tmp \
+ && $(GIT) clone -q --depth 1 "$$am_gitdir" tmp \
&& $(am__cd) tmp \
- && git checkout -q "$$rev" \
+ && $(GIT) checkout -q "$$rev" \
&& echo "$@: bootstrapping $$rev" \
&& $(SHELL) ./bootstrap \
&& echo "$@: copying files from $$rev" \
@@ -283,8 +281,8 @@ autodiffs:
}; \
address@hidden \
## Before proceeding, ensure the specified revisions truly exist.
- && git --git-dir="$$am_gitdir" describe $$OLD_COMMIT >/dev/null \
- && git --git-dir="$$am_gitdir" describe $$NEW_COMMIT >/dev/null \
+ && $(GIT) --git-dir="$$am_gitdir" describe $$OLD_COMMIT >/dev/null \
+ && $(GIT) --git-dir="$$am_gitdir" describe $$NEW_COMMIT >/dev/null \
&& rm -rf $$outdir \
&& mkdir $$outdir \
&& $(am__cd) $$outdir \
@@ -340,7 +338,8 @@ config.guess \
config.sub \
gnupload \
gitlog-to-changelog \
-texinfo.tex
+texinfo.tex \
+update-copyright
## Fetch the latest versions of files we care about.
fetch:
@@ -353,6 +352,7 @@ fetch:
$(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \
$(WGET_SV_GIT_GL)doc/INSTALL -O INSTALL && \
$(WGET_SV_GIT_GL)build-aux/gnupload -O gnupload && \
+ $(WGET_SV_GIT_GL)build-aux/update-copyright -O update-copyright && \
$(WGET_SV_GIT_GL)build-aux/gitlog-to-changelog -O gitlog-to-changelog)
## Don't exit after test because we want to give as many errors as
## possible.
@@ -370,33 +370,15 @@ fetch:
exit $$stat
.PHONY: fetch
-## Generate release statistics, for the table in automake.texi.
-## This has to be run in an up to date build tree, but there must
-## be no temp files nor unused other files lying around!
-release-stats: ps
- $(AM_V_GEN): && \
- am=`wc -l < automake` && \
- acl=`wc -l < aclocal` && \
- pmfiles="lib/Automake/*.pm" && \
- if test . != '$(srcdir)'; then pmfiles="$$pmfiles
$(srcdir)/lib/Automake/*.pm"; \
- else :; fi && \
- pm=`cat $$pmfiles | wc -l` && \
- dot_am_files=`ls -1 $(srcdir)/lib/am/*.am | grep -v Makefile.am` && \
- amf=`echo "$$dot_am_files" | wc -l` && \
- aml=`cat $$dot_am_files | wc -l` && \
- m4f=`ls -1 $(srcdir)/m4/*.m4 | wc -l` && \
- m4l=`cat $(srcdir)/m4/*.m4 | wc -l` && \
- doc_text=`$(am__cd) doc && LC_ALL=C pstops 0 automake.ps unused.ps
2>&1` && \
- echo "$$doc_text" && \
- rm -f doc/unused.ps && \
- doc=`echo "$$doc_text" | sed -n 's/.*Wrote \([1-9][0-9]*\)
pages.*/\1/p'` && \
- tests="tests/*.test"; \
- if test . != '$(srcdir)'; then tests="$$tests $(srcdir)/tests/*.test"; \
- else :; fi && \
- t=`ls -1 $$tests | wc -l` && \
- tgen=`grep 'GENERATED AUTOMATICALLY' $$tests | wc -l` && \
- today=`date +%Y-%m-%d` && \
- echo "add this to the table in doc/automake.texi after verification:"
&& \
- printf '@item %s @tab %-6s @tab %4d @tab %4d @tab %4d @tab %4d %-4s
@tab %4d %-4s @tab %3d @tab %d %-4s\n' \
- $$today $(VERSION) $$am $$acl $$pm $$aml
"($$amf)" $$m4l "($$m4f)" $$doc $$t "($$tgen)"
-.PHONY: release-stats
+update_copyright_env = \
+ UPDATE_COPYRIGHT_FORCE=1 \
+ UPDATE_COPYRIGHT_USE_INTERVALS=2
+
+.PHONY: update-copyright
+update-copyright:
+ $(AM_V_GEN)excluded_re=`echo $(FETCHFILES) \
+ | sed -e 's|^|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \
+ $(GIT) ls-files \
+ | grep -Ev '/(COPYING|INSTALL)' \
+ | grep -Ev "^($$excluded_re)$$" \
+ | $(update_copyright_env) xargs $(srcdir)/lib/$@
diff --git a/NEWS b/NEWS
index 63796cc..252fcf7 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ New in 1.11a:
- The deprecated options `--output-dir', `--Werror' and `--Wno-error'
have been removed.
+ - The chapter on the history of Automake has been moved out of the
+ reference manual, into a new dedicated Texinfo file.
+
* New targets:
- New `cscope' target to build a cscope database for the source tree.
@@ -97,6 +100,20 @@ New in 1.11a:
- Initial and still experimental support for the TAP test protocol is
now provided.
+* Changes to Yacc and Lex support:
+
+ - C source and header files derived from non-distributed Yacc and/or
+ Lex sources are now removed by a simple "make clean" (while they were
+ previously removed only by "make maintainer-clean").
+
+ - Slightly backward-incompatible change, relevant only for use of Yacc
+ with C++: the extensions of the header files produced by the Yacc
+ rules are now modelled after the extension of the corresponding
+ sources. For example, yacc files named "foo.y++" and "bar.yy" will
+ produce header files named "foo.h++" and "bar.hh" respectively, where
+ they would have previously produced header files named simply "foo.h"
+ and "bar.h". This change offers better compatibility with `bison -o'.
+
* Miscellaneous changes:
- The `dist' and `dist-all' targets now can run compressors in parallel.
@@ -124,9 +141,6 @@ New in 1.11a:
overwriting the foo_DEPENDENCIES variable, which is normally computed
by automake.
- - C source and header files derived from non-distributed Yacc sources
- are now removed by "make clean", not only by "make maintainer-clean".
-
- The warnings in the category `extra-portability' are now enabled by
`-Wall'. In previous versions, one has to use `-Wextra-portability'
to enable them.
@@ -1860,9 +1874,7 @@ New in 0.20:
-----
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-Foundation, Inc.
+Copyright (C) 1995-2012 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/README b/README
index 41f5366..3c46c77 100644
--- a/README
+++ b/README
@@ -145,8 +145,7 @@ be informed, subscribe to that list by following the
instructions at
-----
-Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2003, 2008, 2009, 2011
- Free Software Foundation, Inc.
+Copyright (C) 1994-2012 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/TODO b/TODO
index 79f298f..8ad887f 100644
--- a/TODO
+++ b/TODO
@@ -560,8 +560,7 @@ that aren't mentioned?
* copyright notice
-Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2007 Free Software Foundation, Inc.
+Copyright 1994-2012 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/aclocal.in b/aclocal.in
index 8cffe71..5e7475f 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -7,9 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S
"$0" "$@";; esac'
# aclocal - create aclocal.m4 by scanning configure.ac
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/automake.in b/automake.in
index 0f7dadf..35766e1 100644
--- a/automake.in
+++ b/automake.in
@@ -6,9 +6,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S
"$0" "$@";; esac'
if 0;
# automake - create Makefile.in from Makefile.am
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -5872,12 +5870,26 @@ sub lang_yacc_target_hook
if ($yflags_contains_minus_d)
{
- (my $output_base = $output) =~ s/$KNOWN_EXTENSIONS_PATTERN$//;
- my $header = $output_base . '.h';
-
# Found a `-d' that applies to the compilation of this file.
# Add a dependency for the generated header file, and arrange
# for that file to be included in the distribution.
+
+ # The extension of the output file (e.g., `.c' or `.cxx').
+ # We'll need it to compute the name of the generated header file.
+ (my $output_ext = basename ($output)) =~ s/.*(\.[^.]+)$/$1/;
+
+ # We know that a yacc input should be turned into either a C or
+ # C++ output file. We depend on this fact (here and in yacc.am),
+ # so check that it really holds.
+ my $lang = $languages{$extension_map{$output_ext}};
+ prog_error "invalid output name `$output' for yacc file `$input'"
+ if (!$lang || ($lang->name ne 'c' && $lang->name ne 'cxx'));
+
+ (my $header_ext = $output_ext) =~ s/c/h/g;
+ # Quote $output_ext in the regexp, so that dots in it are taken
+ # as literal dots, not as metacharacters.
+ (my $header = $output) =~ s/\Q$output_ext\E$/$header_ext/;
+
foreach my $cond (Automake::Rule::define (${header}, 'internal',
RULE_AUTOMAKE, TRUE,
INTERNAL))
@@ -5909,13 +5921,12 @@ sub lang_yacc_target_hook
# compile a lex file.
sub lang_lex_target_hook
{
- my ($self, $aggregate, $output, $input) = @_;
- # If the files are built in the build directory, then we want to
- # remove them with `make clean'. If they are in srcdir they
- # shouldn't be touched. However, we can't determine this
- # statically, and the GNU rules say that yacc/lex output files
- # should be removed by maintainer-clean. So that's what we do.
- $clean_files{$output} = MAINTAINER_CLEAN;
+ my ($self, $aggregate, $output, $input, %transform) = @_;
+ # The GNU rules say that yacc/lex output files should be removed
+ # by maintainer-clean. However, if the files are not distributed,
+ # then we want to remove them with "make clean"; otherwise,
+ # "make distcheck" will fail.
+ $clean_files{$output} = $transform{'DIST_SOURCE'} ? MAINTAINER_CLEAN :
CLEAN;
}
# This is a helper for both lex and yacc.
diff --git a/bootstrap b/bootstrap
index fa0bf88..04b524c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,8 +2,7 @@
# This script helps bootstrap automake, when checked out from git.
#
-# Copyright (C) 2002, 2003, 2004, 2007, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# Originally written by Pavel Roskin <address@hidden> September 2002.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/configure.ac b/configure.ac
index e461e17..1b8ebb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,6 @@
# Process this file with autoconf to produce a configure script.
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -112,6 +110,20 @@ AC_CHECK_PROG([TEX], [tex], [tex])
# for input from the terminal.
AM_RUN_LOG([$TEX --version </dev/null])
+# The test suite will skip some tests if no lex or yacc program is
+# available.
+# We don't use AC_PROG_LEX nor AC_PROG_YACC here because:
+# 1. we don't want flex (resp. bison) to be preferred to system lex
+# (resp. system yacc);
+# 2. we don't want $LEX (resp. $YACC) to be defined to ':' (resp. 'yacc')
+# by default;
+# 3. we prefer not to have the variables YFLAGS, LEX_OUTPUT_ROOT and
+# LEXLIB to be calculated and/or AC_SUBST'd;
+# 4. we prefer that the YACC and LEX variables are not reported in the
+# configure help screen.
+AC_CHECK_PROGS([YACC], [yacc byacc 'bison -y'], [false])
+AC_CHECK_PROGS([LEX], [lex flex], [false])
+
# Generate man pages.
AM_MISSING_PROG([HELP2MAN], [help2man])
diff --git a/contrib/check-html.am b/contrib/check-html.am
index 9bba391..c9d44cd 100644
--- a/contrib/check-html.am
+++ b/contrib/check-html.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-## Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/contrib/multilib/config-ml.in b/contrib/multilib/config-ml.in
index 1198346..a68a005 100644
--- a/contrib/multilib/config-ml.in
+++ b/contrib/multilib/config-ml.in
@@ -1,8 +1,7 @@
# Configure fragment invoked in the post-target section for subdirs
# wanting multilib support.
#
-# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/contrib/multilib/multi.m4 b/contrib/multilib/multi.m4
index 9841767..d1320d6 100644
--- a/contrib/multilib/multi.m4
+++ b/contrib/multilib/multi.m4
@@ -1,6 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/contrib/multilib/symlink-tree b/contrib/multilib/symlink-tree
index a9d5083..f1877f9 100755
--- a/contrib/multilib/symlink-tree
+++ b/contrib/multilib/symlink-tree
@@ -1,7 +1,7 @@
#!/bin/sh
# Create a symlink tree.
#
-# Copyright (C) 1995, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 71c7a6a..4b90fd4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,8 +2,7 @@
## Makefile for Automake.
-# Copyright (C) 2003, 2006, 2008, 2009, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,8 +17,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-info_TEXINFOS = automake.texi
+info_TEXINFOS = automake.texi automake-history.texi
automake_TEXINFOS = fdl.texi
+history_TEXINFOS = fdl.texi
dist_man1_MANS = \
$(srcdir)/aclocal.1 \
diff --git a/doc/amhello/Makefile.am b/doc/amhello/Makefile.am
index 469aeb9..8d230a8 100644
--- a/doc/amhello/Makefile.am
+++ b/doc/amhello/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
# This Makefile.am is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/configure.ac b/doc/amhello/configure.ac
index cd378cb..6d966a2 100644
--- a/doc/amhello/configure.ac
+++ b/doc/amhello/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
# This configure.ac script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/src/Makefile.am b/doc/amhello/src/Makefile.am
index 9642aa0..9e17883 100644
--- a/doc/amhello/src/Makefile.am
+++ b/doc/amhello/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
# This Makefile.am is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/src/main.c b/doc/amhello/src/main.c
index 8b1ccf2..c782738 100644
--- a/doc/amhello/src/main.c
+++ b/doc/amhello/src/main.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2012 Free Software Foundation, Inc.
This program is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it. */
diff --git a/doc/automake-history.texi b/doc/automake-history.texi
new file mode 100644
index 0000000..5cb3685
--- /dev/null
+++ b/doc/automake-history.texi
@@ -0,0 +1,1214 @@
+\input texinfo @c -*-texinfo-*-
address@hidden %**start of header
address@hidden automake-history.info
address@hidden automake-history
address@hidden on
address@hidden %**end of header
+
address@hidden
+
+This manual describes (part of) the history of GNU Automake, a program
+that creates GNU standards-compliant Makefiles from template files.
+
+Copyright @copyright{} 1995-2012 Free Software Foundation, Inc.
+
address@hidden
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License,
+Version 1.3 or any later version published by the Free Software
+Foundation; with no Invariant Sections, with no Front-Cover texts,
+and with no Back-Cover Texts. A copy of the license is included in the
+section entitled ``GNU Free Documentation License.''
+
address@hidden quotation
address@hidden copying
+
address@hidden
address@hidden Brief History of Automake
address@hidden David MacKenzie
address@hidden Tom Tromey
address@hidden Alexandre Duret-Lutz
address@hidden
address@hidden 0pt plus 1filll
address@hidden
address@hidden titlepage
+
address@hidden
+
address@hidden
address@hidden Top
address@hidden node-name, next, previous, up
address@hidden Brief History of Automake
+
address@hidden
+
address@hidden
+* Timeline:: The Automake story.
+* Dependency Tracking Evolution:: Evolution of Automatic Dependency Tracking
+* Releases:: Release statistics
+* Copying This Manual:: How to make copies of this manual
+
address@hidden
+ --- The Detailed Node Listing ---
+
+Evolution of Automatic Dependency Tracking
+
+* First Take on Dependencies:: Precomputed dependency tracking
+* Dependencies As Side Effects:: Update at developer compile time
+* Dependencies for the User:: Update at user compile time
+* Techniques for Dependencies:: Alternative approaches
+
+Techniques for Computing Dependencies
+
+* Recommendations for Tool Writers::
+* Future Directions for Dependencies::
+
+Copying This Manual
+
+* GNU Free Documentation License:: License for copying this manual
+
address@hidden detailmenu
address@hidden menu
+
address@hidden ifnottex
+
address@hidden Timeline
address@hidden Timeline
+
address@hidden @asis
address@hidden 1994-09-19 First CVS commit.
+
+If we can trust the CVS repository, David address@hidden (djm) started
+working on Automake (or AutoMake, as it was spelt then) this Monday.
+
+The first version of the @command{automake} script looks as follows.
+
address@hidden
+#!/bin/sh
+
+status=0
+
+for makefile
+do
+ if test ! -f address@hidden@}.am; then
+ echo "automake: address@hidden@}.am: No such honkin' file"
+ status=1
+ continue
+ fi
+
+ exec 4> address@hidden@}.in
+
+done
address@hidden example
+
+From this you can already see that Automake will be about reading
address@hidden file and producing @file{*.in} files. You cannot see
+anything else, but if you also know that David is the one who created
+Autoconf two years before you can guess the rest.
+
+Several commits follow, and by the end of the day Automake is
+reported to work for GNU fileutils and GNU m4.
+
+The modus operandi is the one that is still used today: variable
+assignments in @file{Makefile.am} files trigger injections of
+precanned @file{Makefile} fragments into the generated
address@hidden The use of @file{Makefile} fragments was inspired
+by the 4.4BSD @command{make} and include files, however Automake aims
+to be portable and to conform to the GNU standards for @file{Makefile}
+variables and targets.
+
+At this point, the most recent release of Autoconf is version 1.11,
+and David is preparing to release Autoconf 2.0 in late October. As a
+matter of fact, he will barely touch Automake after September.
+
address@hidden 1994-11-05 David MacKenzie's last commit.
+
+At this point Automake is a 200 line portable shell script, plus 332
+lines of @file{Makefile} fragments. In the @file{README}, David
+states his ambivalence between ``portable shell'' and ``more
+appropriate language'':
+
address@hidden
+I wrote it keeping in mind the possibility of it becoming an Autoconf
+macro, so it would run at configure-time. That would slow
+configuration down a bit, but allow users to modify the Makefile.am
+without needing to fetch the AutoMake package. And, the Makefile.in
+files wouldn't need to be distributed. But all of AutoMake would. So
+I might reimplement AutoMake in Perl, m4, or some other more
+appropriate language.
address@hidden quotation
+
+Automake is described as ``an experimental Makefile generator''.
+There is no documentation. Adventurous users are referred to the
+examples and patches needed to use Automake with GNU m4 1.3, fileutils
+3.9, time 1.6, and development versions of find and indent.
+
+These examples seem to have been lost. However at the time of writing
+(10 years later in September, 2004) the FSF still distributes a
+package that uses this version of Automake: check out GNU termutils
+2.0.
+
address@hidden 1995-11-12 Tom Tromey's first commit.
+
+After one year of inactivity, Tom Tromey takes over the package.
+Tom was working on GNU cpio back then, and doing this just for fun,
+having trouble finding a project to contribute to. So while hacking
+he wanted to bring the @file{Makefile.in} up to GNU standards. This
+was hard, and one day he saw Automake on @url{ftp://alpha.gnu.org/},
+grabbed it and tried it out.
+
+Tom didn't talk to djm about it until later, just to make sure he
+didn't mind if he made a release. He did a bunch of early releases to
+the Gnits folks.
+
+Gnits was (and still is) totally informal, just a few GNU friends who
+Fran@,cois Pinard knew, who were all interested in making a common
+infrastructure for GNU projects, and shared a similar outlook on how
+to do it. So they were able to make some progress. It came along
+with Autoconf and extensions thereof, and then Automake from David and
+Tom (who were both gnitsians). One of their ideas was to write a
+document paralleling the GNU standards, that was more strict in some
+ways and more detailed. They never finished the GNITS standards, but
+the ideas mostly made their way into Automake.
+
address@hidden 1995-11-23 Automake 0.20
+
+Besides introducing automatic dependency tracking (@pxref{Dependency
+Tracking Evolution}), this version also supplies a 9-page manual.
+
+At this time @command{aclocal} and @code{AM_INIT_AUTOMAKE} did not
+exist, so many things had to be done by hand. For instance, here is
+what a configure.in (this is the former name of the
address@hidden we use today) must contain in order to use
+Automake 0.20:
+
address@hidden
+PACKAGE=cpio
+VERSION=2.3.911
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
address@hidden example
+
+(Today all of the above is achieved by @code{AC_INIT} and
address@hidden)
+
+Here is how programs are specified in @file{Makefile.am}:
+
address@hidden
+PROGRAMS = hello
+hello_SOURCES = hello.c
address@hidden example
+
+This looks pretty much like what we do today, except the
address@hidden variable has no directory prefix specifying where
address@hidden should be installed: all programs are installed in
address@hidden(bindir)}. @code{LIBPROGRAMS} can be used to specify programs
+that must be built but not installed (it is called
address@hidden nowadays).
+
+Programs can be built conditionally using @code{AC_SUBST}itutions:
+
address@hidden
+PROGRAMS = @@progs@@
+AM_PROGRAMS = foo bar baz
address@hidden example
+
+(@code{AM_PROGRAMS} has since then been renamed to
address@hidden)
+
+Similarly scripts, static libraries, and data can be built and installed
+using the @code{LIBRARIES}, @code{SCRIPTS}, and @code{DATA} variables.
+However @code{LIBRARIES} were treated a bit specially in that Automake
+did automatically supply the @file{lib} and @file{.a} prefixes.
+Therefore to build @file{libcpio.a}, one had to write
+
address@hidden
+LIBRARIES = cpio
+cpio_SOURCES = ...
address@hidden example
+
+Extra files to distribute must be listed in @code{DIST_OTHER} (the
+ancestor of @code{EXTRA_DIST}). Also extra directories that are to be
+distributed should appear in @code{DIST_SUBDIRS}, but the manual
+describes this as a temporary ugly hack (today extra directories should
+also be listed in @code{EXTRA_DIST}, and @code{DIST_SUBDIRS} is used
+for another purpose, @pxref{Conditional Subdirectories, , Conditional
+Subdirectories, automake, GNU Automake}).
+
address@hidden 1995-11-26 Automake 0.21
+
+In less time than it takes to cook a frozen pizza, Tom rewrites
+Automake using Perl. At this time Perl 5 is only one year old, and
+Perl 4.036 is in use at many sites. Supporting several Perl versions
+has been a source of problems through the whole history of Automake.
+
+If you never used Perl 4, imagine Perl 5 without objects, without
address@hidden variables (only dynamically scoped @samp{local} variables),
+without function prototypes, with function calls that needs to be
+prefixed with @samp{&}, etc. Traces of this old style can still be
+found in today's @command{automake}.
+
address@hidden 1995-11-28 Automake 0.22
address@hidden 1995-11-29 Automake 0.23
+
+Bug fixes.
+
address@hidden 1995-12-08 Automake 0.24
address@hidden 1995-12-10 Automake 0.25
+
+Releases are raining. 0.24 introduces the uniform naming scheme we
+use today, i.e., @code{bin_PROGRAMS} instead of @code{PROGRAMS},
address@hidden instead of @code{LIBLIBRARIES}, etc. (However
address@hidden does not exist yet, @code{AM_PROGRAMS} is still
+in use; and @code{TEXINFOS} and @code{MANS} still have no directory
+prefixes.) Adding support for prefixes like that was one of the major
+ideas in @command{automake}; it has lasted pretty well.
+
+AutoMake is renamed to Automake (Tom seems to recall it was Fran@,cois
+Pinard's doing).
+
+0.25 fixes a Perl 4 portability bug.
+
address@hidden 1995-12-18 Jim Meyering starts using Automake in GNU Textutils.
address@hidden 1995-12-31 Fran@,cois Pinard starts using Automake in GNU tar.
+
address@hidden 1996-01-03 Automake 0.26
address@hidden 1996-01-03 Automake 0.27
+
+Of the many changes and suggestions sent by Fran@,cois Pinard and
+included in 0.26, perhaps the most important is the advice that to
+ease customization a user rule or variable definition should always
+override an Automake rule or definition.
+
+Gordon Matzigkeit and Jim Meyering are two other early contributors
+that have been sending fixes.
+
+0.27 fixes yet another Perl 4 portability bug.
+
address@hidden 1996-01-13 Automake 0.28
+
+Automake starts scanning @file{configure.in} for @code{LIBOBJS}
+support. This is an important step because until this version
+Automake only knew about the @file{Makefile.am}s it processed.
address@hidden was Autoconf's world and the link between Autoconf
+and Automake had to be done by the @file{Makefile.am} author. For
+instance, if @file{config.h} was generated by @file{configure}, it was the
+package maintainer's responsibility to define the @code{CONFIG_HEADER}
+variable in each @file{Makefile.am}.
+
+Succeeding releases will rely more and more on scanning
address@hidden to better automate the Autoconf integration.
+
+0.28 also introduces the @code{AUTOMAKE_OPTIONS} variable and the
address@hidden and @option{--gnits} options, the latter being stricter.
+
address@hidden 1996-02-07 Automake 0.29
+
+Thanks to @file{configure.in} scanning, @code{CONFIG_HEADER} is gone,
+and rebuild rules for @file{configure}-generated file are
+automatically output.
+
address@hidden and @code{MANS} converted to the uniform naming
+scheme.
+
address@hidden 1996-02-24 Automake 0.30
+
+The test suite is born. It contains 9 tests. From now on test cases
+will be added pretty regularly (@pxref{Releases}), and this proved to
+be really helpful later on.
+
address@hidden finally replaces @code{AM_PROGRAMS}.
+
+All the third-party Autoconf macros, written mostly by Fran@,cois
+Pinard (and later Jim Meyering), are distributed in Automake's
+hand-written @file{aclocal.m4} file. Package maintainers are expected
+to extract the necessary macros from this file. (In previous versions
+you had to copy and paste them from the manual...)
+
address@hidden 1996-03-11 Automake 0.31
+
+The test suite in 0.30 was run via a long @code{check-local} rule. Upon
+Ulrich Drepper's suggestion, 0.31 makes it an Automake rule output
+whenever the @code{TESTS} variable is defined.
+
address@hidden is renamed to @code{EXTRA_DIST}, and the @code{check_}
+prefix is introduced. The syntax is now the same as today.
+
address@hidden 1996-03-15 Gordon Matzigkeit starts writing libtool.
+
address@hidden 1996-04-27 Automake 0.32
+
address@hidden targets are introduced; an idea from Dieter Baron.
+
address@hidden files, which were output in the build directory are
+now built in the source directory, because they are distributed. It
+seems these files like to move back and forth as that will happen
+again in future versions.
+
address@hidden 1996-05-18 Automake 0.33
+
+Gord Matzigkeit's main two contributions:
+
address@hidden
address@hidden very preliminary libtool support
address@hidden the distcheck rule
address@hidden itemize
+
+Although they were very basic at this point, these are probably
+among the top features for Automake today.
+
+Jim Meyering also provides the infamous @code{jm_MAINTAINER_MODE}, since
+then renamed to @code{AM_MAINTAINER_MODE} and abandoned by its author
+(@pxref{maintainer-mode, , maintainer-mode, automake, GNU Automake}).
+
address@hidden 1996-05-28 Automake 1.0
+
+After only six months of heavy development, the @command{automake} script is
+3134 lines long, plus 973 lines of @file{Makefile} fragments. The
+package has 30 pages of documentation, and 38 test cases.
address@hidden contains 4 macros.
+
+From now on and until version 1.4, new releases will occur at a rate
+of about one a year. 1.1 did not exist, actually 1.1b to 1.1p have
+been the name of beta releases for 1.2. This is the first time
+Automake uses suffix letters to designate beta releases, a habit that
+lasts.
+
address@hidden 1996-10-10 Kevin Dalley packages Automake 1.0 for Debian
GNU/Linux.
+
address@hidden 1996-11-26 David address@hidden releases Autoconf 2.12.
+
+Between June and October, the Autoconf development is almost stalled.
+Roland McGrath has been working at the beginning of the year. David
+comes back in November to release 2.12, but he won't touch Autoconf
+anymore after this year, and Autoconf then really stagnates. The
+desolate Autoconf @file{ChangeLog} for 1997 lists only 7 commits.
+
address@hidden 1997-02-28 @email{automake@@gnu.ai.mit.edu} list alive
+
+The mailing list is announced as follows:
address@hidden
+I've created the "automake" mailing list. It is
+"automake@@gnu.ai.mit.edu". Administrivia, as always, to
+automake-request@@gnu.ai.mit.edu.
+
+The charter of this list is discussion of automake, autoconf, and
+other configuration/portability tools (e.g., libtool). It is expected
+that discussion will range from pleas for help all the way up to
+patches.
+
+This list is archived on the FSF machines. Offhand I don't know if
+you can get the archive without an account there.
+
+This list is open to anybody who wants to join. Tell all your
+friends!
+-- Tom Tromey
address@hidden smallexample
+
+Before that people were discussing Automake privately, on the Gnits
+mailing list (which is not public either), and less frequently on
address@hidden
+
address@hidden is now @code{gnu.org}, in case you never
+noticed. The archives of the early years of the
address@hidden@@gnu.org} list have been lost, so today it is almost
+impossible to find traces of discussions that occurred before 1999.
+This has been annoying more than once, as such discussions can be
+useful to understand the rationale behind a piece of uncommented code
+that was introduced back then.
+
address@hidden 1997-06-22 Automake 1.2
+
+Automake developments continues, and more and more new Autoconf macros
+are required. Distributing them in @file{aclocal.m4} and requiring
+people to browse this file to extract the relevant macros becomes
+uncomfortable. Ideally, some of them should be contributed to
+Autoconf so that they can be used directly, however Autoconf is
+currently inactive. Automake 1.2 consequently introduces
address@hidden (@command{aclocal} was actually started on
+1996-07-28), a tool that automatically constructs an @file{aclocal.m4}
+file from a repository of third-party macros. Because Autoconf has
+stalled, Automake also becomes a kind of repository for such
+third-party macros, even macros completely unrelated to Automake (for
+instance macros that fix broken Autoconf macros).
+
+The 1.2 release contains 20 macros, including the
address@hidden macro that simplifies the creation of
address@hidden
+
+Libtool is fully supported using @code{*_LTLIBRARIES}.
+
+The missing script is introduced by Fran@,cois Pinard; it is meant
+to be a better solution than @code{AM_MAINTAINER_MODE}
+(@pxref{maintainer-mode, , maintainer-mode, automake, GNU Automake}).
+
+Conditionals support was implemented by Ian Lance Taylor. At the
+time, Tom and Ian were working on an internal project at Cygnus. They
+were using ILU, which is pretty similar to address@hidden They wanted to
+integrate ILU into their build, which was all @file{configure}-based,
+and Ian thought that adding conditionals to @command{automake} was
+simpler than doing all the work in @file{configure} (which was the
+standard at the time). So this was actually funded by Cygnus.
+
+This very useful but tricky feature will take a lot of time to
+stabilize. (At the time this text is written, there are still
+primaries that have not been updated to support conditional
+definitions in Automake 1.9.)
+
+The @command{automake} script has almost doubled: 6089 lines of Perl,
+plus 1294 lines of @file{Makefile} fragments.
+
address@hidden 1997-07-08 Gordon Matzigkeit releases Libtool 1.0.
+
address@hidden 1998-04-05 Automake 1.3
+
+This is a small advance compared to 1.2.
+It adds support for assembly, and preliminary support for Java.
+
+Perl 5.004_04 is out, but fixes to support Perl 4 are still
+regularly submitted whenever Automake breaks it.
+
address@hidden 1998-09-06 @code{sourceware.cygnus.com} is on-line.
+
+Sourceware was setup by Jason Molenda to host open source projects.
+
address@hidden 1998-09-19 Automake CVS repository moved to
@code{sourceware.cygnus.com}
address@hidden 1998-10-26 @code{sourceware.cygnus.com} announces it hosts
Automake:
+Automake is now hosted on @code{sourceware.cygnus.com}. It has a
+publicly accessible CVS repository. This CVS repository is a copy of
+the one Tom was using on his machine, which in turn is based on
+a copy of the CVS repository of David MacKenzie. This is why we still
+have to full source history. (Automake was on Sourceware until 2007-10-29,
+when it moved to a git repository on @code{savannah.gnu.org},
+but the Sourceware host had been renamed to @code{sources.redhat.com}.)
+
+The oldest file in the administrative directory of the CVS repository
+that was created on Sourceware is dated 1998-09-19, while the
+announcement that @command{automake} and @command{autoconf} had joined
address@hidden was made on 1998-10-26. They were among the
+first projects to be hosted there.
+
+The heedful reader will have noticed Automake was exactly 4 years old
+on 1998-09-19.
+
address@hidden 1999-01-05 Ben Elliston releases Autoconf 2.13.
+
address@hidden 1999-01-14 Automake 1.4
+
+This release adds support for Fortran 77 and for the @code{include}
+statement. Also, @samp{+=} assignments are introduced, but it is
+still quite easy to fool Automake when mixing this with conditionals.
+
+These two releases, Automake 1.4 and Autoconf 2.13 make a duo that
+will be used together for years.
+
address@hidden is 7228 lines, plus 1591 lines of Makefile
+fragment, 20 macros (some 1.3 macros were finally contributed back to
+Autoconf), 197 test cases, and 51 pages of documentation.
+
address@hidden 1999-03-27 The @code{user-dep-branch} is created on the CVS
repository.
+
+This implements a new dependency tracking schemed that should be
+able to handle automatic dependency tracking using any compiler (not
+just gcc) and any make (not just GNU @command{make}). In addition,
+the new scheme should be more reliable than the old one, as
+dependencies are generated on the end user's machine. Alexandre Oliva
+creates depcomp for this purpose.
+
address@hidden Tracking Evolution}, for more details about the
+evolution of automatic dependency tracking in Automake.
+
address@hidden 1999-11-21 The @code{user-dep-branch} is merged into the main
trunk.
+
+This was a huge problem since we also had patches going in on the
+trunk. The merge took a long time and was very painful.
+
address@hidden 2000-05-10
+
+Since September 1999 and until 2003, Akim Demaille will be zealously
+revamping Autoconf.
+
address@hidden
+I think the next release should be called "3.0"address@hidden
+Let's face it: you've basically rewritten address@hidden
+Every weekend there are 30 new address@hidden
+I don't see how we could call this "2.15" with a straight address@hidden
+-- Tom Tromey on @email{autoconf@@gnu.org}
address@hidden quotation
+
+Actually Akim works like a submarine: he will pile up patches while he
+works off-line during the weekend, and flush them in batch when he
+resurfaces on Monday.
+
address@hidden 2001-01-24
+
+On this Wednesday, Autoconf 2.49c, the last beta before Autoconf 2.50
+is out, and Akim has to find something to do during his week-end :)
+
address@hidden 2001-01-28
+
+Akim sends a batch of 14 patches to @email{automake@@gnu.org}.
+
address@hidden
+Aiieeee! I was dreading the day that the Demaillator turned his
+sights on address@hidden and now it has arrived! -- Tom Tromey
address@hidden quotation
+
+It's only the beginning: in two months he will send 192 patches. Then
+he would slow down so Tom can catch up and review all this. Initially
+Tom actually read all these patches, then he probably trustingly
+answered OK to most of them, and finally gave up and let Akim apply
+whatever he wanted. There was no way to keep up with that patch rate.
+
address@hidden
+Anyway the patch below won't apply since it predates Akim's
+sourcequake; I have yet to figure where the relevant passage has
+been moved :) -- Alexandre Duret-Lutz
address@hidden quotation
+
+All these patches were sent to and discussed on
address@hidden@@gnu.org}, so subscribed users were literally drowning in
+technical mails. Eventually, the @email{automake-patches@@gnu.org}
+mailing list was created in May.
+
+Year after year, Automake had drifted away from its initial design:
+construct @file{Makefile.in} by assembling various @file{Makefile}
+fragments. In 1.4, lots of @file{Makefile} rules are being emitted at
+various places in the @command{automake} script itself; this does not
+help ensuring a consistent treatment of these rules (for instance
+making sure that user-defined rules override Automake's own rules).
+One of Akim's goal was moving all these hard-coded rules to separate
address@hidden fragments, so the logic could be centralized in a
address@hidden fragment processor.
+
+Another significant contribution of Akim is the interface with the
+``trace'' feature of Autoconf. The way to scan @file{configure.in} at
+this time was to read the file and grep the various macro of interest
+to Automake. Doing so could break in many unexpected ways; @command{automake}
+could miss some definition (for instance @samp{AC_SUBST([$1], [$2])}
+where the arguments are known only when M4 is run), or conversely it
+could detect some macro that was not expanded (because it is called
+conditionally). In the CVS version of Autoconf, Akim had implemented
+the @option{--trace} option, which provides accurate information about
+where macros are actually called and with what arguments. Akim will
+equip Automake with a second @file{configure.in} scanner that uses
+this @option{--trace} interface. Since it was not sensible to drop the
+Autoconf 2.13 compatibility yet, this experimental scanner was only
+used when an environment variable was set, the traditional
+grep-scanner being still the default.
+
address@hidden 2001-04-25 Gary address@hidden releases Libtool 1.4
+
+It has been more than two years since Automake 1.4, CVS Automake has
+suffered lot's of heavy changes and still is not ready for release.
+Libtool 1.4 had to be distributed with a patch against Automake 1.4.
+
address@hidden 2001-05-08 Automake 1.4-p1
address@hidden 2001-05-24 Automake 1.4-p2
+
+Gary address@hidden, the principal Libtool maintainer, makes a ``patch
+release'' of Automake:
+
address@hidden
+The main purpose of this release is to have a stable automake
+which is compatible with the latest stable libtool.
address@hidden quotation
+
+The release also contains obvious fixes for bugs in Automake 1.4,
+some of which were reported almost monthly.
+
address@hidden 2001-05-21 Akim Demaille releases Autoconf 2.50
+
address@hidden 2001-06-07 Automake 1.4-p3
address@hidden 2001-06-10 Automake 1.4-p4
address@hidden 2001-07-15 Automake 1.4-p5
+
+Gary continues his patch-release series. These also add support for
+some new Autoconf 2.50 idioms. Essentially, Autoconf now advocates
address@hidden over @file{configure.in}, and it introduces a new
+syntax for @code{AC_OUTPUT}ing files.
+
address@hidden 2001-08-23 Automake 1.5
+
+A major and long-awaited release, that comes more than two years after
+1.4. It brings many changes, among which:
address@hidden
address@hidden The new dependency tracking scheme that uses @command{depcomp}.
+Aside from the improvement on the dependency tracking itself
+(@pxref{Dependency Tracking Evolution}), this also streamlines the use
+of @command{automake}-generated @file{Makefile.in}s as the @file{Makefile.in}s
+used during development are now the same as those used in
+distributions. Before that the @file{Makefile.in}s generated for
+maintainers required GNU @command{make} and GCC, they were different
+from the portable @file{Makefile} generated for distribution; this was
+causing some confusion.
+
address@hidden Support for per-target compilation flags.
+
address@hidden Support for reference to files in subdirectories in most
address@hidden variables.
+
address@hidden Introduction of the @code{dist_}, @code{nodist_}, and
@code{nobase_}
+prefixes.
address@hidden Perl 4 support is finally dropped.
address@hidden itemize
+
+1.5 did break several packages that worked with 1.4. Enough so that
+Linux distributions could not easily install the new Automake version
+without breaking many of the packages for which they had to run
address@hidden
+
+Some of these breakages were effectively bugs that would eventually be
+fixed in the next release. However, a lot of damage was caused by
+some changes made deliberately to render Automake stricter on some
+setup we did consider bogus. For instance, @samp{make distcheck} was
+improved to check that @samp{make uninstall} did remove all the files
address@hidden install} installed, that @samp{make distclean} did not omit
+some file, and that a VPATH build would work even if the source
+directory was read-only. Similarly, Automake now rejects multiple
+definitions of the same variable (because that would mix very badly
+with conditionals), and @samp{+=} assignments with no previous
+definition. Because these changes all occurred suddenly after 1.4 had
+been established for more than two years, it hurt users.
+
+To make matter worse, meanwhile Autoconf (now at version 2.52) was
+facing similar troubles, for similar reasons.
+
address@hidden 2002-03-05 Automake 1.6
+
+This release introduced versioned installation (@pxref{API Versioning, ,
+API Versioning, automake, GNU Automake}). This was mainly pushed by
+Havoc Pennington, taking the GNOME source tree as motive: due to
+incompatibilities between the autotools it's impossible for the GNOME
+packages to switch to Autoconf 2.53 and Automake 1.5 all at once, so
+they are currently stuck with Autoconf 2.13 and Automake 1.4.
+
+The idea was to call this version @file{automake-1.6}, call all its
+bug-fix versions identically, and switch to @file{automake-1.7} for
+the next release that adds new features or changes some rules. This
+scheme implies maintaining a bug-fix branch in addition to the
+development trunk, which means more work from the maintainer, but
+providing regular bug-fix releases proved to be really worthwhile.
+
+Like 1.5, 1.6 also introduced a bunch of incompatibilities, intentional or
+not. Perhaps the more annoying was the dependence on the newly
+released Autoconf 2.53. Autoconf seemed to have stabilized enough
+since its explosive 2.50 release and included changes required to fix
+some bugs in Automake. In order to upgrade to Automake 1.6, people
+now had to upgrade Autoconf too; for some packages it was no picnic.
+
+While versioned installation helped people to upgrade, it also
+unfortunately allowed people not to upgrade. At the time of writing,
+some Linux distributions are shipping packages for Automake 1.4, 1.5,
+1.6, 1.7, 1.8, and 1.9. Most of these still install 1.4 by default.
+Some distribution also call 1.4 the ``stable'' version, and present
+``1.9'' as the development version; this does not really makes sense
+since 1.9 is way more solid than 1.4. All this does not help the
+newcomer.
+
address@hidden 2002-04-11 Automake 1.6.1
+
+1.6, and the upcoming 1.4-p6 release were the last release by Tom.
+This one and those following will be handled by Alexandre
+Duret-Lutz. Tom is still around, and will be there until about 1.7,
+but his interest into Automake is drifting away towards projects like
address@hidden
+
+Alexandre has been using Automake since 2000, and started to
+contribute mostly on Akim's incitement (Akim and Alexandre have been
+working in the same room from 1999 to 2002). In 2001 and 2002 he had
+a lot of free time to enjoy hacking Automake.
+
address@hidden 2002-06-14 Automake 1.6.2
+
address@hidden 2002-07-28 Automake 1.6.3
address@hidden 2002-07-28 Automake 1.4-p6
+
+Two releases on the same day. 1.6.3 is a bug-fix release.
+
+Tom Tromey backported the versioned installation mechanism on the 1.4
+branch, so that Automake 1.6.x and Automake 1.4-p6 could be installed
+side by side. Another request from the GNOME folks.
+
address@hidden 2002-09-25 Automake 1.7
+
+This release switches to the new @file{configure.ac} scanner Akim
+was experimenting in 1.5.
+
address@hidden 2002-10-16 Automake 1.7.1
address@hidden 2002-12-06 Automake 1.7.2
address@hidden 2003-02-20 Automake 1.7.3
address@hidden 2003-04-23 Automake 1.7.4
address@hidden 2003-05-18 Automake 1.7.5
address@hidden 2003-07-10 Automake 1.7.6
address@hidden 2003-09-07 Automake 1.7.7
address@hidden 2003-10-07 Automake 1.7.8
+
+Many bug-fix releases. 1.7 lasted because the development version
+(upcoming 1.8) was suffering some major internal revamping.
+
address@hidden 2003-10-26 Automake on screen
+
+Episode 49, `Repercussions', in the third season of the `Alias' TV
+show is first aired.
+
+Marshall, one of the characters, is working on a computer virus that he
+has to modify before it gets into the wrong hands or something like
+that. The screenshots you see do not show any program code, they show
+a @file{Makefile.in} generated by automake...
+
address@hidden 2003-11-09 Automake 1.7.9
+
address@hidden 2003-12-10 Automake 1.8
+
+The most striking update is probably that of @command{aclocal}.
+
address@hidden now uses @code{m4_include} in the produced
address@hidden when the included macros are already distributed
+with the package (an idiom used in many packages), which reduces code
+duplication. Many people liked that, but in fact this change was
+really introduced to fix a bug in rebuild rules: @file{Makefile.in}
+must be rebuilt whenever a dependency of @file{configure} changes, but
+all the @file{m4} files included in @file{aclocal.m4} where unknown
+from @command{automake}. Now @command{automake} can just trace the
address@hidden to discover the dependencies.
+
address@hidden also starts using the @option{--trace} Autoconf option
+in order to discover used macros more accurately. This will turn out
+to be very tricky (later releases will improve this) as people had
+devised many ways to cope with the limitation of previous
address@hidden versions, notably using handwritten
address@hidden: @command{aclocal} must make sure not to redefine a
+rule that is already included by such statement.
+
+Automake also has seen its guts rewritten. Although this rewriting
+took a lot of efforts, it is only apparent to the users in that some
+constructions previously disallowed by the implementation now work
+nicely. Conditionals, Locations, Variable and Rule definitions,
+Options: these items on which Automake works have been rewritten as
+separate Perl modules, and documented.
+
address@hidden 2004-01-11 Automake 1.8.1
address@hidden 2004-01-12 Automake 1.8.2
address@hidden 2004-03-07 Automake 1.8.3
address@hidden 2004-04-25 Automake 1.8.4
address@hidden 2004-05-16 Automake 1.8.5
+
address@hidden 2004-07-28 Automake 1.9
+
+This release tries to simplify the compilation rules it outputs to
+reduce the size of the Makefile. The complaint initially come from
+the libgcj developers. Their @file{Makefile.in} generated with
+Automake 1.4 and custom build rules (1.4 did not support compiled
+Java) is address@hidden The one generated by 1.8 was over address@hidden 1.9
gets it
+down to address@hidden
+
+Aside from this it contains mainly minor changes and bug-fixes.
+
address@hidden 2004-08-11 Automake 1.9.1
address@hidden 2004-09-19 Automake 1.9.2
+
+Automake has ten years. This chapter of the manual was initially
+written for this occasion.
+
address@hidden 2007-10-29 Automake repository moves to @code{savannah.gnu.org}
+and uses git as primary repository.
+
address@hidden table
+
address@hidden Dependency Tracking Evolution
address@hidden Evolution of Automatic Dependency Tracking
+
+Over the years Automake has deployed three different dependency
+tracking methods. Each method, including the current one, has had
+flaws of various sorts. Here we lay out the different dependency
+tracking methods, their flaws, and their fixes. We conclude with
+recommendations for tool writers, and by indicating future directions
+for dependency tracking work in Automake.
+
address@hidden
+* First Take on Dependencies:: Precomputed dependency tracking
+* Dependencies As Side Effects:: Update at developer compile time
+* Dependencies for the User:: Update at user compile time
+* Techniques for Dependencies:: Alternative approaches
address@hidden menu
+
address@hidden First Take on Dependencies
address@hidden First Take on Dependency Tracking
address@hidden Description
+
+Our first attempt at automatic dependency tracking was based on the
+method recommended by GNU @command{make}. (@pxref{Automatic
+Prerequisites, , Generating Prerequisites Automatically, make, The GNU
+make Manual})
+
+This version worked by precomputing dependencies ahead of time. For
+each source file, it had a special @file{.P} file that held the
+dependencies. There was a rule to generate a @file{.P} file by
+invoking the compiler appropriately. All such @file{.P} files were
+included by the @file{Makefile}, thus implicitly becoming dependencies
+of @file{Makefile}.
+
address@hidden Bugs
+
+This approach had several critical bugs.
+
address@hidden
address@hidden
+The code to generate the @file{.P} file relied on @command{gcc}.
+(A limitation, not technically a bug.)
address@hidden
+The dependency tracking mechanism itself relied on GNU @command{make}.
+(A limitation, not technically a bug.)
address@hidden
+Because each @file{.P} file was a dependency of @file{Makefile}, this
+meant that dependency tracking was done eagerly by @command{make}.
+For instance, @samp{make clean} would cause all the dependency files
+to be updated, and then immediately removed. This eagerness also
+caused problems with some configurations; if a certain source file
+could not be compiled on a given architecture for some reason,
+dependency tracking would fail, aborting the entire build.
address@hidden
+As dependency tracking was done as a pre-pass, compile times were
+doubled--the compiler had to be run twice per source file.
address@hidden
address@hidden dist} re-ran @command{automake} to generate a
address@hidden that did not have automatic dependency tracking (and
+that was thus portable to any version of @command{make}). In order to
+do this portably, Automake had to scan the dependency files and remove
+any reference that was to a source file not in the distribution.
+This process was error-prone. Also, if @samp{make dist} was run in an
+environment where some object file had a dependency on a source file
+that was only conditionally created, Automake would generate a
address@hidden that referred to a file that might not appear in the
+end user's build. A special, hacky mechanism was required to work
+around this.
address@hidden itemize
+
address@hidden Historical Note
+
+The code generated by Automake is often inspired by the
address@hidden style of a particular author. In the case of the first
+implementation of dependency tracking, I believe the impetus and
+inspiration was Jim Meyering. (I could be mistaken. If you know
+otherwise feel free to correct me.)
+
address@hidden Dependencies As Side Effects
address@hidden Dependencies As Side Effects
address@hidden Description
+
+The next refinement of Automake's automatic dependency tracking scheme
+was to implement dependencies as side effects of the compilation.
+This was aimed at solving the most commonly reported problems with the
+first approach. In particular we were most concerned with eliminating
+the weird rebuilding effect associated with make clean.
+
+In this approach, the @file{.P} files were included using the
address@hidden command, which let us create these files lazily. This
+avoided the @samp{make clean} problem.
+
+We only computed dependencies when a file was actually compiled. This
+avoided the performance penalty associated with scanning each file
+twice. It also let us avoid the other problems associated with the
+first, eager, implementation. For instance, dependencies would never
+be generated for a source file that was not compilable on a given
+architecture (because it in fact would never be compiled).
+
address@hidden Bugs
+
address@hidden
address@hidden
+This approach also relied on the existence of @command{gcc} and GNU
address@hidden (A limitation, not technically a bug.)
address@hidden
+Dependency tracking was still done by the developer, so the problems
+from the first implementation relating to massaging of dependencies by
address@hidden dist} were still in effect.
address@hidden
+This implementation suffered from the ``deleted header file'' problem.
+Suppose a lazily-created @file{.P} file includes a dependency on a
+given header file, like this:
+
address@hidden
+maude.o: maude.c something.h
address@hidden example
+
+Now suppose that you remove @file{something.h} and update @file{maude.c}
+so that this include is no longer needed. If you run @command{make},
+you will get an error because there is no way to create
address@hidden
+
+We fixed this problem in a later release by further massaging the
+output of @command{gcc} to include a dummy dependency for each header
+file.
address@hidden itemize
+
address@hidden Dependencies for the User
address@hidden Dependencies for the User
address@hidden Description
+
+The bugs associated with @samp{make dist}, over time, became a real
+problem. Packages using Automake were being built on a large number
+of platforms, and were becoming increasingly complex. Broken
+dependencies were distributed in ``portable'' @file{Makefile.in}s,
+leading to user complaints. Also, the requirement for @command{gcc}
+and GNU @command{make} was a constant source of bug reports. The next
+implementation of dependency tracking aimed to remove these problems.
+
+We realized that the only truly reliable way to automatically track
+dependencies was to do it when the package itself was built. This
+meant discovering a method portable to any version of make and any
+compiler. Also, we wanted to preserve what we saw as the best point
+of the second implementation: dependency computation as a side effect
+of compilation.
+
+In the end we found that most modern make implementations support some
+form of include directive. Also, we wrote a wrapper script that let
+us abstract away differences between dependency tracking methods for
+compilers. For instance, some compilers cannot generate dependencies
+as a side effect of compilation. In this case we simply have the
+script run the compiler twice. Currently our wrapper script
+(@command{depcomp}) knows about twelve different compilers (including
+a "compiler" that simply invokes @command{makedepend} and then the
+real compiler, which is assumed to be a standard Unix-like C compiler
+with no way to do dependency tracking).
+
address@hidden Bugs
+
address@hidden
address@hidden
+Running a wrapper script for each compilation slows down the build.
address@hidden
+Many users don't really care about precise dependencies.
address@hidden
+This implementation, like every other automatic dependency tracking
+scheme in common use today (indeed, every one we've ever heard of),
+suffers from the ``duplicated new header'' bug.
+
+This bug occurs because dependency tracking tools, such as the
+compiler, only generate dependencies on the successful opening of a
+file, and not on every probe.
+
+Suppose for instance that the compiler searches three directories for
+a given header, and that the header is found in the third directory.
+If the programmer erroneously adds a header file with the same name to
+the first directory, then a clean rebuild from scratch could fail
+(suppose the new header file is buggy), whereas an incremental rebuild
+will succeed.
+
+What has happened here is that people have a misunderstanding of what
+a dependency is. Tool writers think a dependency encodes information
+about which files were read by the compiler. However, a dependency
+must actually encode information about what the compiler tried to do.
+
+This problem is not serious in practice. Programmers typically do not
+use the same name for a header file twice in a given project. (At
+least, not in C or C++. This problem may be more troublesome in
+Java.) This problem is easy to fix, by modifying dependency
+generators to record every probe, instead of every successful open.
+
address@hidden
+Since Automake generates dependencies as a side effect of compilation,
+there is a bootstrapping problem when header files are generated by
+running a program. The problem is that, the first time the build is
+done, there is no way by default to know that the headers are
+required, so make might try to run a compilation for which the headers
+have not yet been built.
+
+This was also a problem in the previous dependency tracking implementation.
+
+The current fix is to use @code{BUILT_SOURCES} to list built headers
+(@pxref{Sources, , Sources, automake, GNU Automake}). This causes them
+to be built before any other build rules are run. This is unsatisfactory
+as a general solution, however in practice it seems sufficient for most
+actual programs.
address@hidden itemize
+
+This code is used since Automake 1.5.
+
+In GCC 3.0, we managed to convince the maintainers to add special
+command-line options to help Automake more efficiently do its job. We
+hoped this would let us avoid the use of a wrapper script when
+Automake's automatic dependency tracking was used with @command{gcc}.
+
+Unfortunately, this code doesn't quite do what we want. In
+particular, it removes the dependency file if the compilation fails;
+we'd prefer that it instead only touch the file in any way if the
+compilation succeeds.
+
+Nevertheless, since Automake 1.7, when a recent @command{gcc} is
+detected at @command{configure} time, we inline the
+dependency-generation code and do not use the @command{depcomp}
+wrapper script. This makes compilations faster for those using this
+compiler (probably our primary user base). The counterpart is that
+because we have to encode two compilation rules in @file{Makefile}
+(with or without @command{depcomp}), the produced @file{Makefile}s are
+larger.
+
address@hidden Techniques for Dependencies
address@hidden Techniques for Computing Dependencies
+
+There are actually several ways for a build tool like Automake to
+cause tools to generate dependencies.
+
address@hidden @asis
address@hidden @command{makedepend}
+This was a commonly-used method in the past. The idea is to run a
+special program over the source and have it generate dependency
+information. Traditional implementations of @command{makedepend} are
+not completely precise; ordinarily they were conservative and
+discovered too many dependencies.
address@hidden The tool
+An obvious way to generate dependencies is to simply write the tool so
+that it can generate the information needed by the build tool. This is
+also the most portable method. Many compilers have an option to
+generate dependencies. Unfortunately, not all tools provide such an
+option.
address@hidden The file system
+It is possible to write a special file system that tracks opens,
+reads, writes, etc, and then feed this information back to the build
+tool. @command{clearmake} does this. This is a very powerful
+technique, as it doesn't require cooperation from the
+tool. Unfortunately it is also very difficult to implement and also
+not practical in the general case.
address@hidden @code{LD_PRELOAD}
+Rather than use the file system, one could write a special library to
+intercept @code{open} and other syscalls. This technique is also quite
+powerful, but unfortunately it is not portable enough for use in
address@hidden
address@hidden table
+
address@hidden
+* Recommendations for Tool Writers::
+* Future Directions for Dependencies::
address@hidden menu
+
address@hidden Recommendations for Tool Writers
address@hidden Recommendations for Tool Writers
+
+We think that every compilation tool ought to be able to generate
+dependencies as a side effect of compilation. Furthermore, at least
+while @command{make}-based tools are nearly universally in use (at
+least in the free software community), the tool itself should generate
+dummy dependencies for header files, to avoid the deleted header file
+bug. Finally, the tool should generate a dependency for each probe,
+instead of each successful file open, in order to avoid the duplicated
+new header bug.
+
address@hidden Future Directions for Dependencies
address@hidden Future Directions for Dependencies
+
+Currently, only languages and compilers understood by Automake can
+have dependency tracking enabled. We would like to see if it is
+practical (and worthwhile) to let this support be extended by the user
+to languages unknown to Automake.
+
address@hidden Releases
address@hidden Release Statistics
+
+The following table (inspired by @samp{perlhist(1)}) quantifies the
+evolution of Automake using these metrics:
+
address@hidden @asis
address@hidden Date, Rel
+The date and version of the release.
address@hidden am
+The number of lines of the @command{automake} script.
address@hidden acl
+The number of lines of the @command{aclocal} script.
address@hidden pm
+The number of lines of the @command{Perl} supporting modules.
address@hidden @file{*.am}
+The number of lines of the @file{Makefile} fragments. The number in
+parentheses is the number of files.
address@hidden m4
+The number of lines (and files) of Autoconf macros.
address@hidden doc
+The number of pages of the documentation (the Postscript version).
address@hidden t
+The number of test cases in the test suite. Of those, the number in
+parentheses is the number of generated test cases.
address@hidden table
+
address@hidden {8888-88-88} {8.8-p8} {8888} {8888} {8888} {8888 (88)} {8888
(88)} {888} {888 (88)}
address@hidden Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am}
@tab m4 @tab doc @tab t
address@hidden 1994-09-19 @tab CVS @tab 141 @tab @tab @tab 299
(24) @tab @tab @tab
address@hidden 1994-11-05 @tab CVS @tab 208 @tab @tab @tab 332
(28) @tab @tab @tab
address@hidden 1995-11-23 @tab 0.20 @tab 533 @tab @tab @tab 458
(35) @tab @tab 9 @tab
address@hidden 1995-11-26 @tab 0.21 @tab 613 @tab @tab @tab 480
(36) @tab @tab 11 @tab
address@hidden 1995-11-28 @tab 0.22 @tab 1116 @tab @tab @tab 539
(38) @tab @tab 12 @tab
address@hidden 1995-11-29 @tab 0.23 @tab 1240 @tab @tab @tab 541
(38) @tab @tab 12 @tab
address@hidden 1995-12-08 @tab 0.24 @tab 1462 @tab @tab @tab 504
(33) @tab @tab 14 @tab
address@hidden 1995-12-10 @tab 0.25 @tab 1513 @tab @tab @tab 511
(37) @tab @tab 15 @tab
address@hidden 1996-01-03 @tab 0.26 @tab 1706 @tab @tab @tab 438
(36) @tab @tab 16 @tab
address@hidden 1996-01-03 @tab 0.27 @tab 1706 @tab @tab @tab 438
(36) @tab @tab 16 @tab
address@hidden 1996-01-13 @tab 0.28 @tab 1964 @tab @tab @tab 934
(33) @tab @tab 16 @tab
address@hidden 1996-02-07 @tab 0.29 @tab 2299 @tab @tab @tab 936
(33) @tab @tab 17 @tab
address@hidden 1996-02-24 @tab 0.30 @tab 2544 @tab @tab @tab 919
(32) @tab 85 (1) @tab 20 @tab 9
address@hidden 1996-03-11 @tab 0.31 @tab 2877 @tab @tab @tab 919
(32) @tab 85 (1) @tab 29 @tab 17
address@hidden 1996-04-27 @tab 0.32 @tab 3058 @tab @tab @tab 921
(31) @tab 85 (1) @tab 30 @tab 26
address@hidden 1996-05-18 @tab 0.33 @tab 3110 @tab @tab @tab 926
(31) @tab 105 (1) @tab 30 @tab 35
address@hidden 1996-05-28 @tab 1.0 @tab 3134 @tab @tab @tab 973
(32) @tab 105 (1) @tab 30 @tab 38
address@hidden 1997-06-22 @tab 1.2 @tab 6089 @tab 385 @tab @tab 1294
(36) @tab 592 (20) @tab 37 @tab 126
address@hidden 1998-04-05 @tab 1.3 @tab 6415 @tab 422 @tab @tab 1470
(39) @tab 741 (23) @tab 39 @tab 156
address@hidden 1999-01-14 @tab 1.4 @tab 7240 @tab 426 @tab @tab 1591
(40) @tab 734 (20) @tab 51 @tab 197
address@hidden 2001-05-08 @tab 1.4-p1 @tab 7251 @tab 426 @tab @tab 1591
(40) @tab 734 (20) @tab 51 @tab 197
address@hidden 2001-05-24 @tab 1.4-p2 @tab 7268 @tab 439 @tab @tab 1591
(40) @tab 734 (20) @tab 49 @tab 197
address@hidden 2001-06-07 @tab 1.4-p3 @tab 7312 @tab 439 @tab @tab 1591
(40) @tab 734 (20) @tab 49 @tab 197
address@hidden 2001-06-10 @tab 1.4-p4 @tab 7321 @tab 439 @tab @tab 1591
(40) @tab 734 (20) @tab 49 @tab 198
address@hidden 2001-07-15 @tab 1.4-p5 @tab 7228 @tab 426 @tab @tab 1596
(40) @tab 734 (20) @tab 51 @tab 198
address@hidden 2001-08-23 @tab 1.5 @tab 8016 @tab 475 @tab 600 @tab 2654
(39) @tab 1166 (29) @tab 63 @tab 327
address@hidden 2002-03-05 @tab 1.6 @tab 8465 @tab 475 @tab 1136 @tab 2732
(39) @tab 1603 (27) @tab 66 @tab 365
address@hidden 2002-04-11 @tab 1.6.1 @tab 8544 @tab 475 @tab 1136 @tab 2741
(39) @tab 1603 (27) @tab 66 @tab 372
address@hidden 2002-06-14 @tab 1.6.2 @tab 8575 @tab 475 @tab 1136 @tab 2800
(39) @tab 1609 (27) @tab 67 @tab 386
address@hidden 2002-07-28 @tab 1.6.3 @tab 8600 @tab 475 @tab 1153 @tab 2809
(39) @tab 1609 (27) @tab 67 @tab 391
address@hidden 2002-07-28 @tab 1.4-p6 @tab 7332 @tab 455 @tab @tab 1596
(40) @tab 735 (20) @tab 49 @tab 197
address@hidden 2002-09-25 @tab 1.7 @tab 9189 @tab 471 @tab 1790 @tab 2965
(39) @tab 1606 (28) @tab 73 @tab 430
address@hidden 2002-10-16 @tab 1.7.1 @tab 9229 @tab 475 @tab 1790 @tab 2977
(39) @tab 1606 (28) @tab 73 @tab 437
address@hidden 2002-12-06 @tab 1.7.2 @tab 9334 @tab 475 @tab 1790 @tab 2988
(39) @tab 1606 (28) @tab 77 @tab 445
address@hidden 2003-02-20 @tab 1.7.3 @tab 9389 @tab 475 @tab 1790 @tab 3023
(39) @tab 1651 (29) @tab 84 @tab 448
address@hidden 2003-04-23 @tab 1.7.4 @tab 9429 @tab 475 @tab 1790 @tab 3031
(39) @tab 1644 (29) @tab 85 @tab 458
address@hidden 2003-05-18 @tab 1.7.5 @tab 9429 @tab 475 @tab 1790 @tab 3033
(39) @tab 1645 (29) @tab 85 @tab 459
address@hidden 2003-07-10 @tab 1.7.6 @tab 9442 @tab 475 @tab 1790 @tab 3033
(39) @tab 1660 (29) @tab 85 @tab 461
address@hidden 2003-09-07 @tab 1.7.7 @tab 9443 @tab 475 @tab 1790 @tab 3041
(39) @tab 1660 (29) @tab 90 @tab 467
address@hidden 2003-10-07 @tab 1.7.8 @tab 9444 @tab 475 @tab 1790 @tab 3041
(39) @tab 1660 (29) @tab 90 @tab 468
address@hidden 2003-11-09 @tab 1.7.9 @tab 9444 @tab 475 @tab 1790 @tab 3048
(39) @tab 1660 (29) @tab 90 @tab 468
address@hidden 2003-12-10 @tab 1.8 @tab 7171 @tab 585 @tab 7730 @tab 3236
(39) @tab 1666 (31) @tab 104 @tab 521
address@hidden 2004-01-11 @tab 1.8.1 @tab 7217 @tab 663 @tab 7726 @tab 3287
(39) @tab 1686 (31) @tab 104 @tab 525
address@hidden 2004-01-12 @tab 1.8.2 @tab 7217 @tab 663 @tab 7726 @tab 3288
(39) @tab 1686 (31) @tab 104 @tab 526
address@hidden 2004-03-07 @tab 1.8.3 @tab 7214 @tab 686 @tab 7735 @tab 3303
(39) @tab 1695 (31) @tab 111 @tab 530
address@hidden 2004-04-25 @tab 1.8.4 @tab 7214 @tab 686 @tab 7736 @tab 3310
(39) @tab 1701 (31) @tab 112 @tab 531
address@hidden 2004-05-16 @tab 1.8.5 @tab 7240 @tab 686 @tab 7736 @tab 3299
(39) @tab 1701 (31) @tab 112 @tab 533
address@hidden 2004-07-28 @tab 1.9 @tab 7508 @tab 715 @tab 7794 @tab 3352
(40) @tab 1812 (32) @tab 115 @tab 551
address@hidden 2004-08-11 @tab 1.9.1 @tab 7512 @tab 715 @tab 7794 @tab 3354
(40) @tab 1812 (32) @tab 115 @tab 552
address@hidden 2004-09-19 @tab 1.9.2 @tab 7512 @tab 715 @tab 7794 @tab 3354
(40) @tab 1812 (32) @tab 132 @tab 554
address@hidden 2004-11-01 @tab 1.9.3 @tab 7507 @tab 718 @tab 7804 @tab 3354
(40) @tab 1812 (32) @tab 134 @tab 556
address@hidden 2004-12-18 @tab 1.9.4 @tab 7508 @tab 718 @tab 7856 @tab 3361
(40) @tab 1811 (32) @tab 140 @tab 560
address@hidden 2005-02-13 @tab 1.9.5 @tab 7523 @tab 719 @tab 7859 @tab 3373
(40) @tab 1453 (32) @tab 142 @tab 562
address@hidden 2005-07-10 @tab 1.9.6 @tab 7539 @tab 699 @tab 7867 @tab 3400
(40) @tab 1453 (32) @tab 144 @tab 570
address@hidden 2006-10-15 @tab 1.10 @tab 7859 @tab 1072 @tab 8024 @tab 3512
(40) @tab 1496 (34) @tab 172 @tab 604
address@hidden 2008-01-19 @tab 1.10.1 @tab 7870 @tab 1089 @tab 8025 @tab 3520
(40) @tab 1499 (34) @tab 173 @tab 617
address@hidden 2008-11-23 @tab 1.10.2 @tab 7882 @tab 1089 @tab 8027 @tab 3540
(40) @tab 1509 (34) @tab 176 @tab 628
address@hidden 2009-05-17 @tab 1.11 @tab 8721 @tab 1092 @tab 8289 @tab 4164
(42) @tab 1714 (37) @tab 181 @tab 732 (20)
address@hidden multitable
+
+
address@hidden ==========================================================
Appendices
+
address@hidden
address@hidden Copying This Manual
address@hidden Copying This Manual
+
address@hidden
+* GNU Free Documentation License:: License for copying this manual
address@hidden menu
+
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden fdl.texi
+
address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index 6861725..ae06ab1 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -23,9 +23,7 @@ This manual is for GNU Automake (version @value{VERSION},
@value{UPDATED}), a program that creates GNU standards-compliant
Makefiles from template files.
-Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-Foundation, Inc.
+Copyright @copyright{} 1995-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -123,7 +121,6 @@ section entitled ``GNU Free Documentation License.''
* API Versioning:: About compatibility between Automake versions
* Upgrading:: Upgrading to a Newer Automake Version
* FAQ:: Frequently Asked Questions
-* History:: Notes about the history of Automake
* Copying This Manual:: How to make copies of this manual
* Indices:: Indices of variables, macros, and concepts
@@ -386,21 +383,6 @@ Frequently Asked Questions about Automake
* Debugging Make Rules:: Strategies when things don't work as expected
* Reporting Bugs:: Feedback on bugs and feature requests
-History of Automake
-
-* Timeline:: The Automake story.
-* Dependency Tracking Evolution:: Evolution of Automatic Dependency Tracking
-* Releases:: Statistics about Automake Releases
-
-Dependency Tracking in Automake
-
-* First Take on Dependencies:: Precomputed dependency tracking
-* Dependencies As Side Effects:: Update at developer compile time
-* Dependencies for the User:: Update at user compile time
-* Techniques for Dependencies:: Alternative approaches
-* Recommendations for Tool Writers:: What tool writers can do to help
-* Future Directions for Dependencies:: Languages Automake does not know
-
Copying This Manual
* GNU Free Documentation License:: License for copying this manual
@@ -1332,8 +1314,9 @@ must be passed to @command{configure} to activate them.
Do not reject slow dependency extractors.
@end table
address@hidden Tracking Evolution}, for some discussion about the
-different dependency tracking schemes used by Automake over the years.
address@hidden Tracking Evolution, , Dependency Tracking Evolution,
+automake-history, Brief History of Automake}, for some discussion about
+the different dependency tracking schemes used by Automake over the years.
@node Nested Packages
@subsection Nested Packages
@@ -6184,12 +6167,16 @@ cause the intermediate file to be named @file{foo.c}
(as opposed to
@file{y.tab.c}, which is more traditional).
The extension of a yacc source file is used to determine the extension
-of the resulting C or C++ file. Files with the extension @file{.y}
-will be turned into @file{.c} files; likewise, @file{.yy} will become
address@hidden; @file{.y++}, @file{c++}; @file{.yxx}, @file{.cxx}; and
address@hidden, @file{.cpp}.
-
-Likewise, lex source files can be used to generate C or C++; the
+of the resulting C or C++ source and header files. Note that header
+files are generated only when the @option{-d} Yacc option is used; see
+below for more information about this flag, and how to specify it.
+Files with the extension @file{.y} will thus be turned into @file{.c}
+sources and @file{.h} headers; likewise, @file{.yy} will become
address@hidden and @file{.hh}, @file{.y++} will become @file{c++} and
address@hidden, @file{.yxx} will become @file{.cxx} and @file{.hxx},
+and @file{.ypp} will become @file{.cpp} and @file{.hpp}.
+
+Similarly, lex source files can be used to generate C or C++; the
extensions @file{.l}, @file{.ll}, @file{.l++}, @file{.lxx}, and
@file{.lpp} are recognized.
@@ -6218,7 +6205,7 @@ adjust its rules to update and distribute the header file
built by
@option{-d} in @code{AM_YFLAGS} only if it is not clustered with other
options; for example, it won't be recognized if @code{AM_YFLAGS} is
@option{-dt}, but it will be if @code{AM_YFLAGS} is @option{-d -t} or
address@hidden -t}}.
address@hidden -d}.}.
What Automake cannot guess, though, is where this
header will be used: it is up to you to ensure the header gets built
before it is first used. Typically this is necessary in order for
@@ -6897,11 +6884,11 @@ your build.
@cindex @command{depcomp}
-Experience with earlier versions of Automake (@pxref{Dependency
-Tracking Evolution}) taught us that it is not reliable to generate
-dependencies only on the maintainer's system, as configurations vary
-too much. So instead Automake implements dependency tracking at build
-time.
+Experience with earlier versions of Automake (@pxref{Dependency Tracking
+Evolution, , Dependency Tracking Evolution, automake-history, Brief History
+of Automake}) taught us that it is not reliable to generate dependencies
+only on the maintainer's system, as configurations vary too much. So
+instead Automake implements dependency tracking at build time.
Automatic dependency tracking can be suppressed by putting
@option{no-dependencies} in the variable @code{AUTOMAKE_OPTIONS}, or
@@ -10353,10 +10340,10 @@ is the name of the program to invoke (by default
@command{ctags});
@code{CTAGSFLAGS} can be used by the user to pass additional flags,
and @code{AM_CTAGSFLAGS} can be used by the @file{Makefile.am}.
address@hidden id
Automake will also generate an @code{ID} rule that will run
@command{mkid} on the source. This is only supported on a
directory-by-directory basis.
address@hidden id
Similarly, the @code{cscope} rule will create a list of all the source
files in the tree and run @command{cscope} to build an inverted index
@@ -10364,7 +10351,11 @@ database. The variable @code{CSCOPE} is the name of
the program to invoke
(by default @command{cscope}); @code{CSCOPEFLAGS} and
@code{CSCOPE_ARGS} can be used by the user to pass additional flags and
file names respectively, while @code{AM_CSCOPEFLAGS} can be used by the
address@hidden
address@hidden Note that, currently, the Automake-provided
address@hidden support, when used in a VPATH build, might not work well
+with non-GNU make implementations (especially with make implementations
+performing @ref{Automatic Rule Rewriting, , VPATH rewrites, autoconf,
+The Autoconf Manual}).
Finally, Automake also emits rules to support the
@uref{http://www.gnu.org/software/global/, GNU Global Tags program}.
@@ -12986,1141 +12977,6 @@ Ideally, post a minimal @file{Makefile.am} and
@file{configure.ac} that
reproduces the problem you encounter. If you have encountered test
suite failures, please attach the @file{tests/test-suite.log} file.
-
address@hidden History
address@hidden History of Automake
-
-This chapter presents various aspects of the history of Automake. The
-exhausted reader can safely skip it; this will be more of interest to
-nostalgic people, or to those curious to learn about the evolution of
-Automake.
-
address@hidden
-* Timeline:: The Automake story.
-* Dependency Tracking Evolution:: Evolution of Automatic Dependency Tracking
-* Releases:: Statistics about Automake Releases
address@hidden menu
-
address@hidden Timeline
address@hidden Timeline
-
address@hidden @asis
address@hidden 1994-09-19 First CVS commit.
-
-If we can trust the CVS repository, David address@hidden (djm) started
-working on Automake (or AutoMake, as it was spelt then) this Monday.
-
-The first version of the @command{automake} script looks as follows.
-
address@hidden
-#!/bin/sh
-
-status=0
-
-for makefile
-do
- if test ! -f address@hidden@}.am; then
- echo "automake: address@hidden@}.am: No such honkin' file"
- status=1
- continue
- fi
-
- exec 4> address@hidden@}.in
-
-done
address@hidden example
-
-From this you can already see that Automake will be about reading
address@hidden file and producing @file{*.in} files. You cannot see
-anything else, but if you also know that David is the one who created
-Autoconf two years before you can guess the rest.
-
-Several commits follow, and by the end of the day Automake is
-reported to work for GNU fileutils and GNU m4.
-
-The modus operandi is the one that is still used today: variable
-assignments in @file{Makefile.am} files trigger injections of
-precanned @file{Makefile} fragments into the generated
address@hidden The use of @file{Makefile} fragments was inspired
-by the 4.4BSD @command{make} and include files, however Automake aims
-to be portable and to conform to the GNU standards for @file{Makefile}
-variables and targets.
-
-At this point, the most recent release of Autoconf is version 1.11,
-and David is preparing to release Autoconf 2.0 in late October. As a
-matter of fact, he will barely touch Automake after September.
-
address@hidden 1994-11-05 David MacKenzie's last commit.
-
-At this point Automake is a 200 line portable shell script, plus 332
-lines of @file{Makefile} fragments. In the @file{README}, David
-states his ambivalence between ``portable shell'' and ``more
-appropriate language'':
-
address@hidden
-I wrote it keeping in mind the possibility of it becoming an Autoconf
-macro, so it would run at configure-time. That would slow
-configuration down a bit, but allow users to modify the Makefile.am
-without needing to fetch the AutoMake package. And, the Makefile.in
-files wouldn't need to be distributed. But all of AutoMake would. So
-I might reimplement AutoMake in Perl, m4, or some other more
-appropriate language.
address@hidden quotation
-
-Automake is described as ``an experimental Makefile generator''.
-There is no documentation. Adventurous users are referred to the
-examples and patches needed to use Automake with GNU m4 1.3, fileutils
-3.9, time 1.6, and development versions of find and indent.
-
-These examples seem to have been lost. However at the time of writing
-(10 years later in September, 2004) the FSF still distributes a
-package that uses this version of Automake: check out GNU termutils
-2.0.
-
address@hidden 1995-11-12 Tom Tromey's first commit.
-
-After one year of inactivity, Tom Tromey takes over the package.
-Tom was working on GNU cpio back then, and doing this just for fun,
-having trouble finding a project to contribute to. So while hacking
-he wanted to bring the @file{Makefile.in} up to GNU standards. This
-was hard, and one day he saw Automake on @url{ftp://alpha.gnu.org/},
-grabbed it and tried it out.
-
-Tom didn't talk to djm about it until later, just to make sure he
-didn't mind if he made a release. He did a bunch of early releases to
-the Gnits folks.
-
-Gnits was (and still is) totally informal, just a few GNU friends who
-Fran@,cois Pinard knew, who were all interested in making a common
-infrastructure for GNU projects, and shared a similar outlook on how
-to do it. So they were able to make some progress. It came along
-with Autoconf and extensions thereof, and then Automake from David and
-Tom (who were both gnitsians). One of their ideas was to write a
-document paralleling the GNU standards, that was more strict in some
-ways and more detailed. They never finished the GNITS standards, but
-the ideas mostly made their way into Automake.
-
address@hidden 1995-11-23 Automake 0.20
-
-Besides introducing automatic dependency tracking (@pxref{Dependency
-Tracking Evolution}), this version also supplies a 9-page manual.
-
-At this time @command{aclocal} and @code{AM_INIT_AUTOMAKE} did not
-exist, so many things had to be done by hand. For instance, here is
-what a configure.in (this is the former name of the
address@hidden we use today) must contain in order to use
-Automake 0.20:
-
address@hidden
-PACKAGE=cpio
-VERSION=2.3.911
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_ARG_PROGRAM
-AC_PROG_INSTALL
address@hidden example
-
-(Today all of the above is achieved by @code{AC_INIT} and
address@hidden)
-
-Here is how programs are specified in @file{Makefile.am}:
-
address@hidden
-PROGRAMS = hello
-hello_SOURCES = hello.c
address@hidden example
-
-This looks pretty much like what we do today, except the
address@hidden variable has no directory prefix specifying where
address@hidden should be installed: all programs are installed in
address@hidden(bindir)}. @code{LIBPROGRAMS} can be used to specify programs
-that must be built but not installed (it is called
address@hidden nowadays).
-
-Programs can be built conditionally using @code{AC_SUBST}itutions:
-
address@hidden
-PROGRAMS = @@progs@@
-AM_PROGRAMS = foo bar baz
address@hidden example
-
-(@code{AM_PROGRAMS} has since then been renamed to
address@hidden)
-
-Similarly scripts, static libraries, and data can be built and installed
-using the @code{LIBRARIES}, @code{SCRIPTS}, and @code{DATA} variables.
-However @code{LIBRARIES} were treated a bit specially in that Automake
-did automatically supply the @file{lib} and @file{.a} prefixes.
-Therefore to build @file{libcpio.a}, one had to write
-
address@hidden
-LIBRARIES = cpio
-cpio_SOURCES = ...
address@hidden example
-
-Extra files to distribute must be listed in @code{DIST_OTHER} (the
-ancestor of @code{EXTRA_DIST}). Also extra directories that are to be
-distributed should appear in @code{DIST_SUBDIRS}, but the manual
-describes this as a temporary ugly hack (today extra directories should
-also be listed in @code{EXTRA_DIST}, and @code{DIST_SUBDIRS} is used
-for another purpose, @pxref{Conditional Subdirectories}).
-
address@hidden 1995-11-26 Automake 0.21
-
-In less time than it takes to cook a frozen pizza, Tom rewrites
-Automake using Perl. At this time Perl 5 is only one year old, and
-Perl 4.036 is in use at many sites. Supporting several Perl versions
-has been a source of problems through the whole history of Automake.
-
-If you never used Perl 4, imagine Perl 5 without objects, without
address@hidden variables (only dynamically scoped @samp{local} variables),
-without function prototypes, with function calls that needs to be
-prefixed with @samp{&}, etc. Traces of this old style can still be
-found in today's @command{automake}.
-
address@hidden 1995-11-28 Automake 0.22
address@hidden 1995-11-29 Automake 0.23
-
-Bug fixes.
-
address@hidden 1995-12-08 Automake 0.24
address@hidden 1995-12-10 Automake 0.25
-
-Releases are raining. 0.24 introduces the uniform naming scheme we
-use today, i.e., @code{bin_PROGRAMS} instead of @code{PROGRAMS},
address@hidden instead of @code{LIBLIBRARIES}, etc. (However
address@hidden does not exist yet, @code{AM_PROGRAMS} is still
-in use; and @code{TEXINFOS} and @code{MANS} still have no directory
-prefixes.) Adding support for prefixes like that was one of the major
-ideas in @command{automake}; it has lasted pretty well.
-
-AutoMake is renamed to Automake (Tom seems to recall it was Fran@,cois
-Pinard's doing).
-
-0.25 fixes a Perl 4 portability bug.
-
address@hidden 1995-12-18 Jim Meyering starts using Automake in GNU Textutils.
address@hidden 1995-12-31 Fran@,cois Pinard starts using Automake in GNU tar.
-
address@hidden 1996-01-03 Automake 0.26
address@hidden 1996-01-03 Automake 0.27
-
-Of the many changes and suggestions sent by Fran@,cois Pinard and
-included in 0.26, perhaps the most important is the advice that to
-ease customization a user rule or variable definition should always
-override an Automake rule or definition.
-
-Gordon Matzigkeit and Jim Meyering are two other early contributors
-that have been sending fixes.
-
-0.27 fixes yet another Perl 4 portability bug.
-
address@hidden 1996-01-13 Automake 0.28
-
-Automake starts scanning @file{configure.in} for @code{LIBOBJS}
-support. This is an important step because until this version
-Automake only knew about the @file{Makefile.am}s it processed.
address@hidden was Autoconf's world and the link between Autoconf
-and Automake had to be done by the @file{Makefile.am} author. For
-instance, if @file{config.h} was generated by @file{configure}, it was the
-package maintainer's responsibility to define the @code{CONFIG_HEADER}
-variable in each @file{Makefile.am}.
-
-Succeeding releases will rely more and more on scanning
address@hidden to better automate the Autoconf integration.
-
-0.28 also introduces the @code{AUTOMAKE_OPTIONS} variable and the
address@hidden and @option{--gnits} options, the latter being stricter.
-
address@hidden 1996-02-07 Automake 0.29
-
-Thanks to @file{configure.in} scanning, @code{CONFIG_HEADER} is gone,
-and rebuild rules for @file{configure}-generated file are
-automatically output.
-
address@hidden and @code{MANS} converted to the uniform naming
-scheme.
-
address@hidden 1996-02-24 Automake 0.30
-
-The test suite is born. It contains 9 tests. From now on test cases
-will be added pretty regularly (@pxref{Releases}), and this proved to
-be really helpful later on.
-
address@hidden finally replaces @code{AM_PROGRAMS}.
-
-All the third-party Autoconf macros, written mostly by Fran@,cois
-Pinard (and later Jim Meyering), are distributed in Automake's
-hand-written @file{aclocal.m4} file. Package maintainers are expected
-to extract the necessary macros from this file. (In previous versions
-you had to copy and paste them from the manual...)
-
address@hidden 1996-03-11 Automake 0.31
-
-The test suite in 0.30 was run via a long @code{check-local} rule. Upon
-Ulrich Drepper's suggestion, 0.31 makes it an Automake rule output
-whenever the @code{TESTS} variable is defined.
-
address@hidden is renamed to @code{EXTRA_DIST}, and the @code{check_}
-prefix is introduced. The syntax is now the same as today.
-
address@hidden 1996-03-15 Gordon Matzigkeit starts writing libtool.
-
address@hidden 1996-04-27 Automake 0.32
-
address@hidden targets are introduced; an idea from Dieter Baron.
-
address@hidden files, which were output in the build directory are
-now built in the source directory, because they are distributed. It
-seems these files like to move back and forth as that will happen
-again in future versions.
-
address@hidden 1996-05-18 Automake 0.33
-
-Gord Matzigkeit's main two contributions:
-
address@hidden
address@hidden very preliminary libtool support
address@hidden the distcheck rule
address@hidden itemize
-
-Although they were very basic at this point, these are probably
-among the top features for Automake today.
-
-Jim Meyering also provides the infamous @code{jm_MAINTAINER_MODE},
-since then renamed to @code{AM_MAINTAINER_MODE} and abandoned by its
-author (@pxref{maintainer-mode}).
-
address@hidden 1996-05-28 Automake 1.0
-
-After only six months of heavy development, the @command{automake} script is
-3134 lines long, plus 973 lines of @file{Makefile} fragments. The
-package has 30 pages of documentation, and 38 test cases.
address@hidden contains 4 macros.
-
-From now on and until version 1.4, new releases will occur at a rate
-of about one a year. 1.1 did not exist, actually 1.1b to 1.1p have
-been the name of beta releases for 1.2. This is the first time
-Automake uses suffix letters to designate beta releases, a habit that
-lasts.
-
address@hidden 1996-10-10 Kevin Dalley packages Automake 1.0 for Debian
GNU/Linux.
-
address@hidden 1996-11-26 David address@hidden releases Autoconf 2.12.
-
-Between June and October, the Autoconf development is almost stalled.
-Roland McGrath has been working at the beginning of the year. David
-comes back in November to release 2.12, but he won't touch Autoconf
-anymore after this year, and Autoconf then really stagnates. The
-desolate Autoconf @file{ChangeLog} for 1997 lists only 7 commits.
-
address@hidden 1997-02-28 @email{automake@@gnu.ai.mit.edu} list alive
-
-The mailing list is announced as follows:
address@hidden
-I've created the "automake" mailing list. It is
-"automake@@gnu.ai.mit.edu". Administrivia, as always, to
-automake-request@@gnu.ai.mit.edu.
-
-The charter of this list is discussion of automake, autoconf, and
-other configuration/portability tools (e.g., libtool). It is expected
-that discussion will range from pleas for help all the way up to
-patches.
-
-This list is archived on the FSF machines. Offhand I don't know if
-you can get the archive without an account there.
-
-This list is open to anybody who wants to join. Tell all your
-friends!
--- Tom Tromey
address@hidden smallexample
-
-Before that people were discussing Automake privately, on the Gnits
-mailing list (which is not public either), and less frequently on
address@hidden
-
address@hidden is now @code{gnu.org}, in case you never
-noticed. The archives of the early years of the
address@hidden@@gnu.org} list have been lost, so today it is almost
-impossible to find traces of discussions that occurred before 1999.
-This has been annoying more than once, as such discussions can be
-useful to understand the rationale behind a piece of uncommented code
-that was introduced back then.
-
address@hidden 1997-06-22 Automake 1.2
-
-Automake developments continues, and more and more new Autoconf macros
-are required. Distributing them in @file{aclocal.m4} and requiring
-people to browse this file to extract the relevant macros becomes
-uncomfortable. Ideally, some of them should be contributed to
-Autoconf so that they can be used directly, however Autoconf is
-currently inactive. Automake 1.2 consequently introduces
address@hidden (@command{aclocal} was actually started on
-1996-07-28), a tool that automatically constructs an @file{aclocal.m4}
-file from a repository of third-party macros. Because Autoconf has
-stalled, Automake also becomes a kind of repository for such
-third-party macros, even macros completely unrelated to Automake (for
-instance macros that fix broken Autoconf macros).
-
-The 1.2 release contains 20 macros, including the
address@hidden macro that simplifies the creation of
address@hidden
-
-Libtool is fully supported using @code{*_LTLIBRARIES}.
-
-The missing script is introduced by Fran@,cois Pinard; it is meant to be
-a better solution than @code{AM_MAINTAINER_MODE}
-(@pxref{maintainer-mode}).
-
-Conditionals support was implemented by Ian Lance Taylor. At the
-time, Tom and Ian were working on an internal project at Cygnus. They
-were using ILU, which is pretty similar to address@hidden They wanted to
-integrate ILU into their build, which was all @file{configure}-based,
-and Ian thought that adding conditionals to @command{automake} was
-simpler than doing all the work in @file{configure} (which was the
-standard at the time). So this was actually funded by Cygnus.
-
-This very useful but tricky feature will take a lot of time to
-stabilize. (At the time this text is written, there are still
-primaries that have not been updated to support conditional
-definitions in Automake 1.9.)
-
-The @command{automake} script has almost doubled: 6089 lines of Perl,
-plus 1294 lines of @file{Makefile} fragments.
-
address@hidden 1997-07-08 Gordon Matzigkeit releases Libtool 1.0.
-
address@hidden 1998-04-05 Automake 1.3
-
-This is a small advance compared to 1.2.
-It adds support for assembly, and preliminary support for Java.
-
-Perl 5.004_04 is out, but fixes to support Perl 4 are still
-regularly submitted whenever Automake breaks it.
-
address@hidden 1998-09-06 @code{sourceware.cygnus.com} is on-line.
-
-Sourceware was setup by Jason Molenda to host open source projects.
-
address@hidden 1998-09-19 Automake CVS repository moved to
@code{sourceware.cygnus.com}
address@hidden 1998-10-26 @code{sourceware.cygnus.com} announces it hosts
Automake:
-Automake is now hosted on @code{sourceware.cygnus.com}. It has a
-publicly accessible CVS repository. This CVS repository is a copy of
-the one Tom was using on his machine, which in turn is based on
-a copy of the CVS repository of David MacKenzie. This is why we still
-have to full source history. (Automake was on Sourceware until 2007-10-29,
-when it moved to a git repository on @code{savannah.gnu.org},
-but the Sourceware host had been renamed to @code{sources.redhat.com}.)
-
-The oldest file in the administrative directory of the CVS repository
-that was created on Sourceware is dated 1998-09-19, while the
-announcement that @command{automake} and @command{autoconf} had joined
address@hidden was made on 1998-10-26. They were among the
-first projects to be hosted there.
-
-The heedful reader will have noticed Automake was exactly 4 years old
-on 1998-09-19.
-
address@hidden 1999-01-05 Ben Elliston releases Autoconf 2.13.
-
address@hidden 1999-01-14 Automake 1.4
-
-This release adds support for Fortran 77 and for the @code{include}
-statement. Also, @samp{+=} assignments are introduced, but it is
-still quite easy to fool Automake when mixing this with conditionals.
-
-These two releases, Automake 1.4 and Autoconf 2.13 make a duo that
-will be used together for years.
-
address@hidden is 7228 lines, plus 1591 lines of Makefile
-fragment, 20 macros (some 1.3 macros were finally contributed back to
-Autoconf), 197 test cases, and 51 pages of documentation.
-
address@hidden 1999-03-27 The @code{user-dep-branch} is created on the CVS
repository.
-
-This implements a new dependency tracking schemed that should be
-able to handle automatic dependency tracking using any compiler (not
-just gcc) and any make (not just GNU @command{make}). In addition,
-the new scheme should be more reliable than the old one, as
-dependencies are generated on the end user's machine. Alexandre Oliva
-creates depcomp for this purpose.
-
address@hidden Tracking Evolution}, for more details about the
-evolution of automatic dependency tracking in Automake.
-
address@hidden 1999-11-21 The @code{user-dep-branch} is merged into the main
trunk.
-
-This was a huge problem since we also had patches going in on the
-trunk. The merge took a long time and was very painful.
-
address@hidden 2000-05-10
-
-Since September 1999 and until 2003, Akim Demaille will be zealously
-revamping Autoconf.
-
address@hidden
-I think the next release should be called "3.0"address@hidden
-Let's face it: you've basically rewritten address@hidden
-Every weekend there are 30 new address@hidden
-I don't see how we could call this "2.15" with a straight address@hidden
--- Tom Tromey on @email{autoconf@@gnu.org}
address@hidden quotation
-
-Actually Akim works like a submarine: he will pile up patches while he
-works off-line during the weekend, and flush them in batch when he
-resurfaces on Monday.
-
address@hidden 2001-01-24
-
-On this Wednesday, Autoconf 2.49c, the last beta before Autoconf 2.50
-is out, and Akim has to find something to do during his week-end :)
-
address@hidden 2001-01-28
-
-Akim sends a batch of 14 patches to @email{automake@@gnu.org}.
-
address@hidden
-Aiieeee! I was dreading the day that the Demaillator turned his
-sights on address@hidden and now it has arrived! -- Tom Tromey
address@hidden quotation
-
-It's only the beginning: in two months he will send 192 patches. Then
-he would slow down so Tom can catch up and review all this. Initially
-Tom actually read all these patches, then he probably trustingly
-answered OK to most of them, and finally gave up and let Akim apply
-whatever he wanted. There was no way to keep up with that patch rate.
-
address@hidden
-Anyway the patch below won't apply since it predates Akim's
-sourcequake; I have yet to figure where the relevant passage has
-been moved :) -- Alexandre Duret-Lutz
address@hidden quotation
-
-All these patches were sent to and discussed on
address@hidden@@gnu.org}, so subscribed users were literally drowning in
-technical mails. Eventually, the @email{automake-patches@@gnu.org}
-mailing list was created in May.
-
-Year after year, Automake had drifted away from its initial design:
-construct @file{Makefile.in} by assembling various @file{Makefile}
-fragments. In 1.4, lots of @file{Makefile} rules are being emitted at
-various places in the @command{automake} script itself; this does not
-help ensuring a consistent treatment of these rules (for instance
-making sure that user-defined rules override Automake's own rules).
-One of Akim's goal was moving all these hard-coded rules to separate
address@hidden fragments, so the logic could be centralized in a
address@hidden fragment processor.
-
-Another significant contribution of Akim is the interface with the
-``trace'' feature of Autoconf. The way to scan @file{configure.in} at
-this time was to read the file and grep the various macro of interest
-to Automake. Doing so could break in many unexpected ways; @command{automake}
-could miss some definition (for instance @samp{AC_SUBST([$1], [$2])}
-where the arguments are known only when M4 is run), or conversely it
-could detect some macro that was not expanded (because it is called
-conditionally). In the CVS version of Autoconf, Akim had implemented
-the @option{--trace} option, which provides accurate information about
-where macros are actually called and with what arguments. Akim will
-equip Automake with a second @file{configure.in} scanner that uses
-this @option{--trace} interface. Since it was not sensible to drop the
-Autoconf 2.13 compatibility yet, this experimental scanner was only
-used when an environment variable was set, the traditional
-grep-scanner being still the default.
-
address@hidden 2001-04-25 Gary address@hidden releases Libtool 1.4
-
-It has been more than two years since Automake 1.4, CVS Automake has
-suffered lot's of heavy changes and still is not ready for release.
-Libtool 1.4 had to be distributed with a patch against Automake 1.4.
-
address@hidden 2001-05-08 Automake 1.4-p1
address@hidden 2001-05-24 Automake 1.4-p2
-
-Gary address@hidden, the principal Libtool maintainer, makes a ``patch
-release'' of Automake:
-
address@hidden
-The main purpose of this release is to have a stable automake
-which is compatible with the latest stable libtool.
address@hidden quotation
-
-The release also contains obvious fixes for bugs in Automake 1.4,
-some of which were reported almost monthly.
-
address@hidden 2001-05-21 Akim Demaille releases Autoconf 2.50
-
address@hidden 2001-06-07 Automake 1.4-p3
address@hidden 2001-06-10 Automake 1.4-p4
address@hidden 2001-07-15 Automake 1.4-p5
-
-Gary continues his patch-release series. These also add support for
-some new Autoconf 2.50 idioms. Essentially, Autoconf now advocates
address@hidden over @file{configure.in}, and it introduces a new
-syntax for @code{AC_OUTPUT}ing files.
-
address@hidden 2001-08-23 Automake 1.5
-
-A major and long-awaited release, that comes more than two years after
-1.4. It brings many changes, among which:
address@hidden
address@hidden The new dependency tracking scheme that uses @command{depcomp}.
-Aside from the improvement on the dependency tracking itself
-(@pxref{Dependency Tracking Evolution}), this also streamlines the use
-of @command{automake}-generated @file{Makefile.in}s as the @file{Makefile.in}s
-used during development are now the same as those used in
-distributions. Before that the @file{Makefile.in}s generated for
-maintainers required GNU @command{make} and GCC, they were different
-from the portable @file{Makefile} generated for distribution; this was
-causing some confusion.
-
address@hidden Support for per-target compilation flags.
-
address@hidden Support for reference to files in subdirectories in most
address@hidden variables.
-
address@hidden Introduction of the @code{dist_}, @code{nodist_}, and
@code{nobase_}
-prefixes.
address@hidden Perl 4 support is finally dropped.
address@hidden itemize
-
-1.5 did break several packages that worked with 1.4. Enough so that
-Linux distributions could not easily install the new Automake version
-without breaking many of the packages for which they had to run
address@hidden
-
-Some of these breakages were effectively bugs that would eventually be
-fixed in the next release. However, a lot of damage was caused by
-some changes made deliberately to render Automake stricter on some
-setup we did consider bogus. For instance, @samp{make distcheck} was
-improved to check that @samp{make uninstall} did remove all the files
address@hidden install} installed, that @samp{make distclean} did not omit
-some file, and that a VPATH build would work even if the source
-directory was read-only. Similarly, Automake now rejects multiple
-definitions of the same variable (because that would mix very badly
-with conditionals), and @samp{+=} assignments with no previous
-definition. Because these changes all occurred suddenly after 1.4 had
-been established for more than two years, it hurt users.
-
-To make matter worse, meanwhile Autoconf (now at version 2.52) was
-facing similar troubles, for similar reasons.
-
address@hidden 2002-03-05 Automake 1.6
-
-This release introduced versioned installation (@pxref{API
-Versioning}). This was mainly pushed by Havoc Pennington, taking the
-GNOME source tree as motive: due to incompatibilities between the
-autotools it's impossible for the GNOME packages to switch to Autoconf
-2.53 and Automake 1.5 all at once, so they are currently stuck with
-Autoconf 2.13 and Automake 1.4.
-
-The idea was to call this version @file{automake-1.6}, call all its
-bug-fix versions identically, and switch to @file{automake-1.7} for
-the next release that adds new features or changes some rules. This
-scheme implies maintaining a bug-fix branch in addition to the
-development trunk, which means more work from the maintainer, but
-providing regular bug-fix releases proved to be really worthwhile.
-
-Like 1.5, 1.6 also introduced a bunch of incompatibilities, intentional or
-not. Perhaps the more annoying was the dependence on the newly
-released Autoconf 2.53. Autoconf seemed to have stabilized enough
-since its explosive 2.50 release and included changes required to fix
-some bugs in Automake. In order to upgrade to Automake 1.6, people
-now had to upgrade Autoconf too; for some packages it was no picnic.
-
-While versioned installation helped people to upgrade, it also
-unfortunately allowed people not to upgrade. At the time of writing,
-some Linux distributions are shipping packages for Automake 1.4, 1.5,
-1.6, 1.7, 1.8, and 1.9. Most of these still install 1.4 by default.
-Some distribution also call 1.4 the ``stable'' version, and present
-``1.9'' as the development version; this does not really makes sense
-since 1.9 is way more solid than 1.4. All this does not help the
-newcomer.
-
address@hidden 2002-04-11 Automake 1.6.1
-
-1.6, and the upcoming 1.4-p6 release were the last release by Tom.
-This one and those following will be handled by Alexandre
-Duret-Lutz. Tom is still around, and will be there until about 1.7,
-but his interest into Automake is drifting away towards projects like
address@hidden
-
-Alexandre has been using Automake since 2000, and started to
-contribute mostly on Akim's incitement (Akim and Alexandre have been
-working in the same room from 1999 to 2002). In 2001 and 2002 he had
-a lot of free time to enjoy hacking Automake.
-
address@hidden 2002-06-14 Automake 1.6.2
-
address@hidden 2002-07-28 Automake 1.6.3
address@hidden 2002-07-28 Automake 1.4-p6
-
-Two releases on the same day. 1.6.3 is a bug-fix release.
-
-Tom Tromey backported the versioned installation mechanism on the 1.4
-branch, so that Automake 1.6.x and Automake 1.4-p6 could be installed
-side by side. Another request from the GNOME folks.
-
address@hidden 2002-09-25 Automake 1.7
-
-This release switches to the new @file{configure.ac} scanner Akim
-was experimenting in 1.5.
-
address@hidden 2002-10-16 Automake 1.7.1
address@hidden 2002-12-06 Automake 1.7.2
address@hidden 2003-02-20 Automake 1.7.3
address@hidden 2003-04-23 Automake 1.7.4
address@hidden 2003-05-18 Automake 1.7.5
address@hidden 2003-07-10 Automake 1.7.6
address@hidden 2003-09-07 Automake 1.7.7
address@hidden 2003-10-07 Automake 1.7.8
-
-Many bug-fix releases. 1.7 lasted because the development version
-(upcoming 1.8) was suffering some major internal revamping.
-
address@hidden 2003-10-26 Automake on screen
-
-Episode 49, `Repercussions', in the third season of the `Alias' TV
-show is first aired.
-
-Marshall, one of the characters, is working on a computer virus that he
-has to modify before it gets into the wrong hands or something like
-that. The screenshots you see do not show any program code, they show
-a @file{Makefile.in} @code{generated by automake}...
-
address@hidden 2003-11-09 Automake 1.7.9
-
address@hidden 2003-12-10 Automake 1.8
-
-The most striking update is probably that of @command{aclocal}.
-
address@hidden now uses @code{m4_include} in the produced
address@hidden when the included macros are already distributed
-with the package (an idiom used in many packages), which reduces code
-duplication. Many people liked that, but in fact this change was
-really introduced to fix a bug in rebuild rules: @file{Makefile.in}
-must be rebuilt whenever a dependency of @file{configure} changes, but
-all the @file{m4} files included in @file{aclocal.m4} where unknown
-from @command{automake}. Now @command{automake} can just trace the
address@hidden to discover the dependencies.
-
address@hidden also starts using the @option{--trace} Autoconf option
-in order to discover used macros more accurately. This will turn out
-to be very tricky (later releases will improve this) as people had
-devised many ways to cope with the limitation of previous
address@hidden versions, notably using handwritten
address@hidden: @command{aclocal} must make sure not to redefine a
-rule that is already included by such statement.
-
-Automake also has seen its guts rewritten. Although this rewriting
-took a lot of efforts, it is only apparent to the users in that some
-constructions previously disallowed by the implementation now work
-nicely. Conditionals, Locations, Variable and Rule definitions,
-Options: these items on which Automake works have been rewritten as
-separate Perl modules, and documented.
-
address@hidden 2004-01-11 Automake 1.8.1
address@hidden 2004-01-12 Automake 1.8.2
address@hidden 2004-03-07 Automake 1.8.3
address@hidden 2004-04-25 Automake 1.8.4
address@hidden 2004-05-16 Automake 1.8.5
-
address@hidden 2004-07-28 Automake 1.9
-
-This release tries to simplify the compilation rules it outputs to
-reduce the size of the Makefile. The complaint initially come from
-the libgcj developers. Their @file{Makefile.in} generated with
-Automake 1.4 and custom build rules (1.4 did not support compiled
-Java) is address@hidden The one generated by 1.8 was over address@hidden 1.9
gets it
-down to address@hidden
-
-Aside from this it contains mainly minor changes and bug-fixes.
-
address@hidden 2004-08-11 Automake 1.9.1
address@hidden 2004-09-19 Automake 1.9.2
-
-Automake has ten years. This chapter of the manual was initially
-written for this occasion.
-
address@hidden 2007-10-29 Automake repository moves to @code{savannah.gnu.org}
and uses
-git as primary repository.
-
address@hidden table
-
address@hidden Dependency Tracking Evolution
address@hidden Dependency Tracking in Automake
-
-Over the years Automake has deployed three different dependency
-tracking methods. Each method, including the current one, has had
-flaws of various sorts. Here we lay out the different dependency
-tracking methods, their flaws, and their fixes. We conclude with
-recommendations for tool writers, and by indicating future directions
-for dependency tracking work in Automake.
-
address@hidden
-* First Take on Dependencies:: Precomputed dependency tracking
-* Dependencies As Side Effects:: Update at developer compile time
-* Dependencies for the User:: Update at user compile time
-* Techniques for Dependencies:: Alternative approaches
-* Recommendations for Tool Writers:: What tool writers can do to help
-* Future Directions for Dependencies:: Languages Automake does not know
address@hidden menu
-
address@hidden First Take on Dependencies
address@hidden First Take on Dependency Tracking
address@hidden Description
-
-Our first attempt at automatic dependency tracking was based on the
-method recommended by GNU @command{make}. (@pxref{Automatic
-Prerequisites, , Generating Prerequisites Automatically, make, The GNU
-make Manual})
-
-This version worked by precomputing dependencies ahead of time. For
-each source file, it had a special @file{.P} file that held the
-dependencies. There was a rule to generate a @file{.P} file by
-invoking the compiler appropriately. All such @file{.P} files were
-included by the @file{Makefile}, thus implicitly becoming dependencies
-of @file{Makefile}.
-
address@hidden Bugs
-
-This approach had several critical bugs.
-
address@hidden
address@hidden
-The code to generate the @file{.P} file relied on @command{gcc}.
-(A limitation, not technically a bug.)
address@hidden
-The dependency tracking mechanism itself relied on GNU @command{make}.
-(A limitation, not technically a bug.)
address@hidden
-Because each @file{.P} file was a dependency of @file{Makefile}, this
-meant that dependency tracking was done eagerly by @command{make}.
-For instance, @samp{make clean} would cause all the dependency files
-to be updated, and then immediately removed. This eagerness also
-caused problems with some configurations; if a certain source file
-could not be compiled on a given architecture for some reason,
-dependency tracking would fail, aborting the entire build.
address@hidden
-As dependency tracking was done as a pre-pass, compile times were
-doubled--the compiler had to be run twice per source file.
address@hidden
address@hidden dist} re-ran @command{automake} to generate a
address@hidden that did not have automatic dependency tracking (and
-that was thus portable to any version of @command{make}). In order to
-do this portably, Automake had to scan the dependency files and remove
-any reference that was to a source file not in the distribution.
-This process was error-prone. Also, if @samp{make dist} was run in an
-environment where some object file had a dependency on a source file
-that was only conditionally created, Automake would generate a
address@hidden that referred to a file that might not appear in the
-end user's build. A special, hacky mechanism was required to work
-around this.
address@hidden itemize
-
address@hidden Historical Note
-
-The code generated by Automake is often inspired by the
address@hidden style of a particular author. In the case of the first
-implementation of dependency tracking, I believe the impetus and
-inspiration was Jim Meyering. (I could be mistaken. If you know
-otherwise feel free to correct me.)
-
address@hidden Dependencies As Side Effects
address@hidden Dependencies As Side Effects
address@hidden Description
-
-The next refinement of Automake's automatic dependency tracking scheme
-was to implement dependencies as side effects of the compilation.
-This was aimed at solving the most commonly reported problems with the
-first approach. In particular we were most concerned with eliminating
-the weird rebuilding effect associated with make clean.
-
-In this approach, the @file{.P} files were included using the
address@hidden command, which let us create these files lazily. This
-avoided the @samp{make clean} problem.
-
-We only computed dependencies when a file was actually compiled. This
-avoided the performance penalty associated with scanning each file
-twice. It also let us avoid the other problems associated with the
-first, eager, implementation. For instance, dependencies would never
-be generated for a source file that was not compilable on a given
-architecture (because it in fact would never be compiled).
-
address@hidden Bugs
-
address@hidden
address@hidden
-This approach also relied on the existence of @command{gcc} and GNU
address@hidden (A limitation, not technically a bug.)
address@hidden
-Dependency tracking was still done by the developer, so the problems
-from the first implementation relating to massaging of dependencies by
address@hidden dist} were still in effect.
address@hidden
-This implementation suffered from the ``deleted header file'' problem.
-Suppose a lazily-created @file{.P} file includes a dependency on a
-given header file, like this:
-
address@hidden
-maude.o: maude.c something.h
address@hidden example
-
-Now suppose that you remove @file{something.h} and update @file{maude.c}
-so that this include is no longer needed. If you run @command{make},
-you will get an error because there is no way to create
address@hidden
-
-We fixed this problem in a later release by further massaging the
-output of @command{gcc} to include a dummy dependency for each header
-file.
address@hidden itemize
-
address@hidden Dependencies for the User
address@hidden Dependencies for the User
address@hidden Description
-
-The bugs associated with @samp{make dist}, over time, became a real
-problem. Packages using Automake were being built on a large number
-of platforms, and were becoming increasingly complex. Broken
-dependencies were distributed in ``portable'' @file{Makefile.in}s,
-leading to user complaints. Also, the requirement for @command{gcc}
-and GNU @command{make} was a constant source of bug reports. The next
-implementation of dependency tracking aimed to remove these problems.
-
-We realized that the only truly reliable way to automatically track
-dependencies was to do it when the package itself was built. This
-meant discovering a method portable to any version of make and any
-compiler. Also, we wanted to preserve what we saw as the best point
-of the second implementation: dependency computation as a side effect
-of compilation.
-
-In the end we found that most modern make implementations support some
-form of include directive. Also, we wrote a wrapper script that let
-us abstract away differences between dependency tracking methods for
-compilers. For instance, some compilers cannot generate dependencies
-as a side effect of compilation. In this case we simply have the
-script run the compiler twice. Currently our wrapper script
-(@command{depcomp}) knows about twelve different compilers (including
-a "compiler" that simply invokes @command{makedepend} and then the
-real compiler, which is assumed to be a standard Unix-like C compiler
-with no way to do dependency tracking).
-
address@hidden Bugs
-
address@hidden
address@hidden
-Running a wrapper script for each compilation slows down the build.
address@hidden
-Many users don't really care about precise dependencies.
address@hidden
-This implementation, like every other automatic dependency tracking
-scheme in common use today (indeed, every one we've ever heard of),
-suffers from the ``duplicated new header'' bug.
-
-This bug occurs because dependency tracking tools, such as the
-compiler, only generate dependencies on the successful opening of a
-file, and not on every probe.
-
-Suppose for instance that the compiler searches three directories for
-a given header, and that the header is found in the third directory.
-If the programmer erroneously adds a header file with the same name to
-the first directory, then a clean rebuild from scratch could fail
-(suppose the new header file is buggy), whereas an incremental rebuild
-will succeed.
-
-What has happened here is that people have a misunderstanding of what
-a dependency is. Tool writers think a dependency encodes information
-about which files were read by the compiler. However, a dependency
-must actually encode information about what the compiler tried to do.
-
-This problem is not serious in practice. Programmers typically do not
-use the same name for a header file twice in a given project. (At
-least, not in C or C++. This problem may be more troublesome in
-Java.) This problem is easy to fix, by modifying dependency
-generators to record every probe, instead of every successful open.
-
address@hidden
-Since Automake generates dependencies as a side effect of compilation,
-there is a bootstrapping problem when header files are generated by
-running a program. The problem is that, the first time the build is
-done, there is no way by default to know that the headers are
-required, so make might try to run a compilation for which the headers
-have not yet been built.
-
-This was also a problem in the previous dependency tracking implementation.
-
-The current fix is to use @code{BUILT_SOURCES} to list built headers
-(@pxref{Sources}). This causes them to be built before any other
-build rules are run. This is unsatisfactory as a general solution,
-however in practice it seems sufficient for most actual programs.
address@hidden itemize
-
-This code is used since Automake 1.5.
-
-In GCC 3.0, we managed to convince the maintainers to add special
-command-line options to help Automake more efficiently do its job. We
-hoped this would let us avoid the use of a wrapper script when
-Automake's automatic dependency tracking was used with @command{gcc}.
-
-Unfortunately, this code doesn't quite do what we want. In
-particular, it removes the dependency file if the compilation fails;
-we'd prefer that it instead only touch the file in any way if the
-compilation succeeds.
-
-Nevertheless, since Automake 1.7, when a recent @command{gcc} is
-detected at @command{configure} time, we inline the
-dependency-generation code and do not use the @command{depcomp}
-wrapper script. This makes compilations faster for those using this
-compiler (probably our primary user base). The counterpart is that
-because we have to encode two compilation rules in @file{Makefile}
-(with or without @command{depcomp}), the produced @file{Makefile}s are
-larger.
-
address@hidden Techniques for Dependencies
address@hidden Techniques for Computing Dependencies
-
-There are actually several ways for a build tool like Automake to
-cause tools to generate dependencies.
-
address@hidden @asis
address@hidden @command{makedepend}
-This was a commonly-used method in the past. The idea is to run a
-special program over the source and have it generate dependency
-information. Traditional implementations of @command{makedepend} are
-not completely precise; ordinarily they were conservative and
-discovered too many dependencies.
address@hidden The tool
-An obvious way to generate dependencies is to simply write the tool so
-that it can generate the information needed by the build tool. This is
-also the most portable method. Many compilers have an option to
-generate dependencies. Unfortunately, not all tools provide such an
-option.
address@hidden The file system
-It is possible to write a special file system that tracks opens,
-reads, writes, etc, and then feed this information back to the build
-tool. @command{clearmake} does this. This is a very powerful
-technique, as it doesn't require cooperation from the
-tool. Unfortunately it is also very difficult to implement and also
-not practical in the general case.
address@hidden @code{LD_PRELOAD}
-Rather than use the file system, one could write a special library to
-intercept @code{open} and other syscalls. This technique is also quite
-powerful, but unfortunately it is not portable enough for use in
address@hidden
address@hidden table
-
address@hidden Recommendations for Tool Writers
address@hidden Recommendations for Tool Writers
-
-We think that every compilation tool ought to be able to generate
-dependencies as a side effect of compilation. Furthermore, at least
-while @command{make}-based tools are nearly universally in use (at
-least in the free software community), the tool itself should generate
-dummy dependencies for header files, to avoid the deleted header file
-bug. Finally, the tool should generate a dependency for each probe,
-instead of each successful file open, in order to avoid the duplicated
-new header bug.
-
address@hidden Future Directions for Dependencies
address@hidden Future Directions for Dependencies
-
-Currently, only languages and compilers understood by Automake can
-have dependency tracking enabled. We would like to see if it is
-practical (and worthwhile) to let this support be extended by the user
-to languages unknown to Automake.
-
address@hidden Releases
address@hidden Release Statistics
-
-The following table (inspired by @samp{perlhist(1)}) quantifies the
-evolution of Automake using these metrics:
-
address@hidden @asis
address@hidden Date, Rel
-The date and version of the release.
address@hidden am
-The number of lines of the @command{automake} script.
address@hidden acl
-The number of lines of the @command{aclocal} script.
address@hidden pm
-The number of lines of the @command{Perl} supporting modules.
address@hidden @file{*.am}
-The number of lines of the @file{Makefile} fragments. The number in
-parentheses is the number of files.
address@hidden m4
-The number of lines (and files) of Autoconf macros.
address@hidden doc
-The number of pages of the documentation (the Postscript version).
address@hidden t
-The number of test cases in the test suite. Of those, the number in
-parentheses is the number of generated test cases.
address@hidden table
-
address@hidden {8888-88-88} {8.8-p8} {8888} {8888} {8888} {8888 (88)} {8888
(88)} {888} {888 (88)}
address@hidden Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am}
@tab m4 @tab doc @tab t
address@hidden 1994-09-19 @tab CVS @tab 141 @tab @tab @tab 299
(24) @tab @tab @tab
address@hidden 1994-11-05 @tab CVS @tab 208 @tab @tab @tab 332
(28) @tab @tab @tab
address@hidden 1995-11-23 @tab 0.20 @tab 533 @tab @tab @tab 458
(35) @tab @tab 9 @tab
address@hidden 1995-11-26 @tab 0.21 @tab 613 @tab @tab @tab 480
(36) @tab @tab 11 @tab
address@hidden 1995-11-28 @tab 0.22 @tab 1116 @tab @tab @tab 539
(38) @tab @tab 12 @tab
address@hidden 1995-11-29 @tab 0.23 @tab 1240 @tab @tab @tab 541
(38) @tab @tab 12 @tab
address@hidden 1995-12-08 @tab 0.24 @tab 1462 @tab @tab @tab 504
(33) @tab @tab 14 @tab
address@hidden 1995-12-10 @tab 0.25 @tab 1513 @tab @tab @tab 511
(37) @tab @tab 15 @tab
address@hidden 1996-01-03 @tab 0.26 @tab 1706 @tab @tab @tab 438
(36) @tab @tab 16 @tab
address@hidden 1996-01-03 @tab 0.27 @tab 1706 @tab @tab @tab 438
(36) @tab @tab 16 @tab
address@hidden 1996-01-13 @tab 0.28 @tab 1964 @tab @tab @tab 934
(33) @tab @tab 16 @tab
address@hidden 1996-02-07 @tab 0.29 @tab 2299 @tab @tab @tab 936
(33) @tab @tab 17 @tab
address@hidden 1996-02-24 @tab 0.30 @tab 2544 @tab @tab @tab 919
(32) @tab 85 (1) @tab 20 @tab 9
address@hidden 1996-03-11 @tab 0.31 @tab 2877 @tab @tab @tab 919
(32) @tab 85 (1) @tab 29 @tab 17
address@hidden 1996-04-27 @tab 0.32 @tab 3058 @tab @tab @tab 921
(31) @tab 85 (1) @tab 30 @tab 26
address@hidden 1996-05-18 @tab 0.33 @tab 3110 @tab @tab @tab 926
(31) @tab 105 (1) @tab 30 @tab 35
address@hidden 1996-05-28 @tab 1.0 @tab 3134 @tab @tab @tab 973
(32) @tab 105 (1) @tab 30 @tab 38
address@hidden 1997-06-22 @tab 1.2 @tab 6089 @tab 385 @tab @tab 1294
(36) @tab 592 (20) @tab 37 @tab 126
address@hidden 1998-04-05 @tab 1.3 @tab 6415 @tab 422 @tab @tab 1470
(39) @tab 741 (23) @tab 39 @tab 156
address@hidden 1999-01-14 @tab 1.4 @tab 7240 @tab 426 @tab @tab 1591
(40) @tab 734 (20) @tab 51 @tab 197
address@hidden 2001-05-08 @tab 1.4-p1 @tab 7251 @tab 426 @tab @tab 1591
(40) @tab 734 (20) @tab 51 @tab 197
address@hidden 2001-05-24 @tab 1.4-p2 @tab 7268 @tab 439 @tab @tab 1591
(40) @tab 734 (20) @tab 49 @tab 197
address@hidden 2001-06-07 @tab 1.4-p3 @tab 7312 @tab 439 @tab @tab 1591
(40) @tab 734 (20) @tab 49 @tab 197
address@hidden 2001-06-10 @tab 1.4-p4 @tab 7321 @tab 439 @tab @tab 1591
(40) @tab 734 (20) @tab 49 @tab 198
address@hidden 2001-07-15 @tab 1.4-p5 @tab 7228 @tab 426 @tab @tab 1596
(40) @tab 734 (20) @tab 51 @tab 198
address@hidden 2001-08-23 @tab 1.5 @tab 8016 @tab 475 @tab 600 @tab 2654
(39) @tab 1166 (29) @tab 63 @tab 327
address@hidden 2002-03-05 @tab 1.6 @tab 8465 @tab 475 @tab 1136 @tab 2732
(39) @tab 1603 (27) @tab 66 @tab 365
address@hidden 2002-04-11 @tab 1.6.1 @tab 8544 @tab 475 @tab 1136 @tab 2741
(39) @tab 1603 (27) @tab 66 @tab 372
address@hidden 2002-06-14 @tab 1.6.2 @tab 8575 @tab 475 @tab 1136 @tab 2800
(39) @tab 1609 (27) @tab 67 @tab 386
address@hidden 2002-07-28 @tab 1.6.3 @tab 8600 @tab 475 @tab 1153 @tab 2809
(39) @tab 1609 (27) @tab 67 @tab 391
address@hidden 2002-07-28 @tab 1.4-p6 @tab 7332 @tab 455 @tab @tab 1596
(40) @tab 735 (20) @tab 49 @tab 197
address@hidden 2002-09-25 @tab 1.7 @tab 9189 @tab 471 @tab 1790 @tab 2965
(39) @tab 1606 (28) @tab 73 @tab 430
address@hidden 2002-10-16 @tab 1.7.1 @tab 9229 @tab 475 @tab 1790 @tab 2977
(39) @tab 1606 (28) @tab 73 @tab 437
address@hidden 2002-12-06 @tab 1.7.2 @tab 9334 @tab 475 @tab 1790 @tab 2988
(39) @tab 1606 (28) @tab 77 @tab 445
address@hidden 2003-02-20 @tab 1.7.3 @tab 9389 @tab 475 @tab 1790 @tab 3023
(39) @tab 1651 (29) @tab 84 @tab 448
address@hidden 2003-04-23 @tab 1.7.4 @tab 9429 @tab 475 @tab 1790 @tab 3031
(39) @tab 1644 (29) @tab 85 @tab 458
address@hidden 2003-05-18 @tab 1.7.5 @tab 9429 @tab 475 @tab 1790 @tab 3033
(39) @tab 1645 (29) @tab 85 @tab 459
address@hidden 2003-07-10 @tab 1.7.6 @tab 9442 @tab 475 @tab 1790 @tab 3033
(39) @tab 1660 (29) @tab 85 @tab 461
address@hidden 2003-09-07 @tab 1.7.7 @tab 9443 @tab 475 @tab 1790 @tab 3041
(39) @tab 1660 (29) @tab 90 @tab 467
address@hidden 2003-10-07 @tab 1.7.8 @tab 9444 @tab 475 @tab 1790 @tab 3041
(39) @tab 1660 (29) @tab 90 @tab 468
address@hidden 2003-11-09 @tab 1.7.9 @tab 9444 @tab 475 @tab 1790 @tab 3048
(39) @tab 1660 (29) @tab 90 @tab 468
address@hidden 2003-12-10 @tab 1.8 @tab 7171 @tab 585 @tab 7730 @tab 3236
(39) @tab 1666 (31) @tab 104 @tab 521
address@hidden 2004-01-11 @tab 1.8.1 @tab 7217 @tab 663 @tab 7726 @tab 3287
(39) @tab 1686 (31) @tab 104 @tab 525
address@hidden 2004-01-12 @tab 1.8.2 @tab 7217 @tab 663 @tab 7726 @tab 3288
(39) @tab 1686 (31) @tab 104 @tab 526
address@hidden 2004-03-07 @tab 1.8.3 @tab 7214 @tab 686 @tab 7735 @tab 3303
(39) @tab 1695 (31) @tab 111 @tab 530
address@hidden 2004-04-25 @tab 1.8.4 @tab 7214 @tab 686 @tab 7736 @tab 3310
(39) @tab 1701 (31) @tab 112 @tab 531
address@hidden 2004-05-16 @tab 1.8.5 @tab 7240 @tab 686 @tab 7736 @tab 3299
(39) @tab 1701 (31) @tab 112 @tab 533
address@hidden 2004-07-28 @tab 1.9 @tab 7508 @tab 715 @tab 7794 @tab 3352
(40) @tab 1812 (32) @tab 115 @tab 551
address@hidden 2004-08-11 @tab 1.9.1 @tab 7512 @tab 715 @tab 7794 @tab 3354
(40) @tab 1812 (32) @tab 115 @tab 552
address@hidden 2004-09-19 @tab 1.9.2 @tab 7512 @tab 715 @tab 7794 @tab 3354
(40) @tab 1812 (32) @tab 132 @tab 554
address@hidden 2004-11-01 @tab 1.9.3 @tab 7507 @tab 718 @tab 7804 @tab 3354
(40) @tab 1812 (32) @tab 134 @tab 556
address@hidden 2004-12-18 @tab 1.9.4 @tab 7508 @tab 718 @tab 7856 @tab 3361
(40) @tab 1811 (32) @tab 140 @tab 560
address@hidden 2005-02-13 @tab 1.9.5 @tab 7523 @tab 719 @tab 7859 @tab 3373
(40) @tab 1453 (32) @tab 142 @tab 562
address@hidden 2005-07-10 @tab 1.9.6 @tab 7539 @tab 699 @tab 7867 @tab 3400
(40) @tab 1453 (32) @tab 144 @tab 570
address@hidden 2006-10-15 @tab 1.10 @tab 7859 @tab 1072 @tab 8024 @tab 3512
(40) @tab 1496 (34) @tab 172 @tab 604
address@hidden 2008-01-19 @tab 1.10.1 @tab 7870 @tab 1089 @tab 8025 @tab 3520
(40) @tab 1499 (34) @tab 173 @tab 617
address@hidden 2008-11-23 @tab 1.10.2 @tab 7882 @tab 1089 @tab 8027 @tab 3540
(40) @tab 1509 (34) @tab 176 @tab 628
address@hidden 2009-05-17 @tab 1.11 @tab 8721 @tab 1092 @tab 8289 @tab 4164
(42) @tab 1714 (37) @tab 181 @tab 732 (20)
address@hidden multitable
-
-
@c ========================================================== Appendices
@page
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 8805f1a..38bfdd2 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -5,7 +5,7 @@
@c hence no sectioning command or @node.
@display
-Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation,
Inc.
+Copyright @copyright{} 2000-2012 Free Software Foundation, Inc.
@uref{http://fsf.org/}
Everyone is permitted to copy and distribute verbatim copies
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 80fb2ac..b389c41 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2002, 2003, 2006, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 06f0443..c7efd90 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2002, 2004, 2006, 2008, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index 5c54b8b..1111f4f 100644
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 1997, 2001, 2002, 2003, 2006, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index b6674dc..24c979c 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -1,5 +1,5 @@
# -*- Perl -*-
-# Copyright (C) 2003, 2004, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# @configure_input@
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index 3574035..84a9b0b 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2005, 2006, 2009, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index ae3abb6..4b305b8 100644
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 2001, 2002, 2003, 2004, 2006 Free Software Foundation,
Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index ba7afc0..b99d6b1 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm
index a9c0be7..0307480 100644
--- a/lib/Automake/General.pm
+++ b/lib/Automake/General.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Item.pm b/lib/Automake/Item.pm
index 687b987..3d8a3f9 100644
--- a/lib/Automake/Item.pm
+++ b/lib/Automake/Item.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm
index 8d94afc..8148df8 100644
--- a/lib/Automake/ItemDef.pm
+++ b/lib/Automake/ItemDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Location.pm b/lib/Automake/Location.pm
index 1dc81dc..ba24ca2 100644
--- a/lib/Automake/Location.pm
+++ b/lib/Automake/Location.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index ac9356a..9e7b6f5 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to create Makefile.in
-# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 75a7392..642f337 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index f0bfcbb..ff81cd4 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2006, 2007, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/RuleDef.pm b/lib/Automake/RuleDef.pm
index 3bd506d..738e377 100644
--- a/lib/Automake/RuleDef.pm
+++ b/lib/Automake/RuleDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Struct.pm b/lib/Automake/Struct.pm
index ae42db2..8394848 100644
--- a/lib/Automake/Struct.pm
+++ b/lib/Automake/Struct.pm
@@ -1,5 +1,5 @@
# autoconf -- create `configure' using m4 macros
-# Copyright (C) 2001, 2002, 2006, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index 033aa05..e51c18d 100644
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index f8e8638..e9c2ed6 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Version.pm b/lib/Automake/Version.pm
index 347f8f6..1f6164f 100644
--- a/lib/Automake/Version.pm
+++ b/lib/Automake/Version.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2002, 2003, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index 59b3e5a..cd898dc 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index b80025d..a6bd0cd 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2001, 2003, 2004, 2006, 2008, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a7c8295..fe8bfa6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,8 +2,7 @@
## Makefile for Automake lib.
-# Copyright (C) 2001, 2003, 2004, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -46,7 +45,7 @@ dist_script_DATA = \
tap-driver.sh \
tap-driver.pl
-EXTRA_DIST = gnupload gitlog-to-changelog
+EXTRA_DIST = gnupload gitlog-to-changelog update-copyright
install-data-hook:
@$(POST_INSTALL)
diff --git a/lib/acinstall b/lib/acinstall
index 2bd0bad..20bdc3a 100755
--- a/lib/acinstall
+++ b/lib/acinstall
@@ -7,7 +7,7 @@
# Usage:
# acinstall file directory installprogram [install-args]...
-# Copyright 1996 Free Software Foundation, Inc.
+# Copyright 1996-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 251df05..ff4771c 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -2,8 +2,7 @@
## Makefile for Automake lib/am.
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2008,
-# 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/am/check.am b/lib/am/check.am
index 8df0c6a..3381389 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-## Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -57,8 +56,8 @@ include inst-vars.am
## (among them, TAP).
# Restructured Text title and section.
-am__rst_title = sed 's/.*/ & /;h;s/./=/g;p;x;p;g;p;s/.*//'
-am__rst_section = sed 'p;s/./=/g;p;g'
+am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+am__rst_section = { sed 'p;s/./=/g;' && echo; }
# Solaris 10 'make', and several other traditional 'make' implementations,
# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
diff --git a/lib/am/check2.am b/lib/am/check2.am
index 9a0fe9d..a14e775 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+## Copyright (C) 2008-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am
index 8edbce3..3f377c8 100644
--- a/lib/am/clean-hdr.am
+++ b/lib/am/clean-hdr.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/clean.am b/lib/am/clean.am
index c85feb1..da46435 100644
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2008
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/compile.am b/lib/am/compile.am
index 98e82e5..7b37da2 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/configure.am b/lib/am/configure.am
index 23ee7b8..efabd5d 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2012
-## Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/data.am b/lib/am/data.am
index 1817447..65ee638 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006,
-## 2007, 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 010504f..eacc399 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2006, 2010
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/depend.am b/lib/am/depend.am
index 3765d71..643c6ab 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2008
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 7a5db63..825ae86 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -1,7 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-## 2003, 2004, 2006, 2008, 2009, 2010, 2012 Free Software Foundation,
-## Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 503bb06..a987283 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-## 2010, 2011, 2012 Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/footer.am b/lib/am/footer.am
index a398093..71ac76b 100644
--- a/lib/am/footer.am
+++ b/lib/am/footer.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 2003 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 1bfc5ae..ee4aa46 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2005,
-## 2006, 2012 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -34,12 +33,14 @@ am__vpath_rewrite = \
## ("make -n") or not. Useful in rules that invoke make recursively, and
## are thus executed also with "make -n" -- because, say, their recipes
## contain the "$(MAKE)" string or starts with the '+' modifier.
+## The case statement has [:] in order to not tickle makefile-deps.test
+## which greps for '^ *:'.
am__make_dryrun = \
{ \
am__dry=no; \
for am__flg in : $(MAKEFLAGS); do \
case $$am__flg in \
- :) ;; \
+ [:]) ;; \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
diff --git a/lib/am/header.am b/lib/am/header.am
index 077a2c9..752af19 100644
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003 Free Software
Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am
index a807f79..b46208e 100644
--- a/lib/am/inst-vars.am
+++ b/lib/am/inst-vars.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc.
+## Copyright (C) 2004-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/install.am b/lib/am/install.am
index 68ce600..4672f49 100644
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010, 2012
-## Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/java.am b/lib/am/java.am
index 464b706..692824e 100644
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998, 1999, 2001, 2003, 2004, 2006, 2008, 2009 Free Software
-## Foundation, Inc.
+## Copyright (C) 1998-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/lang-compile.am b/lib/am/lang-compile.am
index 66adaa1..c2a8fc9 100644
--- a/lib/am/lang-compile.am
+++ b/lib/am/lang-compile.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/lex.am b/lib/am/lex.am
index 8036107..e257d31 100644
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2006, 2009, 2012 Free Software
-## Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/library.am b/lib/am/library.am
index 4045558..686b648 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1999, 2003, 2009, 2010, 2012 Free
-## Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/libs.am b/lib/am/libs.am
index 29f630b..d66473f 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
-## 2007, 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index dc2e199..3681c45 100644
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2005,
-## 2008 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 9df9e23..554574b 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-## 2006, 2007, 2008, 2009, 2010, 2012 Free Software Foundation, Inc.
+## Copyright (C) 1996-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 55e53e1..c25f863 100644
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004,
-## 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index dd958fd..b758880 100644
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 2003, 2005, 2008, 2009, 2010, 2012
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am
index c99de88..5d582d7 100644
--- a/lib/am/mans-vars.am
+++ b/lib/am/mans-vars.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 2001, 2003 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/mans.am b/lib/am/mans.am
index b41a94d..9574f87 100644
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998, 2001, 2003, 2004, 2006, 2008, 2009 Free Software
-## Foundation, Inc.
+## Copyright (C) 1998-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/program.am b/lib/am/program.am
index 42c585e..699afb5 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003, 2005, 2009, 2010,
-## 2012 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/progs.am b/lib/am/progs.am
index d26968a..d26ca2f 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004,
-## 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/python.am b/lib/am/python.am
index 427c95d..9d23275 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1999, 2001, 2003, 2004, 2006, 2007, 2008, 2009, 2011
-## Free Software Foundation, Inc.
+## Copyright (C) 1999-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 1d068bd..6953f66 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004,
-## 2005, 2008, 2009, 2010, 2012 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 346f0d3..29e3e78 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006, 2007,
-## 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 5e6d578..e2cac4d 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003,
-## 2004, 2008, 2009, 2012 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/tags.am b/lib/am/tags.am
index 7fa75c9..55ba36a 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003,
-## 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 5a7bf06..539935f 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
-## 2004, 2005, 2012 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index e6289dd..1a35422 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-## 2003, 2004, 2005, 2008, 2012 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index dc51d8d..43a750a 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -1,7 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-## 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/vala.am b/lib/am/vala.am
index 63aa299..b4d0190 100644
--- a/lib/am/vala.am
+++ b/lib/am/vala.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2008-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index 1551232..e2a5bea 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -1,6 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2009, 2012
-## Free Software Foundation, Inc.
+## Copyright (C) 1998-2012 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -33,15 +32,19 @@
## distributed or not. We cannot have a generic rule that works in
## both cases, so we ensure in automake that nodist_ parsers always
## use non-generic rules.
-if %?MAINTAINER-MODE%
if %?FIRST%
+if %?MAINTAINER-MODE%
@address@hidden = test -f $@ ||
-endif %?FIRST%
endif %?MAINTAINER-MODE%
+## The 's/c$/h/' substitution *must* be the last one.
+am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
+ -e s/c++$$/h++/ -e s/c$$/h/
+endif %?FIRST%
?GENERIC?%EXT%%DERIVED-EXT%:
?!GENERIC?%OBJ%: %SOURCE%
?SUBDIROBJ? %SILENT%test -d $(dir $@) || $(MKDIR_P) $(dir $@)
?GENERIC? %VERBOSE%$(am__skipyacc) \
-?!GENERIC??DIST_SOURCE? %VERBOSE%$(am__skipyacc) \
- $(SHELL) $(YLWRAP) $< y.tab.c %OBJ% y.tab.h %BASE%.h y.output
%BASE%.output -- %COMPILE%
+-?!GENERIC??DIST_SOURCE? %VERBOSE%$(am__skipyacc) \
+ $(SHELL) $(YLWRAP) $< y.tab.c %OBJ% y.tab.h %BASE%.h \
+ `echo %OBJ% | $(am__yacc_c2h)` y.output %BASE%.output -- %COMPILE%
diff --git a/lib/ar-lib b/lib/ar-lib
index c0286a4..c698ac5 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2012-01-30.22; # UTC
-# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
# Written by Peter Rosin <address@hidden>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/compile b/lib/compile
index b1f4749..e8a13ea 100755
--- a/lib/compile
+++ b/lib/compile
@@ -3,8 +3,7 @@
scriptversion=2012-01-04.17; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
# Written by Tom Tromey <address@hidden>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/config.guess b/lib/config.guess
index 49ba16f..d622a44 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-01-01'
+timestamp='2012-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2012-01-01'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -863,6 +861,13 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -1320,6 +1325,9 @@ EOF
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/lib/config.sub b/lib/config.sub
index d6b6b3c..c894da4 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-01-01'
+timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2012-01-01'
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -132,6 +130,10 @@ case $maybe_os in
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -247,6 +249,7 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
| am33_2.0 \
@@ -319,7 +322,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -332,7 +335,10 @@ case $basic_machine in
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -355,6 +361,7 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
diff --git a/lib/depcomp b/lib/depcomp
index 2c30282..089f556 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -3,8 +3,7 @@
scriptversion=2012-02-03.15; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/elisp-comp b/lib/elisp-comp
index 4e9cccd..7766db4 100755
--- a/lib/elisp-comp
+++ b/lib/elisp-comp
@@ -1,6 +1,5 @@
#!/bin/sh
-# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
scriptversion=2010-02-06.18; # UTC
diff --git a/lib/mdate-sh b/lib/mdate-sh
index 3e0858e..4614441 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -3,8 +3,7 @@
scriptversion=2010-08-21.06; # UTC
-# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
# written by Ulrich Drepper <address@hidden>, June 1995
#
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/missing b/lib/missing
index 3f2dfc1..9a55648 100755
--- a/lib/missing
+++ b/lib/missing
@@ -3,8 +3,7 @@
scriptversion=2012-01-06.18; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <address@hidden>, 1996.
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/py-compile b/lib/py-compile
index 15c834c..699e28f 100755
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -3,8 +3,7 @@
scriptversion=2011-06-08.12; # UTC
-# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/tap-driver.pl b/lib/tap-driver.pl
index ecc2c0c..7f420af 100755
--- a/lib/tap-driver.pl
+++ b/lib/tap-driver.pl
@@ -1,5 +1,5 @@
#! /usr/bin/env perl
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
index 725e779..259ca0d 100755
--- a/lib/tap-driver.sh
+++ b/lib/tap-driver.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/test-driver b/lib/test-driver
index b89107c..2398a06 100755
--- a/lib/test-driver
+++ b/lib/test-driver
@@ -3,7 +3,7 @@
scriptversion=2011-08-17.14; # UTC
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index 2abda0f..dcdeb9b 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2012-01-03.09}
+\def\texinfoversion{2012-01-19.16}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2842,8 +2842,8 @@ end
%
\def\outfmtnametex{tex}
%
-\def\inlinefmt#1{\doinlinefmt #1,\finish}
-\def\doinlinefmt#1,#2,\finish{%
+\long\def\inlinefmt#1{\doinlinefmt #1,\finish}
+\long\def\doinlinefmt#1,#2,\finish{%
\def\inlinefmtname{#1}%
\ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
}
@@ -2855,8 +2855,8 @@ end
% well use a command to get a left brace too. We could re-use the
% delimiter character idea from \verb, but it seems like overkill.
%
-\def\inlineraw{\tex \doinlineraw}
-\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
+\long\def\inlineraw{\tex \doinlineraw}
+\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
\def\doinlinerawtwo#1,#2,\finish{%
\def\inlinerawname{#1}%
\ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi
@@ -7802,26 +7802,36 @@ end
\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
\def\ref#1{\xrefX[#1,,,,,,,]}
+%
+\newbox\topbox
+\newbox\printedrefnamebox
+\newbox\printedmanualbox
+%
\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
\unsepspaces
- \def\printedmanual{\ignorespaces #5}%
+ %
\def\printedrefname{\ignorespaces #3}%
- \setbox1=\hbox{\printedmanual\unskip}%
- \setbox0=\hbox{\printedrefname\unskip}%
- \ifdim \wd0 = 0pt
+ \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
+ %
+ \def\printedmanual{\ignorespaces #5}%
+ \setbox\printedmanualbox = \hbox{\printedmanual\unskip}%
+ %
+ % If the printed reference name (arg #3) was not explicitly given in
+ % the @xref, figure out what we want to use.
+ \ifdim \wd\printedrefnamebox = 0pt
% No printed node name was explicitly given.
\expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
- % Use the node name inside the square brackets.
+ % Not auto section-title: use node name inside the square brackets.
\def\printedrefname{\ignorespaces #1}%
\else
- % Use the actual chapter/section title appear inside
- % the square brackets. Use the real section title if we have it.
- \ifdim \wd1 > 0pt
- % It is in another manual, so we don't have it.
+ % Auto section-title: use chapter/section title inside
+ % the square brackets if we have it.
+ \ifdim \wd\printedmanualbox > 0pt
+ % It is in another manual, so we don't have it; use node name.
\def\printedrefname{\ignorespaces #1}%
\else
\ifhavexrefs
- % We know the real title if we have the xref values.
+ % We (should) know the real title if we have the xref values.
\def\printedrefname{\refx{#1-title}{}}%
\else
% Otherwise just copy the Info node name.
@@ -7867,7 +7877,7 @@ end
\iffloat\Xthisreftitle
% If the user specified the print name (third arg) to the ref,
% print it instead of our usual "Figure 1.2".
- \ifdim\wd0 = 0pt
+ \ifdim\wd\printedrefnamebox = 0pt
\refx{#1-snt}{}%
\else
\printedrefname
@@ -7875,21 +7885,46 @@ end
%
% if the user also gave the printed manual name (fifth arg), append
% "in MANUALNAME".
- \ifdim \wd1 > 0pt
+ \ifdim \wd\printedmanualbox > 0pt
\space \putwordin{} \cite{\printedmanual}%
\fi
\else
% node/anchor (non-float) references.
- %
- % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
- % insert empty discretionaries after hyphens, which means that it will
- % not find a line break at a hyphen in a node names. Since some manuals
- % are best written with fairly long node names, containing hyphens, this
- % is a loss. Therefore, we give the text of the node name again, so it
- % is as if TeX is seeing it for the first time.
- \ifdim \wd1 > 0pt
- \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
+ %
+ % If we use \unhbox to print the node names, TeX does not insert
+ % empty discretionaries after hyphens, which means that it will not
+ % find a line break at a hyphen in a node names. Since some manuals
+ % are best written with fairly long node names, containing hyphens,
+ % this is a loss. Therefore, we give the text of the node name
+ % again, so it is as if TeX is seeing it for the first time.
+ %
+ % Cross-manual reference. Only include the "Section ``foo'' in" if
+ % the foo is neither missing or Top. Thus, @xref{,,,foo,The Foo Manual}
+ % outputs simply "see The Foo Manual".
+ \ifdim \wd\printedmanualbox > 0pt
+ % What is the 7sp about? The idea is that we also want to omit
+ % the Section part if we would be printing "Top", since they are
+ % clearly trying to refer to the whole manual. But, this being
+ % TeX, we can't easily compare strings while ignoring the possible
+ % spaces before and after in the input. By adding the arbitrary
+ % 7sp, we make it much less likely that a real node name would
+ % happen to have the same width as "Top" (e.g., in a monospaced font).
+ % I hope it will never happen in practice.
+ %
+ % For the same basic reason, we retypeset the "Top" at every
+ % reference, since the current font is indeterminate.
+ %
+ \setbox\topbox = \hbox{Top\kern7sp}%
+ \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+ \ifdim \wd2 > 7sp
+ \ifdim \wd2 = \wd\topbox \else
+ \putwordSection{} ``\printedrefname'' \putwordin{}\space
+ \fi
+ \fi
+ \cite{\printedmanual}%
\else
+ % Reference in this manual.
+ %
% _ (for example) has to be the character _ for the purposes of the
% control sequence corresponding to the node, but it has to expand
% into the usual \leavevmode...\vrule stuff for purposes of
@@ -7901,7 +7936,7 @@ end
\setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
\ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
}%
- % output the `[mynode]' via a macro so it can be overridden.
+ % output the `[mynode]' via the macro below so it can be overridden.
\xrefprintnodename\printedrefname
%
% But we always want a comma and a space:
diff --git a/lib/update-copyright b/lib/update-copyright
new file mode 100755
index 0000000..082b749
--- /dev/null
+++ b/lib/update-copyright
@@ -0,0 +1,274 @@
+eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
+ & eval 'exec perl -wS -0777 -pi "$0" $argv:q'
+ if 0;
+# Update an FSF copyright year list to include the current year.
+
+my $VERSION = '2012-02-05.21:39'; # UTC
+
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Written by Jim Meyering and Joel E. Denny
+
+# The arguments to this script should be names of files that contain
+# copyright statements to be updated. The copyright holder's name
+# defaults to "Free Software Foundation, Inc." but may be changed to
+# any other name by using the "UPDATE_COPYRIGHT_HOLDER" environment
+# variable.
+#
+# For example, you might wish to use the update-copyright target rule
+# in maint.mk from gnulib's maintainer-makefile module.
+#
+# Iff a copyright statement is recognized in a file and the final
+# year is not the current year, then the statement is updated for the
+# new year and it is reformatted to:
+#
+# 1. Fit within 72 columns.
+# 2. Convert 2-digit years to 4-digit years by prepending "19".
+# 3. Expand copyright year intervals. (See "Environment variables"
+# below.)
+#
+# A warning is printed for every file for which no copyright
+# statement is recognized.
+#
+# Each file's copyright statement must be formatted correctly in
+# order to be recognized. For example, each of these is fine:
+#
+# Copyright @copyright{} 1990-2005, 2007-2009 Free Software
+# Foundation, Inc.
+#
+# # Copyright (C) 1990-2005, 2007-2009 Free Software
+# # Foundation, Inc.
+#
+# /*
+# * Copyright © 90,2005,2007-2009
+# * Free Software Foundation, Inc.
+# */
+#
+# However, the following format is not recognized because the line
+# prefix changes after the first line:
+#
+# ## Copyright (C) 1990-2005, 2007-2009 Free Software
+# # Foundation, Inc.
+#
+# However, any correctly formatted copyright statement following
+# a non-matching copyright statements would be recognized.
+#
+# The exact conditions that a file's copyright statement must meet
+# to be recognized are:
+#
+# 1. It is the first copyright statement that meets all of the
+# following conditions. Subsequent copyright statements are
+# ignored.
+# 2. Its format is "Copyright (C)", then a list of copyright years,
+# and then the name of the copyright holder.
+# 3. The "(C)" takes one of the following forms or is omitted
+# entirely:
+#
+# A. (C)
+# B. (c)
+# C. @copyright{}
+# D. ©
+#
+# 4. The "Copyright" appears at the beginning of a line, except that it
+# may be prefixed by any sequence (e.g., a comment) of no more than
+# 5 characters -- including white space.
+# 5. Iff such a prefix is present, the same prefix appears at the
+# beginning of each remaining line within the FSF copyright
+# statement. There is one exception in order to support C-style
+# comments: if the first line's prefix contains nothing but
+# whitespace surrounding a "/*", then the prefix for all subsequent
+# lines is the same as the first line's prefix except with each of
+# "/" and possibly "*" replaced by a " ". The replacement of "*"
+# by " " is consistent throughout all subsequent lines.
+# 6. Blank lines, even if preceded by the prefix, do not appear
+# within the FSF copyright statement.
+# 7. Each copyright year is 2 or 4 digits, and years are separated by
+# commas or dashes. Whitespace may appear after commas.
+#
+# Environment variables:
+#
+# 1. If UPDATE_COPYRIGHT_FORCE=1, a recognized FSF copyright statement
+# is reformatted even if it does not need updating for the new
+# year. If unset or set to 0, only updated FSF copyright
+# statements are reformatted.
+# 2. If UPDATE_COPYRIGHT_USE_INTERVALS=1, every series of consecutive
+# copyright years (such as 90, 1991, 1992-2007, 2008) in a
+# reformatted FSF copyright statement is collapsed to a single
+# interval (such as 1990-2008). If unset or set to 0, all existing
+# copyright year intervals in a reformatted FSF copyright statement
+# are expanded instead.
+# If UPDATE_COPYRIGHT_USE_INTERVALS=2, convert a sequence with gaps
+# to the minimal containing range. For example, convert
+# 2000, 2004-2007, 2009 to 2000-2009.
+# 3. For testing purposes, you can set the assumed current year in
+# UPDATE_COPYRIGHT_YEAR.
+# 4. The default maximum line length for a copyright line is 72.
+# Set UPDATE_COPYRIGHT_MAX_LINE_LENGTH to use a different length.
+# 5. Set UPDATE_COPYRIGHT_HOLDER if the copyright holder is other
+# than "Free Software Foundation, Inc.".
+
+use strict;
+use warnings;
+
+my $copyright_re = 'Copyright';
+my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)';
+my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
+$holder ||= 'Free Software Foundation, Inc.';
+my $prefix_max = 5;
+my $margin = $ENV{UPDATE_COPYRIGHT_MAX_LINE_LENGTH};
+!$margin || $margin !~ m/^\d+$/
+ and $margin = 72;
+
+my $tab_width = 8;
+
+my $this_year = $ENV{UPDATE_COPYRIGHT_YEAR};
+if (!$this_year || $this_year !~ m/^\d{4}$/)
+ {
+ my ($sec, $min, $hour, $mday, $month, $year) = localtime (time ());
+ $this_year = $year + 1900;
+ }
+
+# Unless the file consistently uses "\r\n" as the EOL, use "\n" instead.
+my $eol = /(?:^|[^\r])\n/ ? "\n" : "\r\n";
+
+my $leading;
+my $prefix;
+my $ws_re;
+my $stmt_re;
+while (/(^|\n)(.{0,$prefix_max})$copyright_re/g)
+ {
+ $leading = "$1$2";
+ $prefix = $2;
+ if ($prefix =~ /^(\s*\/)\*(\s*)$/)
+ {
+ $prefix =~ s,/, ,;
+ my $prefix_ws = $prefix;
+ $prefix_ws =~ s/\*/ /; # Only whitespace.
+ if (/\G(?:[^*\n]|\*[^\/\n])*\*?\n$prefix_ws/)
+ {
+ $prefix = $prefix_ws;
+ }
+ }
+ $ws_re = '[ \t\r\f]'; # \s without \n
+ $ws_re =
+ "(?:$ws_re*(?:$ws_re|\\n" . quotemeta($prefix) . ")$ws_re*)";
+ my $holder_re = $holder;
+ $holder_re =~ s/\s/$ws_re/g;
+ my $stmt_remainder_re =
+ "(?:$ws_re$circle_c_re)?"
+ . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|-))*"
+ . "((?:\\d\\d)?\\d\\d)$ws_re$holder_re";
+ if (/\G$stmt_remainder_re/)
+ {
+ $stmt_re =
+ quotemeta($leading) . "($copyright_re$stmt_remainder_re)";
+ last;
+ }
+ }
+if (defined $stmt_re)
+ {
+ /$stmt_re/ or die; # Should never die.
+ my $stmt = $1;
+ my $final_year_orig = $2;
+
+ # Handle two-digit year numbers like "98" and "99".
+ my $final_year = $final_year_orig;
+ $final_year <= 99
+ and $final_year += 1900;
+
+ if ($final_year != $this_year)
+ {
+ # Update the year.
+ $stmt =~ s/$final_year_orig/$final_year, $this_year/;
+ }
+ if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'})
+ {
+ # Normalize all whitespace including newline-prefix sequences.
+ $stmt =~ s/$ws_re/ /g;
+
+ # Put spaces after commas.
+ $stmt =~ s/, ?/, /g;
+
+ # Convert 2-digit to 4-digit years.
+ $stmt =~ s/(\b\d\d\b)/19$1/g;
+
+ # Make the use of intervals consistent.
+ if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS})
+ {
+ $stmt =~ s/(\d{4})-(\d{4})/join(', ', $1..$2)/eg;
+ }
+ else
+ {
+ $stmt =~
+ s/
+ (\d{4})
+ (?:
+ (,\ |-)
+ ((??{
+ if ($2 eq '-') { '\d{4}'; }
+ elsif (!$3) { $1 + 1; }
+ else { $3 + 1; }
+ }))
+ )+
+ /$1-$3/gx;
+
+ # When it's 2, emit a single range encompassing all year numbers.
+ $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2
+ and $stmt =~ s/\b(\d{4})\b.*\b(\d{4})\b/$1-$2/;
+ }
+
+ # Format within margin.
+ my $stmt_wrapped;
+ my $text_margin = $margin - length($prefix);
+ if ($prefix =~ /^(\t+)/)
+ {
+ $text_margin -= length($1) * ($tab_width - 1);
+ }
+ while (length $stmt)
+ {
+ if (($stmt =~ s/^(.{1,$text_margin})(?: |$)//)
+ || ($stmt =~ s/^([\S]+)(?: |$)//))
+ {
+ my $line = $1;
+ $stmt_wrapped .= $stmt_wrapped ? "$eol$prefix" : $leading;
+ $stmt_wrapped .= $line;
+ }
+ else
+ {
+ # Should be unreachable, but we don't want an infinite
+ # loop if it can be reached.
+ die;
+ }
+ }
+
+ # Replace the old copyright statement.
+ s/$stmt_re/$stmt_wrapped/;
+ }
+ }
+else
+ {
+ print STDERR "$ARGV: warning: copyright statement not found\n";
+ }
+
+# Local variables:
+# mode: perl
+# indent-tabs-mode: nil
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "my $VERSION = '"
+# time-stamp-format: "%:y-%02m-%02d.%02H:%02M"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "'; # UTC"
+# End:
diff --git a/lib/ylwrap b/lib/ylwrap
index a8a08fd..36543da 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -3,8 +3,7 @@
scriptversion=2011-08-25.18; # UTC
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# Written by Tom Tromey <address@hidden>.
#
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 0e8788c..c3a48a4 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -2,8 +2,7 @@
## Makefile for Automake m4.
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
-# 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/m4/amversion.in b/m4/amversion.in
index cab5a3e..e44ace1 100644
--- a/m4/amversion.in
+++ b/m4/amversion.in
@@ -1,7 +1,6 @@
## -*- Autoconf -*-
## @configure_input@
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 79aefb9..f71d65a 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -1,7 +1,6 @@
## -*- Autoconf -*-
## Generated from amversion.in; do not edit by hand.
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/ar-lib.m4 b/m4/ar-lib.m4
index e45c558..470def4 100644
--- a/m4/ar-lib.m4
+++ b/m4/ar-lib.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/as.m4 b/m4/as.m4
index cc8bf47..fa6d3c8 100644
--- a/m4/as.m4
+++ b/m4/as.m4
@@ -1,6 +1,6 @@
# Figure out how to run the assembler. -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/auxdir.m4 b/m4/auxdir.m4
index 4b810b0..50527c4 100644
--- a/m4/auxdir.m4
+++ b/m4/auxdir.m4
@@ -1,6 +1,6 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/ccstdc.m4 b/m4/ccstdc.m4
index ec1541e..9a7a900 100644
--- a/m4/ccstdc.m4
+++ b/m4/ccstdc.m4
@@ -3,8 +3,7 @@
## From Franc,ois Pinard ##
## ----------------------------------------- ##
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/cond-if.m4 b/m4/cond-if.m4
index 3a25e32..80e687b 100644
--- a/m4/cond-if.m4
+++ b/m4/cond-if.m4
@@ -1,6 +1,6 @@
# AM_COND_IF -*- Autoconf -*-
-# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/cond.m4 b/m4/cond.m4
index 7fa5dfd..03644ab 100644
--- a/m4/cond.m4
+++ b/m4/cond.m4
@@ -1,7 +1,6 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008, 2011
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/depend.m4 b/m4/depend.m4
index a5ca9be..1967d41 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -1,6 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4
index 82743fd..be1a5b3 100644
--- a/m4/dmalloc.m4
+++ b/m4/dmalloc.m4
@@ -3,8 +3,7 @@
## From Franc,ois Pinard ##
## ----------------------------------- ##
-# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2010,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gcj.m4 b/m4/gcj.m4
index 76241bc..e7cdd69 100644
--- a/m4/gcj.m4
+++ b/m4/gcj.m4
@@ -1,8 +1,7 @@
# Check for Java compiler. -*- Autoconf -*-
# For now we only handle the GNU compiler.
-# Copyright (C) 1999, 2000, 2003, 2005, 2009, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/header.m4 b/m4/header.m4
index c328ceb..2555b96 100644
--- a/m4/header.m4
+++ b/m4/header.m4
@@ -1,6 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/init.m4 b/m4/init.m4
index 492e531..ec15529 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -1,7 +1,6 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/install-sh.m4 b/m4/install-sh.m4
index 60f1732..8061e7e 100644
--- a/m4/install-sh.m4
+++ b/m4/install-sh.m4
@@ -1,6 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/lead-dot.m4 b/m4/lead-dot.m4
index d83bfa0..8a86805 100644
--- a/m4/lead-dot.m4
+++ b/m4/lead-dot.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/lex.m4 b/m4/lex.m4
index 5012926..4cda8a9 100644
--- a/m4/lex.m4
+++ b/m4/lex.m4
@@ -1,7 +1,6 @@
## Replacement for AC_PROG_LEX. -*- Autoconf -*-
## by Alexandre Oliva <address@hidden>
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index bc1c831..2dd6a0f 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -3,8 +3,7 @@
## From Ulrich Drepper
## Almost entirely rewritten by Alexandre Oliva
## ------------------------
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/maintainer.m4 b/m4/maintainer.m4
index b8f02bd..f342edf 100644
--- a/m4/maintainer.m4
+++ b/m4/maintainer.m4
@@ -1,8 +1,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/minuso.m4 b/m4/minuso.m4
index d8b1620..7787ddf 100644
--- a/m4/minuso.m4
+++ b/m4/minuso.m4
@@ -1,6 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/missing.m4 b/m4/missing.m4
index 136399c..e8ff176 100644
--- a/m4/missing.m4
+++ b/m4/missing.m4
@@ -1,7 +1,6 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4
index 152d7fb..6265bb0 100644
--- a/m4/mkdirp.m4
+++ b/m4/mkdirp.m4
@@ -1,6 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/obsol-gt.m4 b/m4/obsol-gt.m4
index d380c6d..bd2400d 100644
--- a/m4/obsol-gt.m4
+++ b/m4/obsol-gt.m4
@@ -1,6 +1,6 @@
# Support for obsolete Gettext macro. -*- Autoconf -*-
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/obsol-lt.m4 b/m4/obsol-lt.m4
index 12c4d7d..af8fb1b 100644
--- a/m4/obsol-lt.m4
+++ b/m4/obsol-lt.m4
@@ -1,6 +1,6 @@
# Support for obsolete Libtool macro. -*- Autoconf -*-
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/obsolete.m4 b/m4/obsolete.m4
index bad1db7..9a26cac 100644
--- a/m4/obsolete.m4
+++ b/m4/obsolete.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/options.m4 b/m4/options.m4
index efdc49d..76ad642 100644
--- a/m4/options.m4
+++ b/m4/options.m4
@@ -1,7 +1,6 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/protos.m4 b/m4/protos.m4
index 32a5616..942154b 100644
--- a/m4/protos.m4
+++ b/m4/protos.m4
@@ -1,8 +1,7 @@
# -*- Autoconf -*-
# Obsolete (and now removed) automatic de-ANSI-fiction support.
#
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006, 2011
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/python.m4 b/m4/python.m4
index bcdb694..3548886 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -3,8 +3,7 @@
## From Andrew Dalke
## Updated by James Henstridge
## ------------------------
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/runlog.m4 b/m4/runlog.m4
index 0bfd30d..6d127a8 100644
--- a/m4/runlog.m4
+++ b/m4/runlog.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/sanity.m4 b/m4/sanity.m4
index b718ac4..bbd5fb5 100644
--- a/m4/sanity.m4
+++ b/m4/sanity.m4
@@ -1,7 +1,6 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/silent.m4 b/m4/silent.m4
index f8d0b5a..24c5724 100644
--- a/m4/silent.m4
+++ b/m4/silent.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/strip.m4 b/m4/strip.m4
index e73f607..7dfeb00 100644
--- a/m4/strip.m4
+++ b/m4/strip.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/substnot.m4 b/m4/substnot.m4
index a4cbdf5..64d91ff 100644
--- a/m4/substnot.m4
+++ b/m4/substnot.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/tar.m4 b/m4/tar.m4
index 0683951..066d465 100644
--- a/m4/tar.m4
+++ b/m4/tar.m4
@@ -1,6 +1,6 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/upc.m4 b/m4/upc.m4
index 23a8c0b..9ba1025 100644
--- a/m4/upc.m4
+++ b/m4/upc.m4
@@ -1,6 +1,6 @@
# Find a compiler for Unified Parallel C. -*- Autoconf -*-
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/vala.m4 b/m4/vala.m4
index d95734a..89a4ae9 100644
--- a/m4/vala.m4
+++ b/m4/vala.m4
@@ -1,6 +1,6 @@
# Autoconf support for the Vala compiler
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/tests/ChangeLog-old b/tests/ChangeLog-old
index d76ca2b..8464944 100644
--- a/tests/ChangeLog-old
+++ b/tests/ChangeLog-old
@@ -1439,3 +1439,10 @@ Sat Feb 10 17:08:39 1996 Tom Tromey <address@hidden>
* mdate.test, vtexi.test, acoutput.test: New files.
* Started.
+
+-----
+
+Copyright 2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
diff --git a/tests/CheckListOfTests.am b/tests/CheckListOfTests.am
index 3fa51d3..ecd777c 100644
--- a/tests/CheckListOfTests.am
+++ b/tests/CheckListOfTests.am
@@ -1,6 +1,6 @@
## -*- Automake -*-
##
-## Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+## Copyright (C) 2011-2012 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/tests/Makefile.am b/tests/Makefile.am
index becef59..5f72e25 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,6 @@
## Process this file with automake to create Makefile.in
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -36,6 +34,8 @@ TESTS = ## Will be updated later.
XFAIL_TESTS = \
all.test \
+yacc-bison-skeleton-cxx.test \
+yacc-bison-skeleton.test \
cond17.test \
gcj6.test \
interp3.test \
@@ -151,6 +151,8 @@ do_subst = sed \
-e 's|@address@hidden|$(GNU_CXXFLAGS)|g' \
-e 's|@address@hidden|$(GNU_FFLAGS)|g' \
-e 's|@address@hidden|$(GNU_FCFLAGS)|g' \
+ -e 's|@address@hidden|$(YACC)|g' \
+ -e 's|@address@hidden|$(LEX)|g' \
-e 's|@address@hidden|$(TEX)|g' \
-e 's|@address@hidden|$(MODIFICATION_DELAY)|g' \
-e 's|@address@hidden|$(am_AUTOCONF)|g' \
diff --git a/tests/ac-output-old.tap b/tests/ac-output-old.tap
index 5eeb672..7518dd1 100755
--- a/tests/ac-output-old.tap
+++ b/tests/ac-output-old.tap
@@ -1,6 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca10.test b/tests/acloca10.test
index c7cdf78..7e1570d 100755
--- a/tests/acloca10.test
+++ b/tests/acloca10.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2005, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca11.test b/tests/acloca11.test
index 7ce0a4d..210da36 100755
--- a/tests/acloca11.test
+++ b/tests/acloca11.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca12.test b/tests/acloca12.test
index 4e4f30f..07a1b54 100755
--- a/tests/acloca12.test
+++ b/tests/acloca12.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca13.test b/tests/acloca13.test
index 77b43fe..940573d 100755
--- a/tests/acloca13.test
+++ b/tests/acloca13.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca14.test b/tests/acloca14.test
index d919aab..3b0b5de 100755
--- a/tests/acloca14.test
+++ b/tests/acloca14.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca15.test b/tests/acloca15.test
index b1f3723..988bb0c 100755
--- a/tests/acloca15.test
+++ b/tests/acloca15.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ am_create_testdir=empty
# cannot find them.
cat > configure.in << 'END'
+AC_INIT
m4_include([somedef.m4])
AC_DEFUN([AM_SOME_MACRO])
AC_DEFUN([AM_SOME_OTHER_MACRO])
@@ -42,3 +43,5 @@ $FGREP AM_SOME_MACRO aclocal.m4 && Exit 1
$FGREP AM_MORE_MACRO aclocal.m4 && Exit 1
$FGREP 'm4_include([m4/more.m4])' aclocal.m4
test 1 = `grep m4_include aclocal.m4 | wc -l`
+
+:
diff --git a/tests/acloca16.test b/tests/acloca16.test
index 1d897ed..03955e8 100755
--- a/tests/acloca16.test
+++ b/tests/acloca16.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca17.test b/tests/acloca17.test
index 282dc7e..49a47a3 100755
--- a/tests/acloca17.test
+++ b/tests/acloca17.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca18.test b/tests/acloca18.test
index a26ef38..8155882 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2008, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca19.test b/tests/acloca19.test
index 10bae6b..c00dc56 100755
--- a/tests/acloca19.test
+++ b/tests/acloca19.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca20.test b/tests/acloca20.test
index 4516d69..d2247e4 100755
--- a/tests/acloca20.test
+++ b/tests/acloca20.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca21.test b/tests/acloca21.test
index 716cd80..c4ccc5d 100755
--- a/tests/acloca21.test
+++ b/tests/acloca21.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca22.test b/tests/acloca22.test
index cf16627..62a1595 100755
--- a/tests/acloca22.test
+++ b/tests/acloca22.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acloca23.test b/tests/acloca23.test
index f4f8a22..633509d 100755
--- a/tests/acloca23.test
+++ b/tests/acloca23.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal-acdir.test b/tests/aclocal-acdir.test
index 42f8b45..f36ce0e 100755
--- a/tests/aclocal-acdir.test
+++ b/tests/aclocal-acdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal-install-absdir.test
b/tests/aclocal-install-absdir.test
index 64d9b62..a41e8e8 100755
--- a/tests/aclocal-install-absdir.test
+++ b/tests/aclocal-install-absdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal-path-install-serial.test
b/tests/aclocal-path-install-serial.test
index ca01174..529f898 100755
--- a/tests/aclocal-path-install-serial.test
+++ b/tests/aclocal-path-install-serial.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal-path-install.test b/tests/aclocal-path-install.test
index a07d5ab..34124e6 100755
--- a/tests/aclocal-path-install.test
+++ b/tests/aclocal-path-install.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal-path-nonexistent.test
b/tests/aclocal-path-nonexistent.test
index 0be9938..6065bad 100755
--- a/tests/aclocal-path-nonexistent.test
+++ b/tests/aclocal-path-nonexistent.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal-path-precedence.test
b/tests/aclocal-path-precedence.test
index a9c864b..178f7c3 100755
--- a/tests/aclocal-path-precedence.test
+++ b/tests/aclocal-path-precedence.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal-path.test b/tests/aclocal-path.test
index 42c6820..e22eea1 100755
--- a/tests/aclocal-path.test
+++ b/tests/aclocal-path.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal-print-acdir.test b/tests/aclocal-print-acdir.test
index 4094b35..e39a9d9 100755
--- a/tests/aclocal-print-acdir.test
+++ b/tests/aclocal-print-acdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal.in b/tests/aclocal.in
index 5326ad0..18ee13a 100644
--- a/tests/aclocal.in
+++ b/tests/aclocal.in
@@ -1,6 +1,21 @@
#!/bin/sh
# @configure_input@
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
diff --git a/tests/aclocal.test b/tests/aclocal.test
index b85250f..9d74262 100755
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004, 2008, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal3.test b/tests/aclocal3.test
index f679239..73ee80b 100755
--- a/tests/aclocal3.test
+++ b/tests/aclocal3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2002, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal4.test b/tests/aclocal4.test
index 6073d8e..e511973 100755
--- a/tests/aclocal4.test
+++ b/tests/aclocal4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal5.test b/tests/aclocal5.test
index 430b364..b823ba7 100755
--- a/tests/aclocal5.test
+++ b/tests/aclocal5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal6.test b/tests/aclocal6.test
index c631e64..710fbe3 100755
--- a/tests/aclocal6.test
+++ b/tests/aclocal6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal7.test b/tests/aclocal7.test
index 20b90b9..9fa0944 100755
--- a/tests/aclocal7.test
+++ b/tests/aclocal7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/aclocal8.test b/tests/aclocal8.test
index 86d0e02..bb42d80 100755
--- a/tests/aclocal8.test
+++ b/tests/aclocal8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@ am_create_testdir=empty
. ./defs || Exit 1
cat > configure.in << 'END'
+AC_INIT
SOME_DEFS
END
diff --git a/tests/aclocal9.test b/tests/aclocal9.test
index 0b9f213..ab5451b 100755
--- a/tests/aclocal9.test
+++ b/tests/aclocal9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acsilent.test b/tests/acsilent.test
index d4a5436..dc33d34 100755
--- a/tests/acsilent.test
+++ b/tests/acsilent.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2008, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acsubst.test b/tests/acsubst.test
index a02b34c..9396319 100755
--- a/tests/acsubst.test
+++ b/tests/acsubst.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/acsubst2.test b/tests/acsubst2.test
index cbbbfd8..8485545 100755
--- a/tests/acsubst2.test
+++ b/tests/acsubst2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/add-missing.tap b/tests/add-missing.tap
index 49dc8bb..bbb36f8 100755
--- a/tests/add-missing.tap
+++ b/tests/add-missing.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/all.test b/tests/all.test
index 9a13771..0baf9da 100755
--- a/tests/all.test
+++ b/tests/all.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2007, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/all2.test b/tests/all2.test
index f38167e..da22e68 100755
--- a/tests/all2.test
+++ b/tests/all2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/alloca.test b/tests/alloca.test
index 947a5b4..2e4e88e 100755
--- a/tests/alloca.test
+++ b/tests/alloca.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/alloca2.test b/tests/alloca2.test
index 0c1ac4d..d4c0911 100755
--- a/tests/alloca2.test
+++ b/tests/alloca2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/alpha.test b/tests/alpha.test
index d907df0..a92239b 100755
--- a/tests/alpha.test
+++ b/tests/alpha.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/alpha2.test b/tests/alpha2.test
index b8ef266..104124c 100755
--- a/tests/alpha2.test
+++ b/tests/alpha2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/am-tests-environment.test b/tests/am-tests-environment.test
index 524d8d2..0a2c9a6 100755
--- a/tests/am-tests-environment.test
+++ b/tests/am-tests-environment.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/amassign.test b/tests/amassign.test
index bfc728e..f2245c9 100755
--- a/tests/amassign.test
+++ b/tests/amassign.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/amhello-binpkg.test b/tests/amhello-binpkg.test
index c5051e1..578fc86 100755
--- a/tests/amhello-binpkg.test
+++ b/tests/amhello-binpkg.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/amhello-cflags.test b/tests/amhello-cflags.test
index a7977f3..d464362 100755
--- a/tests/amhello-cflags.test
+++ b/tests/amhello-cflags.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/amhello-cross-compile.test b/tests/amhello-cross-compile.test
index 287462f..85345bd 100755
--- a/tests/amhello-cross-compile.test
+++ b/tests/amhello-cross-compile.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ammissing.test b/tests/ammissing.test
index 97c425e..d13f071 100755
--- a/tests/ammissing.test
+++ b/tests/ammissing.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 2002, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/amopt.test b/tests/amopt.test
index 568299a..cd3baf1 100755
--- a/tests/amopt.test
+++ b/tests/amopt.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/amopts-location.test b/tests/amopts-location.test
index 23b75c0..27f9ae0 100755
--- a/tests/amopts-location.test
+++ b/tests/amopts-location.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/amopts-variable-expansion.test
b/tests/amopts-variable-expansion.test
index ade2849..c4de275 100755
--- a/tests/amopts-variable-expansion.test
+++ b/tests/amopts-variable-expansion.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/amsubst.test b/tests/amsubst.test
index 9bba8fa..b7d9a7e 100755
--- a/tests/amsubst.test
+++ b/tests/amsubst.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ansi2knr-no-more.test b/tests/ansi2knr-no-more.test
index a2ac330..bca00ec 100755
--- a/tests/ansi2knr-no-more.test
+++ b/tests/ansi2knr-no-more.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar-lib.test b/tests/ar-lib.test
index 116640f..fac0b09 100755
--- a/tests/ar-lib.test
+++ b/tests/ar-lib.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar-lib2.test b/tests/ar-lib2.test
index 5b697fa..94ab4ac 100755
--- a/tests/ar-lib2.test
+++ b/tests/ar-lib2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar-lib3.test b/tests/ar-lib3.test
index 8be96fa..f725c7e 100755
--- a/tests/ar-lib3.test
+++ b/tests/ar-lib3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar-lib4.test b/tests/ar-lib4.test
index fb0ca5f..19ffd4c 100755
--- a/tests/ar-lib4.test
+++ b/tests/ar-lib4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar-lib5a.test b/tests/ar-lib5a.test
index 8f1d227..4f9ffea 100755
--- a/tests/ar-lib5a.test
+++ b/tests/ar-lib5a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar-lib5b.test b/tests/ar-lib5b.test
index f697e3c..c9b3668 100755
--- a/tests/ar-lib5b.test
+++ b/tests/ar-lib5b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar-lib6a.test b/tests/ar-lib6a.test
index 0e04e82..328677b 100755
--- a/tests/ar-lib6a.test
+++ b/tests/ar-lib6a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar-lib6b.test b/tests/ar-lib6b.test
index 789691a..79acf45 100755
--- a/tests/ar-lib6b.test
+++ b/tests/ar-lib6b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar-lib7.test b/tests/ar-lib7.test
index 89a279a..cc43546 100755
--- a/tests/ar-lib7.test
+++ b/tests/ar-lib7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar.test b/tests/ar.test
index b0b02a4..9deba93 100755
--- a/tests/ar.test
+++ b/tests/ar.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar2.test b/tests/ar2.test
index 289c469..b788881 100755
--- a/tests/ar2.test
+++ b/tests/ar2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar3.test b/tests/ar3.test
index c8db414..4e4f456 100755
--- a/tests/ar3.test
+++ b/tests/ar3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar4.test b/tests/ar4.test
index 2faeeed..3081449 100755
--- a/tests/ar4.test
+++ b/tests/ar4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ar5.test b/tests/ar5.test
index 000daa7..572b671 100755
--- a/tests/ar5.test
+++ b/tests/ar5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/asm.test b/tests/asm.test
index ec6dbec..fbd3379 100755
--- a/tests/asm.test
+++ b/tests/asm.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/asm2.test b/tests/asm2.test
index e7c0396..c607b7d 100755
--- a/tests/asm2.test
+++ b/tests/asm2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/asm3.test b/tests/asm3.test
index f2f40f2..e74a10c 100755
--- a/tests/asm3.test
+++ b/tests/asm3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2006, 2007, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autodist-acconfig-no-subdir.test
b/tests/autodist-acconfig-no-subdir.test
index 931feaf..d12120a 100755
--- a/tests/autodist-acconfig-no-subdir.test
+++ b/tests/autodist-acconfig-no-subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autodist-acconfig.test b/tests/autodist-acconfig.test
index 5674e27..f3c388e 100755
--- a/tests/autodist-acconfig.test
+++ b/tests/autodist-acconfig.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autodist-aclocal-m4.test b/tests/autodist-aclocal-m4.test
index 7ebfd43..1db4e79 100755
--- a/tests/autodist-aclocal-m4.test
+++ b/tests/autodist-aclocal-m4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autodist-config-headers.test
b/tests/autodist-config-headers.test
index 76bd740..5a194f5 100755
--- a/tests/autodist-config-headers.test
+++ b/tests/autodist-config-headers.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autodist-configure-no-subdir.test
b/tests/autodist-configure-no-subdir.test
index d2bd60c..7435d2f 100755
--- a/tests/autodist-configure-no-subdir.test
+++ b/tests/autodist-configure-no-subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autodist-no-duplicate.test b/tests/autodist-no-duplicate.test
index 1109129..bca2f11 100755
--- a/tests/autodist-no-duplicate.test
+++ b/tests/autodist-no-duplicate.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autodist-stamp-vti.test b/tests/autodist-stamp-vti.test
index f7a111b..be4bf17 100755
--- a/tests/autodist-stamp-vti.test
+++ b/tests/autodist-stamp-vti.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autodist-subdir.test b/tests/autodist-subdir.test
index fd2f283..a605654 100755
--- a/tests/autodist-subdir.test
+++ b/tests/autodist-subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autodist.test b/tests/autodist.test
index ed8dcc3..099af9d 100755
--- a/tests/autodist.test
+++ b/tests/autodist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autohdr.test b/tests/autohdr.test
index 3e0e231..c5031cc 100755
--- a/tests/autohdr.test
+++ b/tests/autohdr.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autohdr2.test b/tests/autohdr2.test
index 7facb2b..1534a3e 100755
--- a/tests/autohdr2.test
+++ b/tests/autohdr2.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autohdr3.test b/tests/autohdr3.test
index 88e3c0f..8eb0d9f 100755
--- a/tests/autohdr3.test
+++ b/tests/autohdr3.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autohdr4.test b/tests/autohdr4.test
index 430d75c..7c002bd 100755
--- a/tests/autohdr4.test
+++ b/tests/autohdr4.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/autohdrdry.test b/tests/autohdrdry.test
index b6208ff..cf402a6 100755
--- a/tests/autohdrdry.test
+++ b/tests/autohdrdry.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/automake-cmdline.tap b/tests/automake-cmdline.tap
index 9397900..72c559a 100755
--- a/tests/automake-cmdline.tap
+++ b/tests/automake-cmdline.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/automake.in b/tests/automake.in
index d4c4c5c..14f437f 100644
--- a/tests/automake.in
+++ b/tests/automake.in
@@ -1,6 +1,21 @@
#!/bin/sh
# @configure_input@
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
diff --git a/tests/auxdir-autodetect.test b/tests/auxdir-autodetect.test
index 715b7a8..0ef12d7 100755
--- a/tests/auxdir-autodetect.test
+++ b/tests/auxdir-autodetect.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/auxdir-computed.tap b/tests/auxdir-computed.tap
index 007eebc..4c73a69 100755
--- a/tests/auxdir-computed.tap
+++ b/tests/auxdir-computed.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/auxdir-misplaced.test b/tests/auxdir-misplaced.test
index eb1a888..962ab33 100755
--- a/tests/auxdir-misplaced.test
+++ b/tests/auxdir-misplaced.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/auxdir-nonexistent.test b/tests/auxdir-nonexistent.test
index 6c43295..3dd6477 100755
--- a/tests/auxdir-nonexistent.test
+++ b/tests/auxdir-nonexistent.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/auxdir-unportable.tap b/tests/auxdir-unportable.tap
index 2eba8be..fb4feca 100755
--- a/tests/auxdir-unportable.tap
+++ b/tests/auxdir-unportable.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/auxdir.test b/tests/auxdir.test
index 2dc548c..c09b9e4 100755
--- a/tests/auxdir.test
+++ b/tests/auxdir.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2004, 2007, 2010, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/auxdir6.test b/tests/auxdir6.test
index bf63895..04881da 100755
--- a/tests/auxdir6.test
+++ b/tests/auxdir6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/auxdir7.test b/tests/auxdir7.test
index d346ad2..9a83432 100755
--- a/tests/auxdir7.test
+++ b/tests/auxdir7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/auxdir8.test b/tests/auxdir8.test
index 1a5e5d9..dc2ee28 100755
--- a/tests/auxdir8.test
+++ b/tests/auxdir8.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2004, 2007, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/backcompat.test b/tests/backcompat.test
index f76b53b..ec8292c 100755
--- a/tests/backcompat.test
+++ b/tests/backcompat.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/backcompat2.test b/tests/backcompat2.test
index 57badf3..26f4ffa 100755
--- a/tests/backcompat2.test
+++ b/tests/backcompat2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/backcompat3.test b/tests/backcompat3.test
index f0e34ba..5571dd3 100755
--- a/tests/backcompat3.test
+++ b/tests/backcompat3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/backcompat4.test b/tests/backcompat4.test
index b95a30b..44c3c94 100755
--- a/tests/backcompat4.test
+++ b/tests/backcompat4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/backcompat5.test b/tests/backcompat5.test
index 0e57db4..d1b316c 100755
--- a/tests/backcompat5.test
+++ b/tests/backcompat5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/backcompat6.test b/tests/backcompat6.test
index 468e71d..60cbcaf 100755
--- a/tests/backcompat6.test
+++ b/tests/backcompat6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/backsl.test b/tests/backsl.test
index 4e3943f..9316915 100755
--- a/tests/backsl.test
+++ b/tests/backsl.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/backsl2.test b/tests/backsl2.test
index f0116e3..9207138 100755
--- a/tests/backsl2.test
+++ b/tests/backsl2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/backsl3.test b/tests/backsl3.test
index 1319c0a..36fab7f 100755
--- a/tests/backsl3.test
+++ b/tests/backsl3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/backsl4.test b/tests/backsl4.test
index 7cfe737..b51ffe3 100755
--- a/tests/backsl4.test
+++ b/tests/backsl4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/badline.test b/tests/badline.test
index 18ad929..f9cb0e8 100755
--- a/tests/badline.test
+++ b/tests/badline.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/badopt.test b/tests/badopt.test
index 6f6d792..b06657f 100755
--- a/tests/badopt.test
+++ b/tests/badopt.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/badprog.test b/tests/badprog.test
index 87b7562..907976b 100755
--- a/tests/badprog.test
+++ b/tests/badprog.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/block.test b/tests/block.test
index f645c09..a6e9e32 100755
--- a/tests/block.test
+++ b/tests/block.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/bsource.test b/tests/bsource.test
index d50c1d5..482015f 100755
--- a/tests/bsource.test
+++ b/tests/bsource.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/candist.test b/tests/candist.test
index f75f406..8f8c52e 100755
--- a/tests/candist.test
+++ b/tests/candist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/canon-name.test b/tests/canon-name.test
index 2b9cd0a..9d46acd 100755
--- a/tests/canon-name.test
+++ b/tests/canon-name.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/canon.test b/tests/canon.test
index 9279d9f..f84a128 100755
--- a/tests/canon.test
+++ b/tests/canon.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2010, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/canon2.test b/tests/canon2.test
index 3085a7c..4d39a7e 100755
--- a/tests/canon2.test
+++ b/tests/canon2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/canon3.test b/tests/canon3.test
index c93f8ac..078e79d 100755
--- a/tests/canon3.test
+++ b/tests/canon3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/canon4.test b/tests/canon4.test
index c6b7296..8a33000 100755
--- a/tests/canon4.test
+++ b/tests/canon4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/canon5.test b/tests/canon5.test
index ccd8930..12a335a 100755
--- a/tests/canon5.test
+++ b/tests/canon5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/canon6.test b/tests/canon6.test
index dd2e44e..aef4c18 100755
--- a/tests/canon6.test
+++ b/tests/canon6.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/canon7.test b/tests/canon7.test
index 48d1b88..997caf3 100755
--- a/tests/canon7.test
+++ b/tests/canon7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/canon8.test b/tests/canon8.test
index 5351345..bdb35e0 100755
--- a/tests/canon8.test
+++ b/tests/canon8.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ccnoco.test b/tests/ccnoco.test
index 780ffe6..d956f50 100755
--- a/tests/ccnoco.test
+++ b/tests/ccnoco.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ccnoco2.test b/tests/ccnoco2.test
index 4c6b22b..c7d6875 100755
--- a/tests/ccnoco2.test
+++ b/tests/ccnoco2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ccnoco3.test b/tests/ccnoco3.test
index 82fb320..d667a98 100755
--- a/tests/ccnoco3.test
+++ b/tests/ccnoco3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2008, 2009, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check-concurrency-bug9245.test
b/tests/check-concurrency-bug9245.test
index 04a71a1..03eff03 100755
--- a/tests/check-concurrency-bug9245.test
+++ b/tests/check-concurrency-bug9245.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check-exported-srcdir.test b/tests/check-exported-srcdir.test
index 7088de4..b074f53 100755
--- a/tests/check-exported-srcdir.test
+++ b/tests/check-exported-srcdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check-fd-redirect.test b/tests/check-fd-redirect.test
index fb952b4..6353301 100755
--- a/tests/check-fd-redirect.test
+++ b/tests/check-fd-redirect.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check-no-test-driver.test b/tests/check-no-test-driver.test
index 19ba34c..cccc0ed 100755
--- a/tests/check-no-test-driver.test
+++ b/tests/check-no-test-driver.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check-subst-prog.test b/tests/check-subst-prog.test
index 245a251..8d8ff58 100755
--- a/tests/check-subst-prog.test
+++ b/tests/check-subst-prog.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check-subst.test b/tests/check-subst.test
index 9e31b9a..03aa07a 100755
--- a/tests/check-subst.test
+++ b/tests/check-subst.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check-tests-in-builddir.test
b/tests/check-tests-in-builddir.test
index 2cf6f0b..93dd966 100755
--- a/tests/check-tests-in-builddir.test
+++ b/tests/check-tests-in-builddir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check.test b/tests/check.test
index ae6be67..c9ab0fa 100755
--- a/tests/check.test
+++ b/tests/check.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check10.test b/tests/check10.test
index f99a840..7b7a052 100755
--- a/tests/check10.test
+++ b/tests/check10.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check11.test b/tests/check11.test
index 76abb3d..5079245 100755
--- a/tests/check11.test
+++ b/tests/check11.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check12.test b/tests/check12.test
index 88235f8..1afa959 100755
--- a/tests/check12.test
+++ b/tests/check12.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -140,9 +140,7 @@ for vpath in : false; do
test -f test-suite.log
test -f a.log
test -f b.log
- else
- :
- fi
+ else :; fi
grep 'check-local succeeded :-)' local.log
cp -f config.status config-status.sav
@@ -179,6 +177,7 @@ for vpath in : false; do
grep '^FAIL: b$' test-suite.log
grep '^b\.test: exit status: 1$' test-suite.log
grep '^a\.test' test-suite.log && Exit 1
+ : For shells with busted 'set -e'.
else :; fi
CHECKLOCAL_EXIT_STATUS=1 $MAKE check && Exit 1
diff --git a/tests/check2.test b/tests/check2.test
index ec6132d..7dbb4c0 100755
--- a/tests/check2.test
+++ b/tests/check2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check3.test b/tests/check3.test
index 4f32737..83520ba 100755
--- a/tests/check3.test
+++ b/tests/check3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check4.test b/tests/check4.test
index f8f6dd6..7edfa5a 100755
--- a/tests/check4.test
+++ b/tests/check4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2007, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check5.test b/tests/check5.test
index 6ec624d..4b2c3b2 100755
--- a/tests/check5.test
+++ b/tests/check5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check6.test b/tests/check6.test
index 9687008..4968f24 100755
--- a/tests/check6.test
+++ b/tests/check6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check7.test b/tests/check7.test
index de101ff..51e6cd9 100755
--- a/tests/check7.test
+++ b/tests/check7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/check8.test b/tests/check8.test
index 5476f36..061c53b 100755
--- a/tests/check8.test
+++ b/tests/check8.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/checkall.test b/tests/checkall.test
index 1981bc7..3b04d56 100755
--- a/tests/checkall.test
+++ b/tests/checkall.test
@@ -1,6 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/clean.test b/tests/clean.test
index b9ffbe0..279e162 100755
--- a/tests/clean.test
+++ b/tests/clean.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/clean2.test b/tests/clean2.test
index 46ab4b7..a74d2c5 100755
--- a/tests/clean2.test
+++ b/tests/clean2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/colneq2.test b/tests/colneq2.test
index fe117c9..515c2f5 100755
--- a/tests/colneq2.test
+++ b/tests/colneq2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/colon.test b/tests/colon.test
index ff44e0b..5c63bcd 100755
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/colon2.test b/tests/colon2.test
index b583831..7823cbe 100755
--- a/tests/colon2.test
+++ b/tests/colon2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/colon3.test b/tests/colon3.test
index 5183b57..f8c1188 100755
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2010, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/colon4.test b/tests/colon4.test
index 2c26383..9043616 100755
--- a/tests/colon4.test
+++ b/tests/colon4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/colon5.test b/tests/colon5.test
index 571d88c..7f51db1 100755
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/colon6.test b/tests/colon6.test
index 6aac84a..295f912 100755
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/colon7.test b/tests/colon7.test
index f445dac..f7ba0d1 100755
--- a/tests/colon7.test
+++ b/tests/colon7.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/color.test b/tests/color.test
index e7134e7..40b6d7d 100755
--- a/tests/color.test
+++ b/tests/color.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007, 2008, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/color2.test b/tests/color2.test
index ab5ab82..6e9efbd 100755
--- a/tests/color2.test
+++ b/tests/color2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/commen10.test b/tests/commen10.test
index 79545e9..d0c246a 100755
--- a/tests/commen10.test
+++ b/tests/commen10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/commen11.test b/tests/commen11.test
index f355cc3..d4b264a 100755
--- a/tests/commen11.test
+++ b/tests/commen11.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comment.test b/tests/comment.test
index 6092e74..393c7b8 100755
--- a/tests/comment.test
+++ b/tests/comment.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comment2.test b/tests/comment2.test
index f8bd62c..199e028 100755
--- a/tests/comment2.test
+++ b/tests/comment2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comment3.test b/tests/comment3.test
index 8903a97..b960b82 100755
--- a/tests/comment3.test
+++ b/tests/comment3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comment4.test b/tests/comment4.test
index 7c1f454..d294e0b 100755
--- a/tests/comment4.test
+++ b/tests/comment4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comment5.test b/tests/comment5.test
index 8e1d1fe..db9b75a 100755
--- a/tests/comment5.test
+++ b/tests/comment5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comment6.test b/tests/comment6.test
index 1c46c86..0d263b5 100755
--- a/tests/comment6.test
+++ b/tests/comment6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comment7.test b/tests/comment7.test
index 26854a1..c080a00 100755
--- a/tests/comment7.test
+++ b/tests/comment7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2006, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comment8.test b/tests/comment8.test
index b2b12fe..1a2b71b 100755
--- a/tests/comment8.test
+++ b/tests/comment8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comment9.test b/tests/comment9.test
index e20b59f..a75fafc 100755
--- a/tests/comment9.test
+++ b/tests/comment9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/comments-in-var-def.test b/tests/comments-in-var-def.test
index aaee1d3..c5d573f 100755
--- a/tests/comments-in-var-def.test
+++ b/tests/comments-in-var-def.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/compile.test b/tests/compile.test
index 12fb2be..0c6ceef 100755
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2007, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/compile2.test b/tests/compile2.test
index 68ab44d..8dc1203 100755
--- a/tests/compile2.test
+++ b/tests/compile2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/compile3.test b/tests/compile3.test
index 800db1d..bf7f456 100755
--- a/tests/compile3.test
+++ b/tests/compile3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/compile4.test b/tests/compile4.test
index 4e07418..9411e1e 100755
--- a/tests/compile4.test
+++ b/tests/compile4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/compile5.test b/tests/compile5.test
index 2b4eeb0..ffaad17 100755
--- a/tests/compile5.test
+++ b/tests/compile5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/compile6.test b/tests/compile6.test
index 5a2ac91..536e34b 100755
--- a/tests/compile6.test
+++ b/tests/compile6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test
index b38f67d..cce7fb4 100755
--- a/tests/compile_f90_c_cxx.test
+++ b/tests/compile_f90_c_cxx.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test
index aaa5abd..303780b 100755
--- a/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond-basic.test b/tests/cond-basic.test
index 5a64000..e2719a1 100755
--- a/tests/cond-basic.test
+++ b/tests/cond-basic.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond.test b/tests/cond.test
index 6bc1e70..a137d72 100755
--- a/tests/cond.test
+++ b/tests/cond.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond10.test b/tests/cond10.test
index ac2ffe3..77ab952 100755
--- a/tests/cond10.test
+++ b/tests/cond10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond11.test b/tests/cond11.test
index 90cbde3..fa3a1b6 100755
--- a/tests/cond11.test
+++ b/tests/cond11.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond13.test b/tests/cond13.test
index a63ee63..8fd0487 100755
--- a/tests/cond13.test
+++ b/tests/cond13.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond14.test b/tests/cond14.test
index c956200..0bb2e7b 100755
--- a/tests/cond14.test
+++ b/tests/cond14.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond15.test b/tests/cond15.test
index d5fb0a0..5bcf700 100755
--- a/tests/cond15.test
+++ b/tests/cond15.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond16.test b/tests/cond16.test
index 7c4a264..d258ceb 100755
--- a/tests/cond16.test
+++ b/tests/cond16.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond17.test b/tests/cond17.test
index 26a8ebb..d466929 100755
--- a/tests/cond17.test
+++ b/tests/cond17.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond18.test b/tests/cond18.test
index fa04d56..7c2f1ce 100755
--- a/tests/cond18.test
+++ b/tests/cond18.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond19.test b/tests/cond19.test
index 17ead91..973aa34 100755
--- a/tests/cond19.test
+++ b/tests/cond19.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond2.test b/tests/cond2.test
index 0f0235b..0876400 100755
--- a/tests/cond2.test
+++ b/tests/cond2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2003, 2004, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond20.test b/tests/cond20.test
index cd2ec0b..fa26248 100755
--- a/tests/cond20.test
+++ b/tests/cond20.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond21.test b/tests/cond21.test
index cf20452..fa29111 100755
--- a/tests/cond21.test
+++ b/tests/cond21.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond22.test b/tests/cond22.test
index cc46745..cb7cbec 100755
--- a/tests/cond22.test
+++ b/tests/cond22.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond23.test b/tests/cond23.test
index 2e43f89..a66c801 100755
--- a/tests/cond23.test
+++ b/tests/cond23.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond24.test b/tests/cond24.test
index 89424be..fd57d41 100755
--- a/tests/cond24.test
+++ b/tests/cond24.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond25.test b/tests/cond25.test
index fe03745..5f53a01 100755
--- a/tests/cond25.test
+++ b/tests/cond25.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond26.test b/tests/cond26.test
index 3c29b59..90fbcff 100755
--- a/tests/cond26.test
+++ b/tests/cond26.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond27.test b/tests/cond27.test
index 74f2e48..3c0c5c7 100755
--- a/tests/cond27.test
+++ b/tests/cond27.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond28.test b/tests/cond28.test
index 0c6cd29..b123ff5 100755
--- a/tests/cond28.test
+++ b/tests/cond28.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond29.test b/tests/cond29.test
index 98cbe87..61d9af5 100755
--- a/tests/cond29.test
+++ b/tests/cond29.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond3.test b/tests/cond3.test
index 7e9b3ae..64d1a2a 100755
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2010, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond30.test b/tests/cond30.test
index fb44bf6..ebec0c0 100755
--- a/tests/cond30.test
+++ b/tests/cond30.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond31.test b/tests/cond31.test
index 69b8fc1..5c0c001 100755
--- a/tests/cond31.test
+++ b/tests/cond31.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond32.test b/tests/cond32.test
index 738903a..a728ceb 100755
--- a/tests/cond32.test
+++ b/tests/cond32.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003, 2006, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond33.test b/tests/cond33.test
index 2b5f62e..1aeaea3 100755
--- a/tests/cond33.test
+++ b/tests/cond33.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond34.test b/tests/cond34.test
index 2443798..8561ee2 100755
--- a/tests/cond34.test
+++ b/tests/cond34.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond35.test b/tests/cond35.test
index f2b0ded..f8d5e86 100755
--- a/tests/cond35.test
+++ b/tests/cond35.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
# Check rules output for parser defined conditionally.
# Report from Roman Fietze.
-required='cc flex yacc'
+required='cc lex yacc'
. ./defs || Exit 1
cat >>configure.in <<'EOF'
diff --git a/tests/cond36.test b/tests/cond36.test
index b4a9a31..7f54db9 100755
--- a/tests/cond36.test
+++ b/tests/cond36.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond37.test b/tests/cond37.test
index e639231..1bfada0 100755
--- a/tests/cond37.test
+++ b/tests/cond37.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond38.test b/tests/cond38.test
index bc313b8..9f13a43 100755
--- a/tests/cond38.test
+++ b/tests/cond38.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2005, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond39.test b/tests/cond39.test
index ac64be3..837a867 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond4.test b/tests/cond4.test
index 40dfa2f..e60569e 100755
--- a/tests/cond4.test
+++ b/tests/cond4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond40.test b/tests/cond40.test
index 1b62bfc..f271dd6 100755
--- a/tests/cond40.test
+++ b/tests/cond40.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond41.test b/tests/cond41.test
index b91500f..3a0cbc7 100755
--- a/tests/cond41.test
+++ b/tests/cond41.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond42.test b/tests/cond42.test
index 2f603e8..75b8555 100755
--- a/tests/cond42.test
+++ b/tests/cond42.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond43.test b/tests/cond43.test
index 6a30511..148ecd4 100755
--- a/tests/cond43.test
+++ b/tests/cond43.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond44.test b/tests/cond44.test
index ea5e87d..662572d 100755
--- a/tests/cond44.test
+++ b/tests/cond44.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond45.test b/tests/cond45.test
index 05d68dc..659c121 100755
--- a/tests/cond45.test
+++ b/tests/cond45.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond46.test b/tests/cond46.test
index 5b15979..7278428 100755
--- a/tests/cond46.test
+++ b/tests/cond46.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond5.test b/tests/cond5.test
index 0af13f3..e187514 100755
--- a/tests/cond5.test
+++ b/tests/cond5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond6.test b/tests/cond6.test
index 3080320..e631640 100755
--- a/tests/cond6.test
+++ b/tests/cond6.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond7.test b/tests/cond7.test
index d680577..7864fc9 100755
--- a/tests/cond7.test
+++ b/tests/cond7.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond8.test b/tests/cond8.test
index 07bf2d0..a4e2b5d 100755
--- a/tests/cond8.test
+++ b/tests/cond8.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cond9.test b/tests/cond9.test
index c039871..1c66792 100755
--- a/tests/cond9.test
+++ b/tests/cond9.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/condd.test b/tests/condd.test
index 4c31f30..8a9cc62 100755
--- a/tests/condd.test
+++ b/tests/condd.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/condhook.test b/tests/condhook.test
index 8763ee6..a0df1ca 100755
--- a/tests/condhook.test
+++ b/tests/condhook.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004, 2007, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/condhook2.test b/tests/condhook2.test
index 109dbb0..40662c9 100755
--- a/tests/condhook2.test
+++ b/tests/condhook2.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/condinc.test b/tests/condinc.test
index 09315cd..6236bd8 100755
--- a/tests/condinc.test
+++ b/tests/condinc.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/condinc2.test b/tests/condinc2.test
index a27fe83..942f5ae 100755
--- a/tests/condinc2.test
+++ b/tests/condinc2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/condlib.test b/tests/condlib.test
index c46c91f..fd01199 100755
--- a/tests/condlib.test
+++ b/tests/condlib.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2008, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/condman2.test b/tests/condman2.test
index ad86370..fbb3844 100755
--- a/tests/condman2.test
+++ b/tests/condman2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/condman3.test b/tests/condman3.test
index cfba3f8..5d79c47 100755
--- a/tests/condman3.test
+++ b/tests/condman3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/confdeps.test b/tests/confdeps.test
index 606027d..f508d45 100755
--- a/tests/confdeps.test
+++ b/tests/confdeps.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/conff.test b/tests/conff.test
index 2f0214a..ede7712 100755
--- a/tests/conff.test
+++ b/tests/conff.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/conff2.test b/tests/conff2.test
index 590169d..f851f80 100755
--- a/tests/conff2.test
+++ b/tests/conff2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/conffile-leading-dot.test b/tests/conffile-leading-dot.test
index ff582db..d382d7a 100755
--- a/tests/conffile-leading-dot.test
+++ b/tests/conffile-leading-dot.test
@@ -54,6 +54,6 @@ echo foo = bazbazbaz > Makefile.am
# giving a bogus warning.
$MAKE 2>stderr && { cat stderr >&2 Exit 1; }
cat stderr >&2
-grep "config\\.status:.*invalid argument.*[\`\"']Makefile[\`\"']" stderr
+grep "config\\.status:.*invalid argument.*Makefile" stderr
:
diff --git a/tests/confh.test b/tests/confh.test
index 5b1c5a5..1568c2f 100755
--- a/tests/confh.test
+++ b/tests/confh.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/confh4.test b/tests/confh4.test
index 20b2a99..50ace63 100755
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/confh5.test b/tests/confh5.test
index d13ff15..a43e428 100755
--- a/tests/confh5.test
+++ b/tests/confh5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/confh6.test b/tests/confh6.test
index c03880b..109d029 100755
--- a/tests/confh6.test
+++ b/tests/confh6.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/confh7.test b/tests/confh7.test
index 2ccb10c..fcc79d8 100755
--- a/tests/confh7.test
+++ b/tests/confh7.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/confh8.test b/tests/confh8.test
index 66b8a54..1398b16 100755
--- a/tests/confh8.test
+++ b/tests/confh8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/configure.test b/tests/configure.test
index f9954af..cedba55 100755
--- a/tests/configure.test
+++ b/tests/configure.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/confincl.test b/tests/confincl.test
index 235d7d6..f86e40e 100755
--- a/tests/confincl.test
+++ b/tests/confincl.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/conflnk.test b/tests/conflnk.test
index 4052e24..9d24c0e 100755
--- a/tests/conflnk.test
+++ b/tests/conflnk.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/conflnk2.test b/tests/conflnk2.test
index 1a3aa32..1d0e156 100755
--- a/tests/conflnk2.test
+++ b/tests/conflnk2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/conflnk3.test b/tests/conflnk3.test
index 1755170..e12898d 100755
--- a/tests/conflnk3.test
+++ b/tests/conflnk3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/conflnk4.test b/tests/conflnk4.test
index eb226ad..6675bc0 100755
--- a/tests/conflnk4.test
+++ b/tests/conflnk4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/confsub.test b/tests/confsub.test
index 43f0819..c11a087 100755
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2010, 2011
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/confvar.test b/tests/confvar.test
index cc0bd7e..2d773e8 100755
--- a/tests/confvar.test
+++ b/tests/confvar.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/confvar2.test b/tests/confvar2.test
index ca11568..66d04dc 100755
--- a/tests/confvar2.test
+++ b/tests/confvar2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/copy.test b/tests/copy.test
index d8aa090..6da3617 100755
--- a/tests/copy.test
+++ b/tests/copy.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cscope.tap b/tests/cscope.tap
new file mode 100755
index 0000000..806912a
--- /dev/null
+++ b/tests/cscope.tap
@@ -0,0 +1,160 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test cscope functionality.
+
+. ./defs || Exit 1
+
+plan_ 18
+
+ocwd=`pwd` || fatal_ "getting top-level directory"
+
+cat >> configure.in << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_SUBST([CC], [who-cares])
+AC_SUBST([CXX], [who-cares])
+AC_SUBST([FC], [who-cares])
+AC_SUBST([GCJ], [who-cares])
+AM_PATH_LISPDIR
+AC_OUTPUT
+END
+
+mkdir sub sub/subsub
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c bar.cpp baz.f90
+lisp_LISP = foo.el
+EXTRA_DIST = foo.el
+END
+
+cat > sub/Makefile.am <<'END'
+bin_PROGRAMS = bar
+bar_SOURCES = subsub/dist.c
+nodist_bar_SOURCES = subsub/gen.c
+subsub/gen.c:
+ $(MKDIR_P) subsub
+ echo 'int generated_subsub () { return 0; }' > $@
+CLEANFILES = subsub/gen.c
+END
+
+echo 'int foo_func () { return 0; }' > foo.c
+echo 'int main () { return 0; }' > bar.cpp
+cat > baz.f90 <<'END'
+ subroutine baz
+ end
+END
+: > foo.el
+echo 'int main () { return 0; }' > sub/subsub/dist.c
+
+$ACLOCAL || fatal_ "aclocal failed"
+$AUTOCONF || fatal_ "autoconf failed"
+$AUTOMAKE -i -a || fatal_ "automake -i -a failed"
+
+# Sun cscope is interactive without redirection.
+if cscope --version </dev/null; then
+ have_cscope=yes
+else
+ have_cscope=no
+fi
+
+test_cleanup ()
+{
+ r=ok
+ if test -f configure; then
+ # In-tree build.
+ $MAKE distclean
+ else
+ # VPATH build.
+ $MAKE distcleancheck
+ fi \
+ && test ! -f cscope.files \
+ && test ! -f cscope.out \
+ && test ! -f cscope.in.out \
+ && test ! -f cscope.po.out \
+ || r='not ok'
+ result_ "$r" "[$pfx] make distcheck"
+}
+
+test_cscope ()
+{
+ r=ok
+ $MAKE -n cscope || r='not ok'
+ result_ "$r" "[$pfx] make -n cscope"
+
+ if test $have_cscope = no; then
+ # For later tests.
+ touch cscope.files cscope.out cscope.in.out cscope.po.out
+ skip_row_ 3 -r "no cscope program avaiable"
+ return 0
+ fi
+
+ r=ok
+ $MAKE cscope 2>stderr || r='not ok'
+ cat stderr >&2
+ grep 'cannot find file' stderr && r='not ok'
+ rm -f stderr
+ result_ "$r" "[$pfx] make cscope"
+
+ r=ok
+ test -f cscope.files \
+ && $FGREP foo.c cscope.files \
+ && $FGREP bar.cpp cscope.files \
+ && $FGREP sub/subsub/dist.c cscope.files \
+ && $FGREP sub/subsub/gen.c cscope.files \
+ || r='not ok'
+ result_ "$r" "[$pfx] cscope.files looks correct"
+
+ r=ok
+ # cscope.files might not exist of the earlier "make cscope" failed.
+ cp cscope.files cscope.files1 \
+ && $MAKE cscope \
+ && diff cscope.files cscope.files1 \
+ || r='not ok'
+ rm -f cscope.files1
+ result_ "$r" "[$pfx] second \"make cscope\" is consistent"
+}
+
+my_configure ()
+{
+ command_ok_ "[$pfx] configure" \
+ "$1"/configure EMACS=no --with-lispdir=/who/cares
+}
+
+cd "$ocwd"
+pfx="relative VPATH"
+mkdir build
+cd build
+my_configure ..
+test_cscope
+test_cleanup
+
+cd "$ocwd"
+pfx="absolute VPATH"
+mkdir build2
+cd build2
+my_configure "$ocwd"
+test_cscope
+test_cleanup
+
+cd "$ocwd"
+pfx="in-tree build"
+my_configure .
+test_cscope
+test_cleanup
+
+:
diff --git a/tests/cscope.test b/tests/cscope.test
deleted file mode 100755
index 859653b..0000000
--- a/tests/cscope.test
+++ /dev/null
@@ -1,107 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test cscope functionality.
-
-required=
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_FC
-AM_PROG_GCJ
-AM_PATH_LISPDIR
-AC_OUTPUT
-END
-
-mkdir sub sub/subsub
-
-cat >Makefile.am <<'END'
-SUBDIRS = sub
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c bar.cpp baz.f90
-lisp_LISP = foo.el
-EXTRA_DIST = foo.el
-END
-
-cat >sub/Makefile.am <<'END'
-bin_PROGRAMS = bar
-bar_SOURCES = subsub/dist.c
-nodist_bar_SOURCES = subsub/gen.c
-subsub/gen.c:
- $(MKDIR_P) subsub
- echo 'int generated_subsub () { return 0; }' > $@
-CLEANFILES = subsub/gen.c
-END
-
-echo 'int foo_func () { return 0; }' > foo.c
-echo 'int main () { return 0; }' > bar.cpp
-cat > baz.f90 <<'END'
- subroutine baz
- end
-END
-: >foo.el
-echo 'int main () { return 0; }' > sub/subsub/dist.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-mkdir build
-cd build
-../configure || Exit 77
-
-$MAKE -n cscope
-
-: ${CSCOPE=cscope}
-( $CSCOPE --version ) >/dev/null 2>&1 || Exit 77
-
-$MAKE cscope 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'cannot find file' stderr && Exit 1
-
-test -f cscope.files
-$FGREP foo.c cscope.files
-$FGREP bar.cpp cscope.files
-$FGREP sub/subsub/dist.c cscope.files
-$FGREP sub/subsub/gen.c cscope.files
-
-cp cscope.files cscope.files1
-$MAKE cscope
-diff cscope.files cscope.files1
-
-$MAKE distclean
-test ! -f cscope.files
-test ! -f cscope.out
-test ! -f cscope.in.out
-test ! -f cscope.po.out
-
-
-`pwd`/../configure || Exit 77
-
-$MAKE cscope 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'cannot find file' stderr && Exit 1
-$MAKE || Exit 77
-$MAKE distclean
-
-cd ..
-./configure
-$MAKE distcheck
-
-:
diff --git a/tests/cscope2.test b/tests/cscope2.test
index a7fa993..bd5e1c4 100755
--- a/tests/cscope2.test
+++ b/tests/cscope2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cscope3.test b/tests/cscope3.test
index e40c061..bf2716c 100755
--- a/tests/cscope3.test
+++ b/tests/cscope3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cxx.test b/tests/cxx.test
index 5edad16..eafe4f6 100755
--- a/tests/cxx.test
+++ b/tests/cxx.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cxx2.test b/tests/cxx2.test
index 7606356..e40ef22 100755
--- a/tests/cxx2.test
+++ b/tests/cxx2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test
index b5e2bc3..69010f7 100755
--- a/tests/cxxcpp.test
+++ b/tests/cxxcpp.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cxxlibobj.test b/tests/cxxlibobj.test
index 30e7501..ef39726 100755
--- a/tests/cxxlibobj.test
+++ b/tests/cxxlibobj.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cxxlink.test b/tests/cxxlink.test
index 617234a..4a196be 100755
--- a/tests/cxxlink.test
+++ b/tests/cxxlink.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cxxnoc.test b/tests/cxxnoc.test
index 04a34a1..055b35f 100755
--- a/tests/cxxnoc.test
+++ b/tests/cxxnoc.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2005, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cxxo.test b/tests/cxxo.test
index 2867218..56a9598 100755
--- a/tests/cxxo.test
+++ b/tests/cxxo.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cygnus-check-without-all.test
b/tests/cygnus-check-without-all.test
index 9cf7ae7..1efc0b5 100755
--- a/tests/cygnus-check-without-all.test
+++ b/tests/cygnus-check-without-all.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cygnus-dependency-tracking.test
b/tests/cygnus-dependency-tracking.test
index e5df33c..5a567f0 100755
--- a/tests/cygnus-dependency-tracking.test
+++ b/tests/cygnus-dependency-tracking.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cygnus-imply-foreign.test b/tests/cygnus-imply-foreign.test
index 51a11f9..ea8a189 100755
--- a/tests/cygnus-imply-foreign.test
+++ b/tests/cygnus-imply-foreign.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cygnus-no-dist.test b/tests/cygnus-no-dist.test
index 47beef6..9c4b781 100755
--- a/tests/cygnus-no-dist.test
+++ b/tests/cygnus-no-dist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cygnus-no-installinfo.test b/tests/cygnus-no-installinfo.test
index 25a8e7c..f05d015 100755
--- a/tests/cygnus-no-installinfo.test
+++ b/tests/cygnus-no-installinfo.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cygnus-requires-maintainer-mode.test
b/tests/cygnus-requires-maintainer-mode.test
index 86e33a1..43cc5f0 100755
--- a/tests/cygnus-requires-maintainer-mode.test
+++ b/tests/cygnus-requires-maintainer-mode.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/cygwin32.test b/tests/cygwin32.test
index ed9fcd1..b786544 100755
--- a/tests/cygwin32.test
+++ b/tests/cygwin32.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 1999, 2001, 2002, 2008, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dash.test b/tests/dash.test
index ef8a176..9edda2d 100755
--- a/tests/dash.test
+++ b/tests/dash.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/defs b/tests/defs
index 9b54045..a45fb23 100644
--- a/tests/defs
+++ b/tests/defs
@@ -1,8 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -378,6 +376,52 @@ grep_configure_help ()
$EGREP "$2" am--our-help || Exit 1
}
+# useless_vpath_rebuild
+# ---------------------
+# Tell whether $MAKE suffers of the bug triggering automake bug#7884.
+# For example, this happens with FreeBSD make, since in a VPATH build
+# it tends to rebuilt files for which there is an explicit or even just
+# a suffix rule, even if said files are already available in the VPATH
+# directory.
+useless_vpath_rebuild ()
+{
+ if test -z "$am__useless_vpath_rebuild"; then
+ if using_gmake; then
+ am__useless_vpath_rebuild=no
+ return 1
+ fi
+ mkdir am__vpath.dir$$
+ cd am__vpath.dir$$
+ touch foo.a foo.b bar baz
+ mkdir build
+ cd build
+ unindent > Makefile << 'END'
+ .SUFFIXES: .a .b
+ VPATH = ..
+ all: foo.b baz
+ .PHONY: all
+ .a.b: ; cp $< $@
+ baz: bar ; cp ../baz bar
+END
+ if $MAKE all && test ! -f foo.b && test ! -f bar; then
+ am__useless_vpath_rebuild=no
+ else
+ am__useless_vpath_rebuild=yes
+ fi
+ cd ../..
+ rm -rf am__vpath.dir$$
+ fi
+ case $am__useless_vpath_rebuild in
+ yes) return 0;;
+ no) return 1;;
+ "") ;;
+ *) fatal_ "no_useless_builddir_remake: internal error";;
+ esac
+}
+am__useless_vpath_rebuild=""
+
+yl_distcheck () { useless_vpath_rebuild || $MAKE distcheck ${1+"$@"}; }
+
# seq_ - print a sequence of numbers
# ----------------------------------
# This function simulates GNU seq(1) portably. Valid usages:
@@ -855,36 +899,23 @@ do
texi2dvi -o /dev/null --version \
|| skip_all_ "required program \`texi2dvi' not available"
;;
- flex)
- # Since flex is required, we pick LEX for ./configure.
- LEX=flex
+ lex)
+ test x"$LEX" = x"false" && skip_all_ "lex not found or disabled"
export LEX
+ ;;
+ yacc)
+ test x"$YACC" = x"false" && skip_all_ "yacc not found or disabled"
+ export YACC
+ ;;
+ flex)
+ LEX=flex; export LEX
echo "$me: running flex --version"
flex --version || skip_all_ "required program \`flex' not available"
;;
- lex)
- test "$LEX" = false && skip_all_ "no Lex program available"
- if test -z "$LEX"; then
- # The user hasn't explicitly specified any lex program in the
- # environment, so we try to use flex, skipping the test if it's
- # not found.
- LEX=flex
- export LEX
- echo "$me: running flex --version"
- flex --version || skip_all_ "required program \`flex' not available"
- fi
- ;;
- yacc)
- test "$YACC" = false && skip_all_ "no Yacc program available"
- if test -z "$YACC"; then
- # The user hasn't explicitly specified any yacc program in the
- # environment, so we try to use bison, skipping the test if it's
- # not found.
- YACC='bison -y'
- export YACC
- echo "$me: running bison --version"
- bison --version || skip_all_ "required program \`bison' not available"
- fi
+ bison)
+ YACC='bison -y'; export YACC
+ echo "$me: running bison --version"
+ bison --version || skip_all_ "required program \`bison' not available"
;;
*)
# Generic case: the tool must support --version.
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 79484a9..b2e884b 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -1,9 +1,7 @@
# -*- shell-script -*-
# @configure_input@
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -146,6 +144,8 @@ SHELL=${AM_TESTSUITE_SHELL-'@SHELL@'}; export SHELL
# that automake testsuite, if they are available.
PERL=${AM_TESTSUITE_PERL-${PERL-'@PERL@'}}
MAKE=${AM_TESTSUITE_MAKE-${MAKE-'make'}}
+YACC=${AM_TESTSUITE_YACC-${YACC-'@YACC@'}}
+LEX=${AM_TESTSUITE_LEX-${LEX-'@LEX@'}}
AUTOCONF=${AM_TESTSUITE_AUTOCONF-${AUTOCONF-'@am_AUTOCONF@'}}
AUTOM4TE=${AM_TESTSUITE_AUTOM4TE-${AUTOM4TE-'@am_AUTOM4TE@'}}
AUTORECONF=${AM_TESTSUITE_AUTORECONF-${AUTORECONF-'@am_AUTORECONF@'}}
diff --git a/tests/defun.test b/tests/defun.test
index 44b3d80..6891ede 100755
--- a/tests/defun.test
+++ b/tests/defun.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/defun2.test b/tests/defun2.test
index 3aed357..7bebc8e 100755
--- a/tests/defun2.test
+++ b/tests/defun2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu-absolute-builddir.test
b/tests/dejagnu-absolute-builddir.test
index 221e796..856d9d0 100755
--- a/tests/dejagnu-absolute-builddir.test
+++ b/tests/dejagnu-absolute-builddir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu-relative-srcdir.test
b/tests/dejagnu-relative-srcdir.test
index f1ef8a4..71f5bd9 100755
--- a/tests/dejagnu-relative-srcdir.test
+++ b/tests/dejagnu-relative-srcdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu-siteexp-append.test
b/tests/dejagnu-siteexp-append.test
index 84ec7f6..b37df57 100755
--- a/tests/dejagnu-siteexp-append.test
+++ b/tests/dejagnu-siteexp-append.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu-siteexp-extend.test
b/tests/dejagnu-siteexp-extend.test
index fbfc57c..5b1630a 100755
--- a/tests/dejagnu-siteexp-extend.test
+++ b/tests/dejagnu-siteexp-extend.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu-siteexp-useredit.test
b/tests/dejagnu-siteexp-useredit.test
index a67e55a..d29b769 100755
--- a/tests/dejagnu-siteexp-useredit.test
+++ b/tests/dejagnu-siteexp-useredit.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu.test b/tests/dejagnu.test
index 43bb0f0..a955c34 100755
--- a/tests/dejagnu.test
+++ b/tests/dejagnu.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test
index 154c087..2c3c8b8 100755
--- a/tests/dejagnu2.test
+++ b/tests/dejagnu2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu3.test b/tests/dejagnu3.test
index 42529c0..c8da733 100755
--- a/tests/dejagnu3.test
+++ b/tests/dejagnu3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu4.test b/tests/dejagnu4.test
index 02eb444..361bb95 100755
--- a/tests/dejagnu4.test
+++ b/tests/dejagnu4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2006, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu5.test b/tests/dejagnu5.test
index 9eb51f1..44447db 100755
--- a/tests/dejagnu5.test
+++ b/tests/dejagnu5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu6.test b/tests/dejagnu6.test
index eba687e..24b3307 100755
--- a/tests/dejagnu6.test
+++ b/tests/dejagnu6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dejagnu7.test b/tests/dejagnu7.test
index d16e02d..b42aaf4 100755
--- a/tests/dejagnu7.test
+++ b/tests/dejagnu7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/deleted-am.test b/tests/deleted-am.test
index 74b3745..af37639 100755
--- a/tests/deleted-am.test
+++ b/tests/deleted-am.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/deleted-m4.test b/tests/deleted-m4.test
index 82db3f0..43f1017 100755
--- a/tests/deleted-m4.test
+++ b/tests/deleted-m4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depacl2.test b/tests/depacl2.test
index a5c3be9..5c5ebf3 100755
--- a/tests/depacl2.test
+++ b/tests/depacl2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2002, 2003, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depcomp-shuffle-sub-vpath.test
b/tests/depcomp-shuffle-sub-vpath.test
index 06cdd3d..c97a1b6 100755
--- a/tests/depcomp-shuffle-sub-vpath.test
+++ b/tests/depcomp-shuffle-sub-vpath.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depcomp-shuffle-sub.test b/tests/depcomp-shuffle-sub.test
index c04eb12..9338508 100755
--- a/tests/depcomp-shuffle-sub.test
+++ b/tests/depcomp-shuffle-sub.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depcomp-shuffle-vpath.test b/tests/depcomp-shuffle-vpath.test
index 78ccc19..eca1004 100755
--- a/tests/depcomp-shuffle-vpath.test
+++ b/tests/depcomp-shuffle-vpath.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depcomp-shuffle.test b/tests/depcomp-shuffle.test
index 79c063c..ebd4017 100755
--- a/tests/depcomp-shuffle.test
+++ b/tests/depcomp-shuffle.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depcomp.sh b/tests/depcomp.sh
index 67db770..d149280 100755
--- a/tests/depcomp.sh
+++ b/tests/depcomp.sh
@@ -148,10 +148,17 @@ mkdir build-aux sub src src/sub2
case $depcomp_with_libtool in
yes)
- plan_ 84
po=Plo objext=lo a=la
normalized_target=libfoo_la
- LIBPRIMARY=LTLIBRARIES LINKADD=LIBADD
+ # On platforms requiring that no undefined symbols exist in order
+ # to build shared libraries (e.g. Windows DLLs), you have to
+ # explicitly declare that the libtool library you are building
+ # does not actually have any undefined symbols, for libtool to
+ # even try to build it as a shared library. Without that
+ # explicit declaration, libtool falls back to a static library
+ # only, regardless of any --enable-shared flags etc.
+ LIBPRIMARY=LTLIBRARIES LINKADD=LIBADD NOUNDEF=-no-undefined
+ libbaz_ldflags="libbaz_${a}_LDFLAGS = $NOUNDEF"
echo lib_LTLIBRARIES = libfoo.la >> Makefile.am
make_ok ()
{
@@ -166,10 +173,10 @@ case $depcomp_with_libtool in
}
;;
no)
- plan_ 28
po=Po objext='$(OBJEXT)' a=a
normalized_target=foo
- LIBPRIMARY=LIBRARIES LINKADD=LDADD
+ LIBPRIMARY=LIBRARIES LINKADD=LDADD NOUNDEF=
+ libbaz_ldflags=
echo bin_PROGRAMS = foo >> Makefile.am
make_ok ()
{
@@ -187,6 +194,7 @@ SUBDIRS = src
# We include subfoo only to be sure that the munging in depcomp
# doesn't remove too much from the object file name.
${normalized_target}_SOURCES = foo.c sub/subfoo.c foo.h sub/subfoo.h
+${normalized_target}_LDFLAGS = $NOUNDEF
${normalized_target}_${LINKADD} = src/libbaz.$a
.PHONY: grep-test
@@ -209,6 +217,7 @@ noinst_${LIBPRIMARY} = libbaz.$a
# We include sub2foo only to be sure that the munging in depcomp
# doesn't remove too much from the object file name.
libbaz_${a}_SOURCES = baz.c sub2/sub2foo.c baz.h sub2/sub2foo.h
+$libbaz_ldflags
END
cat > foo.c <<'END'
@@ -260,14 +269,47 @@ $ACLOCAL && $AUTOCONF && $AUTOMAKE -a \
test -f build-aux/depcomp \
|| fatal_ "depcomp script not installed"
+# To offer extra coverage for the depmodes (like "aix" of "hp2") where the
+# name of the compiler-generated depfiles can depend on whether libtool is
+# in use *and* on which kind of libraries libtool is building (static,
+# shared, or both), we would like to run the libtool-oriented tests thrice:
+# once after having run configure with the '--disable-shared' option, once
+# after having run it with the '--enable-shared' options, and once by
+# leaving it to configure to automatically select which kind of library (or
+# libraries) to build.
+#
+# But doing such three-fold checks unconditionally for all the depmodes
+# would slow down the already too slow libtool tests unacceptably (up to a
+# 150-200% factor), with no real gain in coverage for most of the depmodes.
+# So, since the depmodes that would benefit from the extra tests are never
+# forced to configure in out tests below, but can only be automatically
+# selected by '--enable-dependency-tracking', we make this threefold check
+# only in this later case.
+
case $depmode in
auto)
+ if test $depcomp_with_libtool = no; then
+ plan_ 28
+ do_all_tests () { do_test; }
+ else
+ plan_ 84
+ do_all_tests ()
+ {
+ do_test default
+ do_test noshared --disable-shared
+ do_test nostatic --disable-static
+ }
+ fi
displayed_depmode='..*' # At least one character long.
cfg_deptrack=--enable-dependency-tracking ;;
disabled)
+ plan_ 28
+ do_all_tests () { do_test; }
displayed_depmode=none
cfg_deptrack=--disable-dependency-tracking ;;
*)
+ plan_ 28
+ do_all_tests () { do_test; }
displayed_depmode="(cached) $depmode"
cfg_deptrack="$cachevar=$depmode"
# Sanity check: ensure the cache variable we force is truly
@@ -378,13 +420,7 @@ do_test ()
}
for vpath in no simple long absolute; do
- if test $depcomp_with_libtool = no; then
- do_test
- else
- do_test default
- do_test noshared --disable-shared
- do_test nostatic --disable-static
- fi
+ do_all_tests
done
:
diff --git a/tests/depcomp.test b/tests/depcomp.test
index f456c47..3d03766 100755
--- a/tests/depcomp.test
+++ b/tests/depcomp.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depcomp2.test b/tests/depcomp2.test
index 2bceaaf..4980ed7 100755
--- a/tests/depcomp2.test
+++ b/tests/depcomp2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depcomp8a.test b/tests/depcomp8a.test
index 222797d..05f7f2a 100755
--- a/tests/depcomp8a.test
+++ b/tests/depcomp8a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depcomp8b.test b/tests/depcomp8b.test
index d4ee9c3..ab87cce 100755
--- a/tests/depcomp8b.test
+++ b/tests/depcomp8b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depdist.test b/tests/depdist.test
index d5644de..d6bcc83 100755
--- a/tests/depdist.test
+++ b/tests/depdist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depend.test b/tests/depend.test
index e77ab48..a2f8b6e 100755
--- a/tests/depend.test
+++ b/tests/depend.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1999, 2001, 2002, 2004, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depend3.test b/tests/depend3.test
index 1c7b297..5303a7f 100755
--- a/tests/depend3.test
+++ b/tests/depend3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/depend4.test b/tests/depend4.test
index 06cc325..13da757 100755
--- a/tests/depend4.test
+++ b/tests/depend4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/deprecated-acinit.test b/tests/deprecated-acinit.test
index 7908bb6..e94ab5d 100755
--- a/tests/deprecated-acinit.test
+++ b/tests/deprecated-acinit.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/destdir.test b/tests/destdir.test
index 8fefbc2..a0cf558 100755
--- a/tests/destdir.test
+++ b/tests/destdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dirlist-abspath.test b/tests/dirlist-abspath.test
index b48ad8c..4ae92e5 100755
--- a/tests/dirlist-abspath.test
+++ b/tests/dirlist-abspath.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dirlist.test b/tests/dirlist.test
index 99b0f1d..3f6a2d7 100755
--- a/tests/dirlist.test
+++ b/tests/dirlist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dirlist2.test b/tests/dirlist2.test
index 4b7df2f..e84cfa0 100755
--- a/tests/dirlist2.test
+++ b/tests/dirlist2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/discover.test b/tests/discover.test
index 5108265..d74fcf7 100755
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dist-auxdir-many-subdirs.test
b/tests/dist-auxdir-many-subdirs.test
index 6078f04..478220b 100755
--- a/tests/dist-auxdir-many-subdirs.test
+++ b/tests/dist-auxdir-many-subdirs.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dist-auxfile-2.test b/tests/dist-auxfile-2.test
index 77e6ffb..1b051ee 100755
--- a/tests/dist-auxfile-2.test
+++ b/tests/dist-auxfile-2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dist-auxfile.test b/tests/dist-auxfile.test
index d04b6c9..0b3bb6a 100755
--- a/tests/dist-auxfile.test
+++ b/tests/dist-auxfile.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dist-formats.tap b/tests/dist-formats.tap
index 80be9c9..612af54 100755
--- a/tests/dist-formats.tap
+++ b/tests/dist-formats.tap
@@ -80,7 +80,8 @@ missing_compressors=`
case $c in
# Assume gzip(1) is available on every reasonable portability target.
gzip)
- continue;;
+ continue
+ ;;
# On Cygwin, as of 9/2/2012, 'compress' is provided by sharutils
# and is just a dummy script that is not able to actually compress
# (it can only decompress). So, check that the 'compress' program
@@ -92,9 +93,13 @@ missing_compressors=`
compress)
for x in 1 2 3 4 5 6 7 8; do
echo aaaaaaaaaaaaaaa
- done | $c -c >/dev/null && continue;;
+ done | $c -c >/dev/null && continue
+ : For shells with busted 'set -e'.
+ ;;
*)
- $c --version </dev/null >&2 && continue;;
+ $c --version </dev/null >&2 && continue
+ : For shells with busted 'set -e'.
+ ;;
esac
echo $c
done | tr "$nl" ' '`
diff --git a/tests/dist-included-parent-dir.test
b/tests/dist-included-parent-dir.test
index 9a75963..552cc38 100755
--- a/tests/dist-included-parent-dir.test
+++ b/tests/dist-included-parent-dir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dist-missing-am.test b/tests/dist-missing-am.test
index df9d579..52a613b 100755
--- a/tests/dist-missing-am.test
+++ b/tests/dist-missing-am.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dist-missing-included-m4.test
b/tests/dist-missing-included-m4.test
index 4328417..9e8cd7a 100755
--- a/tests/dist-missing-included-m4.test
+++ b/tests/dist-missing-included-m4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dist-missing-m4.test b/tests/dist-missing-m4.test
index 02e95c7..a6f248f 100755
--- a/tests/dist-missing-m4.test
+++ b/tests/dist-missing-m4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dist-readonly.test b/tests/dist-readonly.test
index 3b558c9..934ea69 100755
--- a/tests/dist-readonly.test
+++ b/tests/dist-readonly.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dist-repeated.test b/tests/dist-repeated.test
index 7dd8bdd..00c071e 100755
--- a/tests/dist-repeated.test
+++ b/tests/dist-repeated.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcheck-configure-flags-am.test
b/tests/distcheck-configure-flags-am.test
index 4393353..917c4de 100755
--- a/tests/distcheck-configure-flags-am.test
+++ b/tests/distcheck-configure-flags-am.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcheck-configure-flags-subpkg.test
b/tests/distcheck-configure-flags-subpkg.test
index 5c9a320..94c7f8f 100755
--- a/tests/distcheck-configure-flags-subpkg.test
+++ b/tests/distcheck-configure-flags-subpkg.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcheck-configure-flags.test
b/tests/distcheck-configure-flags.test
index 09288e2..c327fcd 100755
--- a/tests/distcheck-configure-flags.test
+++ b/tests/distcheck-configure-flags.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcheck-hook-m4.am b/tests/distcheck-hook-m4.am
index 88681e9..5d36102 100644
--- a/tests/distcheck-hook-m4.am
+++ b/tests/distcheck-hook-m4.am
@@ -1,6 +1,6 @@
## Data files for some tests. Not used in the automake build system.
##
-## Copyright (C) 2011 Free Software Foundation, Inc.
+## Copyright (C) 2011-2012 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/tests/distcheck-hook.test b/tests/distcheck-hook.test
index 0e2029f..3466e0c 100755
--- a/tests/distcheck-hook.test
+++ b/tests/distcheck-hook.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcheck-hook2.test b/tests/distcheck-hook2.test
index 71c35aa..b5527ae 100755
--- a/tests/distcheck-hook2.test
+++ b/tests/distcheck-hook2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcheck-missing-m4.test b/tests/distcheck-missing-m4.test
index e4696b5..b630535 100755
--- a/tests/distcheck-missing-m4.test
+++ b/tests/distcheck-missing-m4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcheck-outdated-m4.test b/tests/distcheck-outdated-m4.test
index 4f660e8..6d06f2c 100755
--- a/tests/distcheck-outdated-m4.test
+++ b/tests/distcheck-outdated-m4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcheck-override-infodir.test
b/tests/distcheck-override-infodir.test
index 824920e..f9e4ee4 100755
--- a/tests/distcheck-override-infodir.test
+++ b/tests/distcheck-override-infodir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcheck-pr9579.test b/tests/distcheck-pr9579.test
index 341a680..5fb3447 100755
--- a/tests/distcheck-pr9579.test
+++ b/tests/distcheck-pr9579.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcleancheck.test b/tests/distcleancheck.test
index cf2b0fe..38a06c4 100755
--- a/tests/distcleancheck.test
+++ b/tests/distcleancheck.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcom-subdir.test b/tests/distcom-subdir.test
index f873682..8362323 100755
--- a/tests/distcom-subdir.test
+++ b/tests/distcom-subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcom2.test b/tests/distcom2.test
index 504dcf6..0eba22c 100755
--- a/tests/distcom2.test
+++ b/tests/distcom2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcom3.test b/tests/distcom3.test
index 5cb5e84..4f2dd4d 100755
--- a/tests/distcom3.test
+++ b/tests/distcom3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcom4.test b/tests/distcom4.test
index 7eda400..1589bec 100755
--- a/tests/distcom4.test
+++ b/tests/distcom4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2006, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distcom5.test b/tests/distcom5.test
index 2e45913..d9b43da 100755
--- a/tests/distcom5.test
+++ b/tests/distcom5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2006, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distdir.test b/tests/distdir.test
index ec7d121..ef455b7 100755
--- a/tests/distdir.test
+++ b/tests/distdir.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2006, 2007, 2009, 2010, 2011,
-# 2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distlinks.test b/tests/distlinks.test
index 55cdc44..ffe70e5 100755
--- a/tests/distlinks.test
+++ b/tests/distlinks.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distlinksbrk.test b/tests/distlinksbrk.test
index 41cc499..8dcd81e 100755
--- a/tests/distlinksbrk.test
+++ b/tests/distlinksbrk.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/distname.test b/tests/distname.test
index c92f70d..1c1029e 100755
--- a/tests/distname.test
+++ b/tests/distname.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dmalloc.test b/tests/dmalloc.test
index 4665f9c..6fd0836 100755
--- a/tests/dmalloc.test
+++ b/tests/dmalloc.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/doc-parsing-buglets-tabs.test
b/tests/doc-parsing-buglets-tabs.test
index c50bc1f..057017d 100755
--- a/tests/doc-parsing-buglets-tabs.test
+++ b/tests/doc-parsing-buglets-tabs.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dollar.test b/tests/dollar.test
index 271c6fe..5d00180 100755
--- a/tests/dollar.test
+++ b/tests/dollar.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/double.test b/tests/double.test
index 047308c..1b9962a 100755
--- a/tests/double.test
+++ b/tests/double.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dup2.test b/tests/dup2.test
index a1516fc..b50ce51 100755
--- a/tests/dup2.test
+++ b/tests/dup2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/else.test b/tests/else.test
index cf1a67f..26ca9b4 100755
--- a/tests/else.test
+++ b/tests/else.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/empty.test b/tests/empty.test
index 8ca73cf..78b5ffd 100755
--- a/tests/empty.test
+++ b/tests/empty.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2007, 2011
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/empty2.test b/tests/empty2.test
index 293adbd..1fcaaaf 100755
--- a/tests/empty2.test
+++ b/tests/empty2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/empty3.test b/tests/empty3.test
index a9dfd7b..5415c7d 100755
--- a/tests/empty3.test
+++ b/tests/empty3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/empty4.test b/tests/empty4.test
index 958b48d..c684839 100755
--- a/tests/empty4.test
+++ b/tests/empty4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/exdir.test b/tests/exdir.test
index 1929af8..6e048d2 100755
--- a/tests/exdir.test
+++ b/tests/exdir.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/exdir2.test b/tests/exdir2.test
index bd14712..ddaac58 100755
--- a/tests/exdir2.test
+++ b/tests/exdir2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2004, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/exdir3.test b/tests/exdir3.test
index 5292154..88c0db8 100755
--- a/tests/exdir3.test
+++ b/tests/exdir3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/exeext.test b/tests/exeext.test
index e95c0a2..110e2ce 100755
--- a/tests/exeext.test
+++ b/tests/exeext.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/exeext2.test b/tests/exeext2.test
index c815034..d420deb 100755
--- a/tests/exeext2.test
+++ b/tests/exeext2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/exeext3.test b/tests/exeext3.test
index 637cc58..a93bec5 100755
--- a/tests/exeext3.test
+++ b/tests/exeext3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/exeext4.test b/tests/exeext4.test
index 9ce25fe..8a657a6 100755
--- a/tests/exeext4.test
+++ b/tests/exeext4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2006, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/exsource.test b/tests/exsource.test
index 8bb1eb0..f589767 100755
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2004, 2011, 2012
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ext.test b/tests/ext.test
index 5ac3cd1..d7e512b 100755
--- a/tests/ext.test
+++ b/tests/ext.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ext2.test b/tests/ext2.test
index ef218ae..1dc5235 100755
--- a/tests/ext2.test
+++ b/tests/ext2.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ext3.test b/tests/ext3.test
index 191a34e..0ea2e62 100755
--- a/tests/ext3.test
+++ b/tests/ext3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra-portability.test b/tests/extra-portability.test
index 22d3749..9f4a4b4 100755
--- a/tests/extra-portability.test
+++ b/tests/extra-portability.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra-portability2.test b/tests/extra-portability2.test
index ceaac22..d2894ac 100755
--- a/tests/extra-portability2.test
+++ b/tests/extra-portability2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra-programs-empty.test b/tests/extra-programs-empty.test
index e46e1ac..5c1e879 100755
--- a/tests/extra-programs-empty.test
+++ b/tests/extra-programs-empty.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2006, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra.test b/tests/extra.test
index da41d14..a5452c5 100755
--- a/tests/extra.test
+++ b/tests/extra.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra10.test b/tests/extra10.test
index 302ad77..53a0830 100755
--- a/tests/extra10.test
+++ b/tests/extra10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,18 +16,24 @@
# Check that wildcards in EXTRA_DIST are honoured.
# Suggested by observations from Braden McDaniel.
+# See also sister test 'extra11.test', that check a similar usage
+# with the involvement of the $(wildcard) GNU make builtin.
. ./defs || Exit 1
echo AC_OUTPUT >> configure.in
cat > Makefile.am <<'END'
-EXTRA_DIST=*.foo
+EXTRA_DIST = *.foo
.PHONY: test
test: distdir
diff a.foo $(distdir)/a.foo
diff b.foo $(distdir)/b.foo
test ! -r $(distdir)/c.bar
+check-local:
+ test -f $(srcdir)/a.foo
+ test -f $(srcdir)/b.foo
+ test ! -r $(srcdir)/c.bar
END
$ACLOCAL
@@ -36,6 +42,8 @@ $AUTOCONF
echo aaa > a.foo
echo bbb > b.foo
-echo ccc > c.foo
+echo ccc > c.bar
./configure
$MAKE test
+
+:
diff --git a/tests/extra11.test b/tests/extra11.test
index 4450db5..baeac86 100755
--- a/tests/extra11.test
+++ b/tests/extra11.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,7 +22,9 @@
echo AC_OUTPUT >> configure.in
cat > Makefile.am <<'END'
-EXTRA_DIST = [!c-z].t d.t [ab].dir foo.* *zardoz*
+AUTOMAKE_OPTIONS = -Wno-portability
+
+EXTRA_DIST = $(wildcard [!c-z].t d.t [ab].dir foo.* *zardoz*)
.PHONY: prereq
prereq:
@@ -44,6 +46,7 @@ prereq:
.PHONY: test
test: distdir
+ ls -l $(distdir) $(distdir)/*.dir ;: For debugging.
diff a.t $(distdir)/a.t
diff b.t $(distdir)/b.t
test ! -r $(distdir)/c.t
@@ -58,6 +61,22 @@ test: distdir
diff foo.bar $(distdir)/foo.bar
test ! -r $(distdir)/foo
diff _zardoz_ $(distdir)/_zardoz_
+check-local:
+ ls -l . *.dir ;: For debugging.
+ test -f $(srcdir)/a.t
+ test -f $(srcdir)/b.t
+ test ! -r $(srcdir)/c.t
+ test -f $(srcdir)/d.t
+ test ! -r $(srcdir)/m.t
+ test ! -r $(srcdir)/z.t
+ test -f $(srcdir)/a.dir/f1
+ test -f $(srcdir)/a.dir/f2
+ test -f $(srcdir)/b.dir/f
+ test ! -r $(srcdir)/c.dir
+ test -f $(srcdir)/foo.x
+ test -f $(srcdir)/foo.bar
+ test ! -r $(srcdir)/foo
+ test -f $(srcdir)/_zardoz_
END
$ACLOCAL
@@ -66,5 +85,8 @@ $AUTOCONF
./configure
$MAKE prereq
-ls -l . *.dir
+ls -l . *.dir # For debugging.
$MAKE test
+$MAKE distcheck
+
+:
diff --git a/tests/extra12.test b/tests/extra12.test
index 75e2b44..bdefab4 100755
--- a/tests/extra12.test
+++ b/tests/extra12.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra2.test b/tests/extra2.test
index 6660856..e97207e 100755
--- a/tests/extra2.test
+++ b/tests/extra2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra3.test b/tests/extra3.test
index 557cb84..179e611 100755
--- a/tests/extra3.test
+++ b/tests/extra3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra4.test b/tests/extra4.test
index a52c158..716d180 100755
--- a/tests/extra4.test
+++ b/tests/extra4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra5.test b/tests/extra5.test
index e66198d..f6ef21f 100755
--- a/tests/extra5.test
+++ b/tests/extra5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra6.test b/tests/extra6.test
index c687828..2b5ef72 100755
--- a/tests/extra6.test
+++ b/tests/extra6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra7.test b/tests/extra7.test
index a746a08..3c77b43 100755
--- a/tests/extra7.test
+++ b/tests/extra7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra8.test b/tests/extra8.test
index 57bbe56..ff055f3 100755
--- a/tests/extra8.test
+++ b/tests/extra8.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extra9.test b/tests/extra9.test
index ac1e0a8..5f01024 100755
--- a/tests/extra9.test
+++ b/tests/extra9.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extract-testsuite-summary b/tests/extract-testsuite-summary
index a3a0d87..28a9c35 100644
--- a/tests/extract-testsuite-summary
+++ b/tests/extract-testsuite-summary
@@ -2,6 +2,21 @@
# Extract the testsuite summary generated by the parallel-tests harness
# from the output of "make check".
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
use warnings FATAL => 'all';
use strict;
diff --git a/tests/extradep.test b/tests/extradep.test
index 3b46de9..cf949b5 100755
--- a/tests/extradep.test
+++ b/tests/extradep.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/extradep2.test b/tests/extradep2.test
index 37483d6..9bf67fe 100755
--- a/tests/extradep2.test
+++ b/tests/extradep2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/f90only.test b/tests/f90only.test
index a282673..66b1d67 100755
--- a/tests/f90only.test
+++ b/tests/f90only.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/flavor.test b/tests/flavor.test
index ca8e755..327b447 100755
--- a/tests/flavor.test
+++ b/tests/flavor.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/flibs.test b/tests/flibs.test
index 6ca0d2b..058acfa 100755
--- a/tests/flibs.test
+++ b/tests/flibs.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/fn99.test b/tests/fn99.test
index c048802..b2c208f 100755
--- a/tests/fn99.test
+++ b/tests/fn99.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/fn99subdir.test b/tests/fn99subdir.test
index add730f..e05eea1 100755
--- a/tests/fn99subdir.test
+++ b/tests/fn99subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/fnoc.test b/tests/fnoc.test
index f250168..ca7179f 100755
--- a/tests/fnoc.test
+++ b/tests/fnoc.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/fo.test b/tests/fo.test
index a248f0f..8194566 100755
--- a/tests/fo.test
+++ b/tests/fo.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/fonly.test b/tests/fonly.test
index a653bef..ea7ae22 100755
--- a/tests/fonly.test
+++ b/tests/fonly.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/forcemiss.test b/tests/forcemiss.test
index 7ee186c..0c10853 100755
--- a/tests/forcemiss.test
+++ b/tests/forcemiss.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/forcemiss2.test b/tests/forcemiss2.test
index 80d78d3..d7878bb 100755
--- a/tests/forcemiss2.test
+++ b/tests/forcemiss2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/fort1.test b/tests/fort1.test
index 347ec13..6bf58fe 100755
--- a/tests/fort1.test
+++ b/tests/fort1.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/fort2.test b/tests/fort2.test
index 0c7065d..7562996 100755
--- a/tests/fort2.test
+++ b/tests/fort2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2008, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/fort4.test b/tests/fort4.test
index 273ccf4..31b9f25 100755
--- a/tests/fort4.test
+++ b/tests/fort4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/fort5.test b/tests/fort5.test
index 3927c32..44af179 100755
--- a/tests/fort5.test
+++ b/tests/fort5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/fortdep.test b/tests/fortdep.test
index e70ee98..5e25bf9 100755
--- a/tests/fortdep.test
+++ b/tests/fortdep.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gcj.test b/tests/gcj.test
index 5e6ab33..3335cbb 100755
--- a/tests/gcj.test
+++ b/tests/gcj.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gcj2.test b/tests/gcj2.test
index 3d60cff..d34957a 100755
--- a/tests/gcj2.test
+++ b/tests/gcj2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gcj3.test b/tests/gcj3.test
index f2f7460..02c71c7 100755
--- a/tests/gcj3.test
+++ b/tests/gcj3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gcj4.test b/tests/gcj4.test
index d5dedd6..58e2ff6 100755
--- a/tests/gcj4.test
+++ b/tests/gcj4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gcj5.test b/tests/gcj5.test
index f63a8d4..c09e895 100755
--- a/tests/gcj5.test
+++ b/tests/gcj5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gcj6.test b/tests/gcj6.test
index 347afd1..17603ba 100755
--- a/tests/gcj6.test
+++ b/tests/gcj6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part
index 08835b7..bafb113 100755
--- a/tests/gen-testsuite-part
+++ b/tests/gen-testsuite-part
@@ -3,7 +3,7 @@
# of the Automake testsuite. Also, automatically generate some more
# tests from them (for particular cases/setups only).
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test
index 789a015..27d2b16 100755
--- a/tests/get-sysconf.test
+++ b/tests/get-sysconf.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gettext-macros.test b/tests/gettext-macros.test
index 8dd05b5..e3408a9 100755
--- a/tests/gettext-macros.test
+++ b/tests/gettext-macros.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gettext.test b/tests/gettext.test
index d40c898..0fcef2c 100755
--- a/tests/gettext.test
+++ b/tests/gettext.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gettext2.test b/tests/gettext2.test
index dad775a..488743c 100755
--- a/tests/gettext2.test
+++ b/tests/gettext2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gettext3.test b/tests/gettext3.test
index 560c01b..a30f5fb 100755
--- a/tests/gettext3.test
+++ b/tests/gettext3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gnits.test b/tests/gnits.test
index 7803a2a..fda8c5c 100755
--- a/tests/gnits.test
+++ b/tests/gnits.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gnits2.test b/tests/gnits2.test
index 255ba7b..d65586f 100755
--- a/tests/gnits2.test
+++ b/tests/gnits2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2007, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gnits3.test b/tests/gnits3.test
index 5813527..17ab6f0 100755
--- a/tests/gnits3.test
+++ b/tests/gnits3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gnumake.test b/tests/gnumake.test
index 22f2a65..8ad386b 100755
--- a/tests/gnumake.test
+++ b/tests/gnumake.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gnuwarn.test b/tests/gnuwarn.test
index a29ffb4..9b87f15 100755
--- a/tests/gnuwarn.test
+++ b/tests/gnuwarn.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/gnuwarn2.test b/tests/gnuwarn2.test
index b59f566..9ff3aea 100755
--- a/tests/gnuwarn2.test
+++ b/tests/gnuwarn2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/hdr-vars-defined-once.test b/tests/hdr-vars-defined-once.test
index 2b272b9..d0c5135 100755
--- a/tests/hdr-vars-defined-once.test
+++ b/tests/hdr-vars-defined-once.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2005, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/header.test b/tests/header.test
index 9d16747..ba33933 100755
--- a/tests/header.test
+++ b/tests/header.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help-depend.test b/tests/help-depend.test
index 651e048..bb128d4 100755
--- a/tests/help-depend.test
+++ b/tests/help-depend.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help-depend2.test b/tests/help-depend2.test
index d44ff7a..c2787eb 100755
--- a/tests/help-depend2.test
+++ b/tests/help-depend2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help-dmalloc.test b/tests/help-dmalloc.test
index dc8c4c1..afa94aa 100755
--- a/tests/help-dmalloc.test
+++ b/tests/help-dmalloc.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help-init.test b/tests/help-init.test
index 8b5ec71..3e8f40a 100755
--- a/tests/help-init.test
+++ b/tests/help-init.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help-lispdir.test b/tests/help-lispdir.test
index 9a72189..fd1ddfa 100755
--- a/tests/help-lispdir.test
+++ b/tests/help-lispdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help-multilib.test b/tests/help-multilib.test
index 6c31cde..512ec50 100755
--- a/tests/help-multilib.test
+++ b/tests/help-multilib.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help-python.test b/tests/help-python.test
index 9e4e48a..dca11db 100755
--- a/tests/help-python.test
+++ b/tests/help-python.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help-silent.test b/tests/help-silent.test
index 855be52..8953232 100755
--- a/tests/help-silent.test
+++ b/tests/help-silent.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help-upc.test b/tests/help-upc.test
index 0438b4d..8d41c58 100755
--- a/tests/help-upc.test
+++ b/tests/help-upc.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help.test b/tests/help.test
index 71e7f72..b1cc2d8 100755
--- a/tests/help.test
+++ b/tests/help.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help2.test b/tests/help2.test
index 0f710b7..de9e779 100755
--- a/tests/help2.test
+++ b/tests/help2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help3.test b/tests/help3.test
index 5c67a14..e72eed2 100755
--- a/tests/help3.test
+++ b/tests/help3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/help4.test b/tests/help4.test
index aba7145..21555ca 100755
--- a/tests/help4.test
+++ b/tests/help4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/hfs.test b/tests/hfs.test
index cf0a243..505932e 100755
--- a/tests/hfs.test
+++ b/tests/hfs.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/implicit.test b/tests/implicit.test
index 64feca7..9efb8fc 100755
--- a/tests/implicit.test
+++ b/tests/implicit.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/info.test b/tests/info.test
index cf03cbd..5c9529f 100755
--- a/tests/info.test
+++ b/tests/info.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/init.test b/tests/init.test
index 896bd27..474b90b 100755
--- a/tests/init.test
+++ b/tests/init.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/init2.test b/tests/init2.test
index 9e069eb..003a3e0 100755
--- a/tests/init2.test
+++ b/tests/init2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/insh2.test b/tests/insh2.test
index 11bde9b..fdefafa 100755
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2010, 2011
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test
index 7a8fcf7..bbca73e 100755
--- a/tests/install-info-dir.test
+++ b/tests/install-info-dir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/install2.test b/tests/install2.test
index a04c0af..8313701 100755
--- a/tests/install2.test
+++ b/tests/install2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/installdir.test b/tests/installdir.test
index faa074d..f632be6 100755
--- a/tests/installdir.test
+++ b/tests/installdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instdat.test b/tests/instdat.test
index 544b6cb..011ba4f 100755
--- a/tests/instdat.test
+++ b/tests/instdat.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instdat2.test b/tests/instdat2.test
index 7dd911a..8773fc3 100755
--- a/tests/instdat2.test
+++ b/tests/instdat2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instdir-java.test b/tests/instdir-java.test
index 5885b27..33294d0 100755
--- a/tests/instdir-java.test
+++ b/tests/instdir-java.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instdir-lisp.test b/tests/instdir-lisp.test
index 05957fd..d26e222 100755
--- a/tests/instdir-lisp.test
+++ b/tests/instdir-lisp.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instdir-ltlib.test b/tests/instdir-ltlib.test
index fbe879b..65065a0 100755
--- a/tests/instdir-ltlib.test
+++ b/tests/instdir-ltlib.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instdir-prog.test b/tests/instdir-prog.test
index 85df840..e96a434 100755
--- a/tests/instdir-prog.test
+++ b/tests/instdir-prog.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instdir-python.test b/tests/instdir-python.test
index df3c8ca..5fca61c 100755
--- a/tests/instdir-python.test
+++ b/tests/instdir-python.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instdir-texi.test b/tests/instdir-texi.test
index 04a37b2..66b5c69 100755
--- a/tests/instdir-texi.test
+++ b/tests/instdir-texi.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instdir.test b/tests/instdir.test
index a348969..9b78121 100755
--- a/tests/instdir.test
+++ b/tests/instdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instdir2.test b/tests/instdir2.test
index 9b702df..a81ecbc 100755
--- a/tests/instdir2.test
+++ b/tests/instdir2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instexec.test b/tests/instexec.test
index f3f5a5d..c033ecd 100755
--- a/tests/instexec.test
+++ b/tests/instexec.test
@@ -1,6 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instfail-info.test b/tests/instfail-info.test
index 3ac2986..510f610 100755
--- a/tests/instfail-info.test
+++ b/tests/instfail-info.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instfail-java.test b/tests/instfail-java.test
index 7daf387..18aa53c 100755
--- a/tests/instfail-java.test
+++ b/tests/instfail-java.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instfail-libtool.test b/tests/instfail-libtool.test
index d137603..e45f45b 100755
--- a/tests/instfail-libtool.test
+++ b/tests/instfail-libtool.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instfail.test b/tests/instfail.test
index 9d5b571..2d65d13 100755
--- a/tests/instfail.test
+++ b/tests/instfail.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/insthook.test b/tests/insthook.test
index 51fcc34..aa7b19e 100755
--- a/tests/insthook.test
+++ b/tests/insthook.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2005, 2007, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instman.test b/tests/instman.test
index 7557705..7c47ac7 100755
--- a/tests/instman.test
+++ b/tests/instman.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2001, 2002, 2003, 2006, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instman2.test b/tests/instman2.test
index d082c08..04663db 100755
--- a/tests/instman2.test
+++ b/tests/instman2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instmany-mans.test b/tests/instmany-mans.test
index 76f24d6..8bc9884 100755
--- a/tests/instmany-mans.test
+++ b/tests/instmany-mans.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instmany-python.test b/tests/instmany-python.test
index 069172c..714ef1d 100755
--- a/tests/instmany-python.test
+++ b/tests/instmany-python.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instmany.test b/tests/instmany.test
index 671581a..d513325 100755
--- a/tests/instmany.test
+++ b/tests/instmany.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instsh.test b/tests/instsh.test
index 53397c3..79736d4 100755
--- a/tests/instsh.test
+++ b/tests/instsh.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1999, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instsh2.test b/tests/instsh2.test
index 45e1746..56b7003 100755
--- a/tests/instsh2.test
+++ b/tests/instsh2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2006, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instsh3.test b/tests/instsh3.test
index 80c2e54..3a527cb 100755
--- a/tests/instsh3.test
+++ b/tests/instsh3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/instspc.tap b/tests/instspc.tap
index ac18e1d..c9781d3 100755
--- a/tests/instspc.tap
+++ b/tests/instspc.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/interp.test b/tests/interp.test
index 911dc65..e0e8f57 100755
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/interp2.test b/tests/interp2.test
index 804305e..e9ca2b1 100755
--- a/tests/interp2.test
+++ b/tests/interp2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-check.test b/tests/java-check.test
index 86b5f05..cf926f1 100755
--- a/tests/java-check.test
+++ b/tests/java-check.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-clean.test b/tests/java-clean.test
index c837ff7..7b4e08b 100755
--- a/tests/java-clean.test
+++ b/tests/java-clean.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-compile-install.test b/tests/java-compile-install.test
index d947da3..7472bcf 100755
--- a/tests/java-compile-install.test
+++ b/tests/java-compile-install.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-compile-run-flat.test b/tests/java-compile-run-flat.test
index d81b0aa..ba74bf3 100755
--- a/tests/java-compile-run-flat.test
+++ b/tests/java-compile-run-flat.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-compile-run-nested.test
b/tests/java-compile-run-nested.test
index c811a3a..d3cd181 100755
--- a/tests/java-compile-run-nested.test
+++ b/tests/java-compile-run-nested.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-empty-classpath.test b/tests/java-empty-classpath.test
index 77270b4..f229383 100755
--- a/tests/java-empty-classpath.test
+++ b/tests/java-empty-classpath.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-extra.test b/tests/java-extra.test
index cc5d893..bab71af 100755
--- a/tests/java-extra.test
+++ b/tests/java-extra.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-mix.test b/tests/java-mix.test
index 44d8d83..25ce6d9 100755
--- a/tests/java-mix.test
+++ b/tests/java-mix.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-no-duplicate.test b/tests/java-no-duplicate.test
index d441c44..416fdb9 100755
--- a/tests/java-no-duplicate.test
+++ b/tests/java-no-duplicate.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-nobase.test b/tests/java-nobase.test
index b5e86dc..75ab418 100755
--- a/tests/java-nobase.test
+++ b/tests/java-nobase.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-noinst.test b/tests/java-noinst.test
index eb90aa9..ba33771 100755
--- a/tests/java-noinst.test
+++ b/tests/java-noinst.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-rebuild.test b/tests/java-rebuild.test
index 0b5ad64..4807594 100755
--- a/tests/java-rebuild.test
+++ b/tests/java-rebuild.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-sources.test b/tests/java-sources.test
index 9bf8855..cc8b7da 100755
--- a/tests/java-sources.test
+++ b/tests/java-sources.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java-uninstall.test b/tests/java-uninstall.test
index c1672e7..2c44d9c 100755
--- a/tests/java-uninstall.test
+++ b/tests/java-uninstall.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java.test b/tests/java.test
index fdf2092..c5881aa 100755
--- a/tests/java.test
+++ b/tests/java.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004, 2007, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java2.test b/tests/java2.test
index b4f1daf..d714308 100755
--- a/tests/java2.test
+++ b/tests/java2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/java3.test b/tests/java3.test
index 836133b..41b3ae2 100755
--- a/tests/java3.test
+++ b/tests/java3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/javadir-undefined.test b/tests/javadir-undefined.test
index 548865d..d3ca2a4 100755
--- a/tests/javadir-undefined.test
+++ b/tests/javadir-undefined.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/javaflags.test b/tests/javaflags.test
index 0e1d45d..db3c787 100755
--- a/tests/javaflags.test
+++ b/tests/javaflags.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/javaprim.test b/tests/javaprim.test
index f80cec9..3995ef9 100755
--- a/tests/javaprim.test
+++ b/tests/javaprim.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/javasubst.test b/tests/javasubst.test
index 7d6dd9c..78b76ee 100755
--- a/tests/javasubst.test
+++ b/tests/javasubst.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ldadd.test b/tests/ldadd.test
index 4c5dd7b..cf047dc 100755
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ldflags.test b/tests/ldflags.test
index 92fb42c..729dfe9 100755
--- a/tests/ldflags.test
+++ b/tests/ldflags.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lex-clean-cxx.test b/tests/lex-clean-cxx.test
new file mode 100755
index 0000000..453c353
--- /dev/null
+++ b/tests/lex-clean-cxx.test
@@ -0,0 +1,125 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check that C++ source and header files derived from non-distributed
+# Yacc sources are cleaned by "make clean", while C++ source and
+# header files derived from distributed Yacc sources are cleaned by
+# "make maintainer-clean".
+# See also sister test `lex-clean.test'.
+
+required=lex
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CXX
+AC_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz qux
+
+foo_SOURCES = mainfoo.cc parsefoo.lxx
+
+bar_SOURCES = mainbar.cpp parsebar.ll
+bar_LFLAGS = $(AM_LFLAGS)
+
+baz_SOURCES = mainbaz.c++
+nodist_baz_SOURCES = parsebaz.l++
+
+qux_SOURCES = mainqux.cxx
+nodist_qux_SOURCES = parsequx.lpp
+qux_LFLAGS = $(AM_LFLAGS)
+
+parsebaz.l++ parsequx.lpp:
+ cp $(srcdir)/parsefoo.lxx $@
+
+CLEANFILES = parsebaz.l++ parsequx.lpp
+
+LDADD = $(LEXLIB)
+END
+
+cat > parsefoo.lxx << 'END'
+%%
+"GOOD" return EOF;
+.
+%%
+int yywrap (void)
+{
+ return 1;
+}
+END
+cp parsefoo.lxx parsebar.ll
+
+cat > mainfoo.cc << 'END'
+// This file should contain valid C++ but invalid C.
+using namespace std;
+int main (int argc, char **argv)
+{
+ extern int yylex (void);
+ return yylex ();
+}
+END
+cp mainfoo.cc mainbar.cpp
+cp mainfoo.cc mainbaz.c++
+cp mainfoo.cc mainqux.cxx
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+cp config.status config.sav
+
+$MAKE
+ls -l
+# Sanity checks.
+test -f parsefoo.cxx
+test -f bar-parsebar.cc
+test -f parsebaz.l++
+test -f parsebaz.c++
+test -f parsequx.lpp
+test -f qux-parsequx.cpp
+
+for target in clean distclean; do
+ $MAKE $target
+ ls -l
+ test -f parsefoo.cxx
+ test -f bar-parsebar.cc
+ test ! -r parsebaz.l++
+ test ! -r parsebaz.c++
+ test ! -r parsequx.lpp
+ test ! -r qux-parsequx.cpp
+done
+
+cp config.sav config.status
+./config.status # re-create Makefile
+
+$MAKE maintainer-clean
+ls -l
+test -f parsefoo.lxx
+test -f parsebar.ll
+test ! -r parsefoo.cxx
+test ! -r bar-parsebar.cc
+test -f parsefoo.lxx
+test -f parsebar.ll
+test ! -r parsefoo.cxx
+test ! -r bar-parsebar.cc
+
+:
diff --git a/tests/lex-clean.test b/tests/lex-clean.test
new file mode 100755
index 0000000..06f8d89
--- /dev/null
+++ b/tests/lex-clean.test
@@ -0,0 +1,113 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check that .c files derived from non-distributed .l sources
+# are cleaned by "make clean", while .c files derived from
+# distributed .l sources are cleaned by "make maintainer-clean".
+# See also sister test `lex-clean-cxx.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz qux
+
+foo_SOURCES = main.c lexer.l
+
+bar_SOURCES = main.c lexer.l
+bar_LFLAGS = $(AM_LFLAGS)
+
+baz_SOURCES = main.c
+nodist_baz_SOURCES = baz.l
+
+qux_SOURCES = main.c
+nodist_qux_SOURCES = baz.l
+qux_LFLAGS = $(AM_LFLAGS)
+
+baz.l:
+ cp $(srcdir)/lexer.l $@
+
+CLEANFILES = baz.l
+
+LDADD = $(LEXLIB)
+END
+
+cat > lexer.l << 'END'
+%%
+"GOOD" return EOF;
+.
+END
+
+cat > main.c << 'END'
+int main (void)
+{
+ return yylex ();
+}
+
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+ return 1;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+cp config.status config.sav
+
+$MAKE
+ls -l
+# Sanity checks.
+test -f lexer.l
+test -f lexer.c
+test -f bar-lexer.c
+test -f baz.l
+test -f baz.c
+test -f qux-baz.c
+
+for target in clean distclean; do
+ $MAKE $target
+ ls -l
+ test -f lexer.l
+ test -f lexer.c
+ test -f bar-lexer.c
+ test ! -r baz.l
+ test ! -r baz.c
+ test ! -r qux-baz.c
+done
+
+cp config.sav config.status
+./config.status # re-create Makefile
+
+$MAKE maintainer-clean
+ls -l
+test -f lexer.l
+test ! -r lexer.c
+test ! -r bar-lexer.c
+
+:
diff --git a/tests/lex-depend-cxx.test b/tests/lex-depend-cxx.test
new file mode 100755
index 0000000..478a55f
--- /dev/null
+++ b/tests/lex-depend-cxx.test
@@ -0,0 +1,94 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure dependencies work with Lex/C++.
+# Test synthesized from PR automake/6.
+
+required=lex
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CXX
+AM_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = joe moe
+joe_SOURCES = joe.ll
+moe_SOURCES = moe.l++
+LDADD = $(LEXLIB)
+
+.PHONY: test-deps-exist
+test-deps-exist:
+ ls -l $(DEPDIR) ;: For debugging.
+ test -f $(DEPDIR)/joe.Po
+ test -f $(DEPDIR)/moe.Po
+
+.PHONY: test-obj-updated
+test-obj-updated: joe.$(OBJEXT) moe.$(OBJEXT)
+ stat older my-hdr.hxx joe.$(OBJEXT) moe.$(OBJEXT) || :
+ test `ls -t older joe.$(OBJEXT) | sed 1q` = joe.$(OBJEXT)
+ test `ls -t older moe.$(OBJEXT) | sed 1q` = moe.$(OBJEXT)
+END
+
+cat > joe.ll << 'END'
+%%
+"foo" return EOF;
+.
+%%
+#include "my-hdr.hxx"
+int yywrap (void)
+{
+ return 1;
+}
+int main (int argc, char **argv)
+{
+ printf("Hello, World!\n");
+ return 0;
+}
+END
+
+cp joe.ll moe.l++
+
+cat > my-hdr.hxx <<'END'
+// This header contains deliberetly invalid C (but valid C++)
+#include <cstdio>
+using namespace std;
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+$FGREP joe.Po Makefile.in
+$FGREP moe.Po Makefile.in
+
+$AUTOCONF
+# Try to enable dependency tracking if possible, even if that means
+# using slow dependency extractors.
+./configure --enable-dependency-tracking
+
+$MAKE test-deps-exist
+$MAKE
+
+: > older
+$sleep
+touch my-hdr.hxx
+$MAKE test-obj-updated
+
+:
diff --git a/tests/lex4.test b/tests/lex-depend-grep.test
similarity index 61%
rename from tests/lex4.test
rename to tests/lex-depend-grep.test
index f2bf574..e38f353 100755
--- a/tests/lex4.test
+++ b/tests/lex-depend-grep.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,8 +14,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure dependencies work with .ll files.
-# Test synthesized from PR automake/6.
+# Test to make sure dependencies for Lex and C/C++ does not break
+# in obvious ways. See PR automake/6, and related semantic tests
+# `lex-depend.test' and `lex-depend-cxx.test'.
. ./defs || Exit 1
@@ -27,13 +27,20 @@ AM_PROG_LEX
END
cat > Makefile.am << 'END'
-bin_PROGRAMS = zoo
+bin_PROGRAMS = zoo foo
zoo_SOURCES = joe.ll
+foo_SOURCES = moe.l
+noinst_PROGRAMS = zardoz
+zardoz_SOURCES = _0.l _1.ll _2.lxx _3.l++ _4.lpp
END
$ACLOCAL
$AUTOMAKE -a
-$FGREP joe.Po Makefile.in
+$EGREP '([mj]oe|_[01234]|include|\.P)' Makefile.in # For debugging.
+
+for x in joe moe _0 _1 _2 _3 _4; do
+ grep "include.*$x\.Po" Makefile.in
+done
:
diff --git a/tests/lex-depend.test b/tests/lex-depend.test
new file mode 100755
index 0000000..e2e37df
--- /dev/null
+++ b/tests/lex-depend.test
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure automatic dependency tracking work with Lex/C.
+# Test suggested by PR automake/6.
+
+required=lex
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AM_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zoo
+zoo_SOURCES = joe.l
+LDADD = $(LEXLIB)
+
+.PHONY: test-deps-exist
+test-deps-exist:
+ ls -l $(DEPDIR) ;: For debugging.
+ test -f $(DEPDIR)/joe.Po
+
+.PHONY: test-obj-updated
+test-obj-updated: joe.$(OBJEXT)
+ stat older my-hdr.h joe.$(OBJEXT) || : For debugging.
+ test `ls -t older joe.$(OBJEXT) | sed 1q` = joe.$(OBJEXT)
+END
+
+cat > joe.l << 'END'
+%%
+"foo" return EOF;
+.
+%%
+#include "my-hdr.h"
+int main (void)
+{
+ printf("%s\n", MESSAGE);
+ return 0;
+}
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+ return 1;
+}
+END
+
+cat > my-hdr.h <<'END'
+#include <stdio.h>
+#define MESSAGE "Hello, World!"
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+$FGREP joe.Po Makefile.in
+
+$AUTOCONF
+# Try to enable dependency tracking if possible, even if that means
+# using slow dependency extractors.
+./configure --enable-dependency-tracking
+
+$MAKE test-deps-exist
+$MAKE
+
+: > older
+$sleep
+touch my-hdr.h
+$MAKE test-obj-updated
+
+:
diff --git a/tests/lex-lib-external.test b/tests/lex-lib-external.test
index 1fb0009..d50ae39 100755
--- a/tests/lex-lib-external.test
+++ b/tests/lex-lib-external.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lex-lib.test b/tests/lex-lib.test
index 8339667..f874f37 100755
--- a/tests/lex-lib.test
+++ b/tests/lex-lib.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lex-libobj.test b/tests/lex-libobj.test
index 75831c4..3bd4f8a 100755
--- a/tests/lex-libobj.test
+++ b/tests/lex-libobj.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lex-line.test b/tests/lex-line.test
new file mode 100755
index 0000000..641bcaf
--- /dev/null
+++ b/tests/lex-line.test
@@ -0,0 +1,122 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake lex support ensures that lex-generated C
+# files use correct "#line" directives. Try also with the
+# `subdir-object' option enabled.
+# See also sister test `yacc-line.test'.
+
+required=lex
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_LEX
+AC_OUTPUT
+END
+
+mkdir dir sub sub/dir
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+bin_PROGRAMS = foo bar
+LDADD = $(LEXLIB)
+bar_LFLAGS = -v
+foo_SOURCES = zardoz.l
+bar_SOURCES = dir/quux.l
+## Avoid spurious failures with Solaris make.
address@hidden@: zardoz.c
address@hidden@: bar-quux.c
+END
+
+cat > sub/Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+noinst_PROGRAMS = foo bar
+## We already used $(LEXLIB) above, so try @LEXLIB@ now.
+LDADD = @LEXLIB@
+foo_LFLAGS = -v
+foo_SOURCES = zardoz.l
+bar_SOURCES = dir/quux.l
+## Avoid spurious failures with Solaris make.
address@hidden@: foo-zardoz.c
+dir/address@hidden@: dir/quux.c
+END
+
+cat > zardoz.l << 'END'
+%%
+"END" return EOF;
+.
+%%
+int main ()
+{
+ while (yylex () != EOF)
+ ;
+ return 0;
+}
+
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+ return 1;
+}
+END
+
+cp zardoz.l dir/quux.l
+cp zardoz.l sub/zardoz.l
+cp zardoz.l sub/dir/quux.l
+
+c_outputs='zardoz.c bar-quux.c sub/foo-zardoz.c sub/dir/quux.c'
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+for vpath in : false; do
+
+ if $vpath; then
+ srcdir=..
+ mkdir build
+ cd build
+ else
+ srcdir=.
+ fi
+
+ $srcdir/configure
+ $MAKE
+
+ # For debugging,
+ ls -l . sub sub/dir
+ $FGREP '.l' $c_outputs
+
+ # Adjusted "#line" should not contain reference to the builddir.
+ $EGREP '#.*line.*(build|\.\.).*\.l' $c_outputs && Exit 1
+ # Adjusted "#line" should not contain reference to the default
+ # output file names, e.g., `lex.yy.c'.
+ $EGREP '#.*line.*lex\.yy' $c_outputs && Exit 1
+ # Don't be excessively strict in grepping, to avoid spurious failures.
+ grep '#.*line.*zardoz\.l' zardoz.c
+ grep '#.*line.*quux\.l' bar-quux.c
+ grep '#.*line.*zardoz\.l' sub/foo-zardoz.c
+ grep '#.*line.*quux\.l' sub/dir/quux.c
+ cd $srcdir
+
+done
+
+:
diff --git a/tests/yacc-nodist.test b/tests/lex-nodist.test
similarity index 50%
copy from tests/yacc-nodist.test
copy to tests/lex-nodist.test
index 83f63dd..dc6c843 100755
--- a/tests/yacc-nodist.test
+++ b/tests/lex-nodist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,73 +14,63 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Checks for .c and .h files derived from non-distributed .y sources.
+# Checks for .c files derived from non-distributed .l sources.
+# The test `lex-pr204.test' does similar check with AM_MAINTAINER_MODE
+# enabled.
+# The tests 'yacc-nodist.test' and 'yacc-pr204.test' does similar checks
+# for yacc-generated .c and .h files.
-required='cc yacc'
+required=lex
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
-AC_PROG_YACC
-AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
+dnl Sister test 'lex-pr204.test' should use 'AC_PROG_LEX' instead.
+AM_PROG_LEX
AC_OUTPUT
END
cat > Makefile.am << 'END'
-SUBDIRS = sub1 sub2
-.PHONY: test
+.PHONY: test-build test-dist
test-build: all
- ls -l . sub1 sub2
- test -f sub1/parse.y
- test -f sub1/parse.c
- test -f sub2/parse.y
- test -f sub2/parse.c
- test -f sub2/parse.h
+ ls -l
+ test -f lexer.l
+ test -f lexer.c
test-dist: distdir
- ls -l $(distdir) $(distdir)/sub1 $(distdir)/sub2
- test ! -r $(distdir)/sub1/parse.y
- test ! -r $(distdir)/sub1/parse.c
- test ! -r $(distdir)/sub1/parse.h
- test ! -r $(distdir)/sub2/parse.y
- test ! -r $(distdir)/sub2/parse.c
- test ! -r $(distdir)/sub2/parse.h
+ ls -l $(distdir)
+ test ! -r $(distdir)/lexer.l
+ test ! -r $(distdir)/lexer.c
check-local: test-build test-dist
-END
-
-mkdir sub1 sub2
-cat > sub1/Makefile.am << 'END'
-parse.y:
+lexer.l:
rm -f $@ address@hidden
:; { : \
- && echo "%{" \
- && echo "int yylex () { return 0; }" \
- && echo "void yyerror (char *s) {}" \
- && echo "%}" \
- && echo "%%" \
- && echo "maude : 'm' 'a' 'u' 'd' 'e' {}"; \
+ && echo '%%' \
+ && echo '"GOOD" return EOF;' \
+ && echo '.'; \
} > address@hidden
- chmod a-w address@hidden
- mv -f address@hidden $@
+ chmod a-w address@hidden && mv -f address@hidden $@
+
bin_PROGRAMS = prog
prog_SOURCES = main.c
-nodist_prog_SOURCES = parse.y
+nodist_prog_SOURCES = lexer.l
+prog_LDADD = $(LEXLIB)
CLEANFILES = $(nodist_prog_SOURCES)
END
-cat sub1/Makefile.am - > sub2/Makefile.am << 'END'
-AM_YFLAGS = -d
-BUILT_SOURCES = parse.h
-END
-
-cat > sub1/main.c << 'END'
+cat > main.c << 'END'
int main ()
{
- return yyparse ();
+ return yylex ();
+}
+
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+ return 1;
}
-END
-cat - sub1/main.c > sub2/main.c << 'END'
-#include "parse.h"
END
$ACLOCAL
diff --git a/tests/lex-noyywrap.test b/tests/lex-noyywrap.test
index 98561f2..5b002c8 100755
--- a/tests/lex-noyywrap.test
+++ b/tests/lex-noyywrap.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2010, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lex-pr204.test b/tests/lex-pr204.test
new file mode 100755
index 0000000..d991b36
--- /dev/null
+++ b/tests/lex-pr204.test
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Related to PR 204.
+# C sources derived from nodist_ lex sources should not be distributed.
+# See also related test `lex-nodist.test'.
+# The tests 'yacc-nodist.test' and 'yacc-pr204.test' does similar checks
+# for yacc-generated .c and .h files.
+
+required=lex
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in <<'EOF'
+AM_MAINTAINER_MODE
+AC_PROG_CC
+dnl We use AC_PROG_LEX deliberately.
+dnl Sister 'lex-nodist.test' should use 'AM_PROG_LEX' instead.
+AC_PROG_LEX
+AC_OUTPUT
+EOF
+
+# The LEXER2 intermediate variable is there to make sure Automake
+# matches 'nodist_' against the right variable name...
+cat > Makefile.am << 'EOF'
+EXTRA_PROGRAMS = foo
+LEXER2 = lexer2.l
+nodist_foo_SOURCES = lexer.l $(LEXER2)
+
+distdirtest: distdir
+ test ! -f $(distdir)/lexer.c
+ test ! -f $(distdir)/lexer.l
+ test ! -f $(distdir)/lexer.h
+ test ! -f $(distdir)/lexer2.c
+ test ! -f $(distdir)/lexer2.l
+ test ! -f $(distdir)/lexer2.h
+EOF
+
+cat > lexer.l << 'END'
+%%
+"GOOD" return EOF;
+.
+%%
+int main (void)
+{
+ return yylex ();
+}
+END
+
+cp lexer.l lexer2.l
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE distdirtest
+
+# Make sure lexer.c and lexer2.c are still targets.
+$MAKE lexer.c lexer2.c
+test -f lexer.c
+test -f lexer2.c
+
+# Ensure the rebuild rule works despite AM_MAINTAINER_MODE, because
+# it's a nodist_ lexer.
+$sleep
+touch lexer.l lexer2.l
+$sleep
+$MAKE lexer.c lexer2.c
+stat lexer.c lexer.l lexer2.c lexer2.l || : # For debugging.
+test `ls -t lexer.c lexer.l | sed 1q` = lexer.c
+test `ls -t lexer2.c lexer2.l | sed 1q` = lexer2.c
+
+:
diff --git a/tests/lex-subobj-nodep.test b/tests/lex-subobj-nodep.test
index 5db7168..ff5fd48 100755
--- a/tests/lex-subobj-nodep.test
+++ b/tests/lex-subobj-nodep.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
# Ensure subdirs for subdir scanners are generated when subdir-objects
# are used, even when dependency tracking is disabled.
-required='cc flex'
+required='cc lex'
. ./defs || Exit 1
cat >>configure.in <<\END
diff --git a/tests/lex.test b/tests/lex.test
index 3327eb4..3316550 100755
--- a/tests/lex.test
+++ b/tests/lex.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2001, 2002, 2006, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lex2.test b/tests/lex2.test
index 72be79d..af3eea7 100755
--- a/tests/lex2.test
+++ b/tests/lex2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lex3.test b/tests/lex3.test
index 01d9651..b8bb465 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2010, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +18,7 @@
# Test associated with PR 19.
# From Matthew D. Langston.
-required='cc flex'
+required='cc lex'
. ./defs || Exit 1
cat >> configure.in << 'END'
@@ -75,7 +74,7 @@ $MAKE distdir
test -f $distdir/foo.c
# Sanity check on distribution.
-$MAKE distcheck
+yl_distcheck
# While we are at it, make sure that foo.c is erased by
# maintainer-clean, and not by distclean.
diff --git a/tests/lex5.test b/tests/lex5.test
index df2eb4e..99fab8e 100755
--- a/tests/lex5.test
+++ b/tests/lex5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,7 +16,7 @@
# Test for subdir lexers.
-required='cc flex'
+required='cc lex'
. ./defs || Exit 1
cat >> configure.in << 'END'
@@ -56,15 +55,18 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
+# We expect ylwrap to be used and distributed even if there is
+# only one lexer.
+test -f ylwrap
+
mkdir sub
cd sub
../configure
$MAKE foo/foo.o
+ls -l # For debugging.
test -f foo/foo.c
test -f foo/foo.o
-# ylwrap is not needed
-test ! -f ./ylwrap
# Now, adds another lexer to test ylwrap.
@@ -82,10 +84,10 @@ END
$sleep
$AUTOMAKE -a --no-force
-test -f ./ylwrap
cd sub
$MAKE foo/foo2.o
+ls -l # For debugging.
test -f foo/foo2.c
test -f foo/foo2.o
diff --git a/tests/lexcpp.test b/tests/lexcpp.test
index 7fd409a..2b77c19 100755
--- a/tests/lexcpp.test
+++ b/tests/lexcpp.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lexvpath.test b/tests/lexvpath.test
index 106093e..0cdaf84 100755
--- a/tests/lexvpath.test
+++ b/tests/lexvpath.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
# Please keep this in sync with sister test `yaccvapth.test'.
-required='cc flex'
+required='cc lex'
. ./defs || Exit 1
cat > lexoutroot.in << 'END'
@@ -76,7 +76,7 @@ cd sub
test -n "$LEX_OUTPUT_ROOT" # Sanity check.
cd ..
-flex lexer.l
+$LEX lexer.l
mv "$LEX_OUTPUT_ROOT".c lexer.c
cd sub
diff --git a/tests/lflags.test b/tests/lflags.test
index 59b36f2..b8b83ca 100755
--- a/tests/lflags.test
+++ b/tests/lflags.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lflags2.test b/tests/lflags2.test
index 7fd0b8b..cdf9683 100755
--- a/tests/lflags2.test
+++ b/tests/lflags2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libexec.test b/tests/libexec.test
index a305f78..b993e53 100755
--- a/tests/libexec.test
+++ b/tests/libexec.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj-basic.test b/tests/libobj-basic.test
index 6578264..75a5cb1 100755
--- a/tests/libobj-basic.test
+++ b/tests/libobj-basic.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj10.test b/tests/libobj10.test
index d261018..ce5fc41 100755
--- a/tests/libobj10.test
+++ b/tests/libobj10.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2010, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj12.test b/tests/libobj12.test
index 73b1b61..8eafd97 100755
--- a/tests/libobj12.test
+++ b/tests/libobj12.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj13.test b/tests/libobj13.test
index 0022ea0..66e3fc4 100755
--- a/tests/libobj13.test
+++ b/tests/libobj13.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj14.test b/tests/libobj14.test
index 41b9ba1..d36af93 100755
--- a/tests/libobj14.test
+++ b/tests/libobj14.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj15a.test b/tests/libobj15a.test
index 1889d63..2c290ea 100755
--- a/tests/libobj15a.test
+++ b/tests/libobj15a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj15b.test b/tests/libobj15b.test
index 03415c2..107476c 100755
--- a/tests/libobj15b.test
+++ b/tests/libobj15b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj15c.test b/tests/libobj15c.test
index 603e2eb..da59eb0 100755
--- a/tests/libobj15c.test
+++ b/tests/libobj15c.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj16a.test b/tests/libobj16a.test
index 4a5709a..1f9fe01 100755
--- a/tests/libobj16a.test
+++ b/tests/libobj16a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj16b.test b/tests/libobj16b.test
index 1326a9e..fbb9bd7 100755
--- a/tests/libobj16b.test
+++ b/tests/libobj16b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj17.test b/tests/libobj17.test
index 2089ae4..bbb31d1 100755
--- a/tests/libobj17.test
+++ b/tests/libobj17.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj18.test b/tests/libobj18.test
index 66188c6..8792fc2 100755
--- a/tests/libobj18.test
+++ b/tests/libobj18.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj19.test b/tests/libobj19.test
index 243401f..eec26fb 100755
--- a/tests/libobj19.test
+++ b/tests/libobj19.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj2.test b/tests/libobj2.test
index 0f417a8..4d90afc 100755
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2010, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj20a.test b/tests/libobj20a.test
index b2f7063..1b26e6c 100755
--- a/tests/libobj20a.test
+++ b/tests/libobj20a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj20b.test b/tests/libobj20b.test
index 68a292b..e8872fb 100755
--- a/tests/libobj20b.test
+++ b/tests/libobj20b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj20c.test b/tests/libobj20c.test
index faeedc1..7408bc1 100755
--- a/tests/libobj20c.test
+++ b/tests/libobj20c.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj3.test b/tests/libobj3.test
index 10686f4..3eac992 100755
--- a/tests/libobj3.test
+++ b/tests/libobj3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj4.test b/tests/libobj4.test
index 8852262..31ee7ef 100755
--- a/tests/libobj4.test
+++ b/tests/libobj4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj5.test b/tests/libobj5.test
index d92aca1..ad26cda 100755
--- a/tests/libobj5.test
+++ b/tests/libobj5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libobj7.test b/tests/libobj7.test
index d18671c..a613216 100755
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/library.test b/tests/library.test
index 8ad40f1..edc0693 100755
--- a/tests/library.test
+++ b/tests/library.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2008, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/library2.test b/tests/library2.test
index 7bd3e62..f7b6f5a 100755
--- a/tests/library2.test
+++ b/tests/library2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/library3.test b/tests/library3.test
index 8e3a0c9..685eaee 100755
--- a/tests/library3.test
+++ b/tests/library3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtoo10.test b/tests/libtoo10.test
index f0f2e32..434080d 100755
--- a/tests/libtoo10.test
+++ b/tests/libtoo10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtoo11.test b/tests/libtoo11.test
index e7b7354..5d11f61 100755
--- a/tests/libtoo11.test
+++ b/tests/libtoo11.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtool-macros.test b/tests/libtool-macros.test
index a4ec095..428410d 100755
--- a/tests/libtool-macros.test
+++ b/tests/libtool-macros.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtool.test b/tests/libtool.test
index 87b55a7..deb6f36 100755
--- a/tests/libtool.test
+++ b/tests/libtool.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtool2.test b/tests/libtool2.test
index f2fe1af..21ad792 100755
--- a/tests/libtool2.test
+++ b/tests/libtool2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtool3.test b/tests/libtool3.test
index ad0f8c5..c1a3865 100755
--- a/tests/libtool3.test
+++ b/tests/libtool3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtool4.test b/tests/libtool4.test
index a694586..4efa8d3 100755
--- a/tests/libtool4.test
+++ b/tests/libtool4.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtool5.test b/tests/libtool5.test
index 23cf062..25fd526 100755
--- a/tests/libtool5.test
+++ b/tests/libtool5.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtool6.test b/tests/libtool6.test
index c4ae469..360d566 100755
--- a/tests/libtool6.test
+++ b/tests/libtool6.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtool7.test b/tests/libtool7.test
index 574b285..0c89a03 100755
--- a/tests/libtool7.test
+++ b/tests/libtool7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtool8.test b/tests/libtool8.test
index 3aefcf8..7a566d7 100755
--- a/tests/libtool8.test
+++ b/tests/libtool8.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/libtool9.test b/tests/libtool9.test
index 9d59a50..e801175 100755
--- a/tests/libtool9.test
+++ b/tests/libtool9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/license.test b/tests/license.test
index 3b39425..e3eeefc 100755
--- a/tests/license.test
+++ b/tests/license.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/license2.test b/tests/license2.test
index ca6a249..fab140a 100755
--- a/tests/license2.test
+++ b/tests/license2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/link_c_cxx.test b/tests/link_c_cxx.test
index fd3cdc3..86c2e0b 100755
--- a/tests/link_c_cxx.test
+++ b/tests/link_c_cxx.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/link_dist.test b/tests/link_dist.test
index 77c3785..1f2e997 100755
--- a/tests/link_dist.test
+++ b/tests/link_dist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/link_f90_only.test b/tests/link_f90_only.test
index 7afe52c..a111ffd 100755
--- a/tests/link_f90_only.test
+++ b/tests/link_f90_only.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/link_f_only.test b/tests/link_f_only.test
index 5484f58..1eabfb3 100755
--- a/tests/link_f_only.test
+++ b/tests/link_f_only.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/link_fc.test b/tests/link_fc.test
index 78a2457..d1e3614 100755
--- a/tests/link_fc.test
+++ b/tests/link_fc.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/link_fccxx.test b/tests/link_fccxx.test
index c609955..2f9695a 100755
--- a/tests/link_fccxx.test
+++ b/tests/link_fccxx.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/link_fcxx.test b/tests/link_fcxx.test
index 75aee34..b1a6fc5 100755
--- a/tests/link_fcxx.test
+++ b/tests/link_fcxx.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/link_override.test b/tests/link_override.test
index bcce05a..b48fcea 100755
--- a/tests/link_override.test
+++ b/tests/link_override.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lisp2.test b/tests/lisp2.test
index 9ce19f7..25d174f 100755
--- a/tests/lisp2.test
+++ b/tests/lisp2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lisp3.test b/tests/lisp3.test
index aaf17c5..da00874 100755
--- a/tests/lisp3.test
+++ b/tests/lisp3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lisp4.test b/tests/lisp4.test
index 8f1bfe5..4fb1958 100755
--- a/tests/lisp4.test
+++ b/tests/lisp4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lisp5.test b/tests/lisp5.test
index 59bd8ec..88629d1 100755
--- a/tests/lisp5.test
+++ b/tests/lisp5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2007, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lisp6.test b/tests/lisp6.test
index 1af351c..b35143e 100755
--- a/tests/lisp6.test
+++ b/tests/lisp6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2005, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lisp7.test b/tests/lisp7.test
index f1d0093..81fa24d 100755
--- a/tests/lisp7.test
+++ b/tests/lisp7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lisp8.test b/tests/lisp8.test
index 81f748f..18c12ef 100755
--- a/tests/lisp8.test
+++ b/tests/lisp8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lispdry.test b/tests/lispdry.test
index e786ec3..21b940c 100755
--- a/tests/lispdry.test
+++ b/tests/lispdry.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 0347709..48eaa45 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -2,8 +2,7 @@
## testsuite. This fragment is meant to be included by the Makefile.am,
## but also to be executed directly by make when bootstrapping automake.
-## Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-## Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+## Copyright (C) 2011-2012 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -285,7 +284,7 @@ confsub.test \
confvar.test \
confvar2.test \
copy.test \
-cscope.test \
+cscope.tap \
cscope2.test \
cscope3.test \
cxx.test \
@@ -515,7 +514,6 @@ ldflags.test \
lex.test \
lex2.test \
lex3.test \
-lex4.test \
lex5.test \
lexcpp.test \
lexvpath.test \
@@ -524,6 +522,14 @@ lex-lib.test \
lex-lib-external.test \
lex-libobj.test \
lex-noyywrap.test \
+lex-clean-cxx.test \
+lex-clean.test \
+lex-depend-cxx.test \
+lex-depend-grep.test \
+lex-depend.test \
+lex-line.test \
+lex-nodist.test \
+lex-pr204.test \
lflags.test \
lflags2.test \
libexec.test \
@@ -780,7 +786,6 @@ pr2.test \
pr9.test \
pr72.test \
pr87.test \
-pr204.test \
pr211.test \
pr220.test \
pr224.test \
@@ -874,6 +879,7 @@ req.test \
reqd.test \
reqd2.test \
repeated-options.test \
+rst-formatting.test \
rulepat.test \
self-check-cleanup.tap \
self-check-configure-help.test \
@@ -907,11 +913,10 @@ silentf77.test \
silentf90.test \
silent-many-gcc.test \
silent-many-generic.test \
-silent-lex-gcc.test \
-silent-lex-generic.test \
-silent-yacc-gcc.test \
-silent-yacc-generic.test \
silent-configsite.test \
+silent-lex.test \
+silent-yacc.test \
+silent-yacc-headers.test \
srcsub.test \
srcsub2.test \
space.test \
@@ -1167,31 +1172,43 @@ werror3.test \
werror4.test \
whoami.test \
xsource.test \
-yacc-basic.test \
-yacc-d-basic.test \
-yacc-clean.test \
yacc.test \
yacc2.test \
yacc4.test \
yacc5.test \
-yacc6.test \
yacc7.test \
yacc8.test \
yaccdry.test \
-yacc-subobj-nodep.test \
-yacc-dist-nobuild.test \
-yacc-nodist.test \
yaccpp.test \
yaccvpath.test \
+yacc-auxdir.test \
+yacc-basic.test \
+yacc-cxx.test \
+yacc-bison-skeleton-cxx.test \
+yacc-bison-skeleton.test \
+yacc-clean.test \
+yacc-clean-cxx.test \
+yacc-d-basic.test \
+yacc-d-cxx.test \
yacc-d-vpath.test \
+yacc-deleted-headers.test \
+yacc-depend.test \
+yacc-depend2.test \
yacc-dist-nobuild-subdir.test \
+yacc-dist-nobuild.test \
+yacc-line.test \
+yacc-mix-c-cxx.test \
+yacc-nodist.test \
+yacc-pr204.test \
+yacc-subobj-nodep.test \
+yacc-weirdnames.test \
yflags.test \
yflags2.test \
yflags-cmdline-override.test \
yflags-conditional.test \
yflags-d-false-positives.test \
-yflags-force-override.test \
yflags-force-conditional.test \
+yflags-force-override.test \
yflags-var-expand.test \
libtool-macros.test \
gettext-macros.test
diff --git a/tests/listval.test b/tests/listval.test
index 6bd933d..66016a5 100755
--- a/tests/listval.test
+++ b/tests/listval.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/location.test b/tests/location.test
index eee4797..8c77185 100755
--- a/tests/location.test
+++ b/tests/location.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/longlin2.test b/tests/longlin2.test
index 1d30b28..b156b55 100755
--- a/tests/longlin2.test
+++ b/tests/longlin2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/longline.test b/tests/longline.test
index 77f6e1e..dd5664d 100755
--- a/tests/longline.test
+++ b/tests/longline.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ltcond.test b/tests/ltcond.test
index 6af0ee1..1698d4c 100755
--- a/tests/ltcond.test
+++ b/tests/ltcond.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003, 2004, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ltcond2.test b/tests/ltcond2.test
index 4f28cc6..405adf9 100755
--- a/tests/ltcond2.test
+++ b/tests/ltcond2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ltconv.test b/tests/ltconv.test
index 00c8cd7..c5f7085 100755
--- a/tests/ltconv.test
+++ b/tests/ltconv.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003, 2004, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ltdeps.test b/tests/ltdeps.test
index 8f47402..3ff2515 100755
--- a/tests/ltdeps.test
+++ b/tests/ltdeps.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ltinit.test b/tests/ltinit.test
index 64bc679..73af62e 100755
--- a/tests/ltinit.test
+++ b/tests/ltinit.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ltinstloc.test b/tests/ltinstloc.test
index dd8f63c..1263caa 100755
--- a/tests/ltinstloc.test
+++ b/tests/ltinstloc.test
@@ -1,6 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ltlibobjs.test b/tests/ltlibobjs.test
index e430cdd..a73019c 100755
--- a/tests/ltlibobjs.test
+++ b/tests/ltlibobjs.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ltlibsrc.test b/tests/ltlibsrc.test
index aea10d8..f68f459 100755
--- a/tests/ltlibsrc.test
+++ b/tests/ltlibsrc.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ltorder.test b/tests/ltorder.test
index 594a2f4..da834d7 100755
--- a/tests/ltorder.test
+++ b/tests/ltorder.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/lzma.test b/tests/lzma.test
index f0c284b..59dd545 100755
--- a/tests/lzma.test
+++ b/tests/lzma.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2007, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/m4-inclusion.test b/tests/m4-inclusion.test
index c9106ae..ddea64d 100755
--- a/tests/m4-inclusion.test
+++ b/tests/m4-inclusion.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2005, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/maintclean-vpath.test b/tests/maintclean-vpath.test
index 5b5420c..44c06ea 100755
--- a/tests/maintclean-vpath.test
+++ b/tests/maintclean-vpath.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/maintclean.test b/tests/maintclean.test
index aeda04c..d64f9a9 100755
--- a/tests/maintclean.test
+++ b/tests/maintclean.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/maintmode-configure-msg.test
b/tests/maintmode-configure-msg.test
index f330bd0..3cfbb7b 100755
--- a/tests/maintmode-configure-msg.test
+++ b/tests/maintmode-configure-msg.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/makefile-deps.test b/tests/makefile-deps.test
index bfe0d67..83f3cae 100755
--- a/tests/makefile-deps.test
+++ b/tests/makefile-deps.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/makej.test b/tests/makej.test
index 1ae4139..6c82111 100755
--- a/tests/makej.test
+++ b/tests/makej.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/makej2.test b/tests/makej2.test
index 3025c06..1b96e75 100755
--- a/tests/makej2.test
+++ b/tests/makej2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/maken.test b/tests/maken.test
index bc0d5af..c5d6fc5 100755
--- a/tests/maken.test
+++ b/tests/maken.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/maken3.test b/tests/maken3.test
index 1fd07c7..c4474b0 100755
--- a/tests/maken3.test
+++ b/tests/maken3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/makevars.test b/tests/makevars.test
index e494373..ad18830 100755
--- a/tests/makevars.test
+++ b/tests/makevars.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/man.test b/tests/man.test
index 3e326ea..6bbd46f 100755
--- a/tests/man.test
+++ b/tests/man.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/man2.test b/tests/man2.test
index 6777f97..ec86273 100755
--- a/tests/man2.test
+++ b/tests/man2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/man3.test b/tests/man3.test
index 1838b09..50d5df7 100755
--- a/tests/man3.test
+++ b/tests/man3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/man4.test b/tests/man4.test
index 9052511..d524355 100755
--- a/tests/man4.test
+++ b/tests/man4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/man5.test b/tests/man5.test
index 955442e..bdd3d59 100755
--- a/tests/man5.test
+++ b/tests/man5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/man6.test b/tests/man6.test
index be96188..aa49049 100755
--- a/tests/man6.test
+++ b/tests/man6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/man7.test b/tests/man7.test
index 9f4f9ad..b850228 100755
--- a/tests/man7.test
+++ b/tests/man7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/man8.test b/tests/man8.test
index 2257627..e03341b 100755
--- a/tests/man8.test
+++ b/tests/man8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mdate.test b/tests/mdate.test
index 5d7810e..b33bf63 100755
--- a/tests/mdate.test
+++ b/tests/mdate.test
@@ -1,6 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mdate2.test b/tests/mdate2.test
index c577031..093de5e 100755
--- a/tests/mdate2.test
+++ b/tests/mdate2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mdate3.test b/tests/mdate3.test
index 970bd54..393e926 100755
--- a/tests/mdate3.test
+++ b/tests/mdate3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mdate4.test b/tests/mdate4.test
index dcac0fc..c5ba431 100755
--- a/tests/mdate4.test
+++ b/tests/mdate4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mdate5.test b/tests/mdate5.test
index db6a6c6..4cef952 100755
--- a/tests/mdate5.test
+++ b/tests/mdate5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004, 2007, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mdate6.test b/tests/mdate6.test
index de93f35..ca3ca21 100755
--- a/tests/mdate6.test
+++ b/tests/mdate6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/missing-auxfile-stops-makefiles-creation.test
b/tests/missing-auxfile-stops-makefiles-creation.test
index 6492a14..1324ef9 100755
--- a/tests/missing-auxfile-stops-makefiles-creation.test
+++ b/tests/missing-auxfile-stops-makefiles-creation.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/missing.test b/tests/missing.test
index 0ca5786..7055bca 100755
--- a/tests/missing.test
+++ b/tests/missing.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2006, 2007, 2008, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/missing2.test b/tests/missing2.test
index 5df575e..e9dc19b 100755
--- a/tests/missing2.test
+++ b/tests/missing2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2006, 2007, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/missing3.test b/tests/missing3.test
index 20b2429..a26f954 100755
--- a/tests/missing3.test
+++ b/tests/missing3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/missing4.test b/tests/missing4.test
index 767794a..64018d1 100755
--- a/tests/missing4.test
+++ b/tests/missing4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2007, 2008, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/missing5.test b/tests/missing5.test
index 0cb71e8..20ecb8f 100755
--- a/tests/missing5.test
+++ b/tests/missing5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/missing6.test b/tests/missing6.test
index b6f1562..cfc4840 100755
--- a/tests/missing6.test
+++ b/tests/missing6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mkinst2.test b/tests/mkinst2.test
index 3058803..a871305 100755
--- a/tests/mkinst2.test
+++ b/tests/mkinst2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2007, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mkinst3.test b/tests/mkinst3.test
index 9dba968..fbe01c6 100755
--- a/tests/mkinst3.test
+++ b/tests/mkinst3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mkinstall.test b/tests/mkinstall.test
index 1f1bac8..e6b3bc2 100755
--- a/tests/mkinstall.test
+++ b/tests/mkinstall.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mmode.test b/tests/mmode.test
index 1dd64e7..95b386d 100755
--- a/tests/mmode.test
+++ b/tests/mmode.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/mmodely.test b/tests/mmodely.test
index 111dc8b..8bc8ae7 100755
--- a/tests/mmodely.test
+++ b/tests/mmodely.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2006, 2007, 2009, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/multlib.test b/tests/multlib.test
index c5c508b..0f9b890 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2007, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/no-extra-makefile-code.test
b/tests/no-extra-makefile-code.test
index 73d5458..d0b18fb 100755
--- a/tests/no-extra-makefile-code.test
+++ b/tests/no-extra-makefile-code.test
@@ -1,6 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/no-outdir-option.test b/tests/no-outdir-option.test
index 85921fc..c227af7 100755
--- a/tests/no-outdir-option.test
+++ b/tests/no-outdir-option.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nobase-libtool.test b/tests/nobase-libtool.test
index 43c0702..4e8ddfa 100755
--- a/tests/nobase-libtool.test
+++ b/tests/nobase-libtool.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nobase-nodist.test b/tests/nobase-nodist.test
index 4ea9df4..01d5c11 100755
--- a/tests/nobase-nodist.test
+++ b/tests/nobase-nodist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nobase-python.test b/tests/nobase-python.test
index 3974ca5..9863fff 100755
--- a/tests/nobase-python.test
+++ b/tests/nobase-python.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nobase.test b/tests/nobase.test
index 231eb73..4bbaee5 100755
--- a/tests/nobase.test
+++ b/tests/nobase.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2011
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nodef.test b/tests/nodef.test
index e8389a0..9f8df0b 100755
--- a/tests/nodef.test
+++ b/tests/nodef.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nodef2.test b/tests/nodef2.test
index 4b5a431..8190ebe 100755
--- a/tests/nodef2.test
+++ b/tests/nodef2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nodep.test b/tests/nodep.test
index 0d140eb..b87c2ac 100755
--- a/tests/nodep.test
+++ b/tests/nodep.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nodep2.test b/tests/nodep2.test
index f45ee2c..a79d698 100755
--- a/tests/nodep2.test
+++ b/tests/nodep2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nodepcomp.test b/tests/nodepcomp.test
index 7042ae9..4691efa 100755
--- a/tests/nodepcomp.test
+++ b/tests/nodepcomp.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nodist.test b/tests/nodist.test
index e300b91..6636e91 100755
--- a/tests/nodist.test
+++ b/tests/nodist.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nodist2.test b/tests/nodist2.test
index c7a8563..3c6e8c7 100755
--- a/tests/nodist2.test
+++ b/tests/nodist2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nodist3.test b/tests/nodist3.test
index 31f7490..59a6727 100755
--- a/tests/nodist3.test
+++ b/tests/nodist3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/noinst.test b/tests/noinst.test
index ac4ff66..887c7a7 100755
--- a/tests/noinst.test
+++ b/tests/noinst.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/noinstdir.test b/tests/noinstdir.test
index 329990e..9b3d8f6 100755
--- a/tests/noinstdir.test
+++ b/tests/noinstdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nolink.test b/tests/nolink.test
index ca67339..dea6271 100755
--- a/tests/nolink.test
+++ b/tests/nolink.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index 07f91f1..3230b2d 100755
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/notrans.test b/tests/notrans.test
index ce38926..e524f7d 100755
--- a/tests/notrans.test
+++ b/tests/notrans.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/number.test b/tests/number.test
index 7a0d1ee..fb6b455 100755
--- a/tests/number.test
+++ b/tests/number.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/objc.test b/tests/objc.test
index 0ea5b40..8f74b78 100755
--- a/tests/objc.test
+++ b/tests/objc.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2006, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/objc2.test b/tests/objc2.test
index 3080d5c..4864f8e 100755
--- a/tests/objc2.test
+++ b/tests/objc2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/obsolete.test b/tests/obsolete.test
index 4fd126a..00cbdae 100755
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2007, 2008, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/oldvars.test b/tests/oldvars.test
index 242056e..87d9cf1 100755
--- a/tests/oldvars.test
+++ b/tests/oldvars.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/order.test b/tests/order.test
index b1030fa..2dbee35 100755
--- a/tests/order.test
+++ b/tests/order.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output-order.test b/tests/output-order.test
index 259b34d..f260672 100755
--- a/tests/output-order.test
+++ b/tests/output-order.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output.test b/tests/output.test
index 260dfcb..e241b1d 100755
--- a/tests/output.test
+++ b/tests/output.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output10.test b/tests/output10.test
index b20cae2..904e2bf 100755
--- a/tests/output10.test
+++ b/tests/output10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output11.test b/tests/output11.test
index e8e2c80..8291fa5 100755
--- a/tests/output11.test
+++ b/tests/output11.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output12.test b/tests/output12.test
index 4297373..11a8f36 100755
--- a/tests/output12.test
+++ b/tests/output12.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output13.test b/tests/output13.test
index 810c280..21fd4fe 100755
--- a/tests/output13.test
+++ b/tests/output13.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output2.test b/tests/output2.test
index 28850a4..e7614da 100755
--- a/tests/output2.test
+++ b/tests/output2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output3.test b/tests/output3.test
index 2626113..30df453 100755
--- a/tests/output3.test
+++ b/tests/output3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output4.test b/tests/output4.test
index 41fabf9..f4ee145 100755
--- a/tests/output4.test
+++ b/tests/output4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output5.test b/tests/output5.test
index c46ccf2..4915370 100755
--- a/tests/output5.test
+++ b/tests/output5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output6.test b/tests/output6.test
index 6d75d06..0752712 100755
--- a/tests/output6.test
+++ b/tests/output6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output7.test b/tests/output7.test
index a49632f..dc9752e 100755
--- a/tests/output7.test
+++ b/tests/output7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output8.test b/tests/output8.test
index 4e610a9..a90280b 100755
--- a/tests/output8.test
+++ b/tests/output8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/output9.test b/tests/output9.test
index 98572be..10c30ce 100755
--- a/tests/output9.test
+++ b/tests/output9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/override-conditional-1.test
b/tests/override-conditional-1.test
index 54c2ca5..1f7b550 100755
--- a/tests/override-conditional-1.test
+++ b/tests/override-conditional-1.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/override-conditional-2.test
b/tests/override-conditional-2.test
index 0fc88c2..acaa497 100755
--- a/tests/override-conditional-2.test
+++ b/tests/override-conditional-2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/override-html.test b/tests/override-html.test
index c2c5ec6..f0783a6 100755
--- a/tests/override-html.test
+++ b/tests/override-html.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/override-suggest-local.test
b/tests/override-suggest-local.test
index 535ccd0..900e26d 100755
--- a/tests/override-suggest-local.test
+++ b/tests/override-suggest-local.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-am.test b/tests/parallel-am.test
index 453f7a5..b73f0f8 100755
--- a/tests/parallel-am.test
+++ b/tests/parallel-am.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-am2.test b/tests/parallel-am2.test
index b51bd1f..3d8f987 100755
--- a/tests/parallel-am2.test
+++ b/tests/parallel-am2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-am3.test b/tests/parallel-am3.test
index 732bd41..dba3397 100755
--- a/tests/parallel-am3.test
+++ b/tests/parallel-am3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-cmdline-override.test
b/tests/parallel-tests-cmdline-override.test
index 238edb8..ed725ab 100755
--- a/tests/parallel-tests-cmdline-override.test
+++ b/tests/parallel-tests-cmdline-override.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-console-output.test
b/tests/parallel-tests-console-output.test
index 93c2429..a25b405 100755
--- a/tests/parallel-tests-console-output.test
+++ b/tests/parallel-tests-console-output.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-driver-install.test
b/tests/parallel-tests-driver-install.test
index 4fa6dfd..012602d 100755
--- a/tests/parallel-tests-driver-install.test
+++ b/tests/parallel-tests-driver-install.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-dry-run-2.test
b/tests/parallel-tests-dry-run-2.test
index 1181689..6cf1c23 100755
--- a/tests/parallel-tests-dry-run-2.test
+++ b/tests/parallel-tests-dry-run-2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-empty-testlogs.test
b/tests/parallel-tests-empty-testlogs.test
index 7e8c9a2..9e27041 100755
--- a/tests/parallel-tests-empty-testlogs.test
+++ b/tests/parallel-tests-empty-testlogs.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-exeext.test b/tests/parallel-tests-exeext.test
index 9275a56..05836ff 100755
--- a/tests/parallel-tests-exeext.test
+++ b/tests/parallel-tests-exeext.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-exit-statuses.test
b/tests/parallel-tests-exit-statuses.test
index ff5228e..69bd04c 100755
--- a/tests/parallel-tests-exit-statuses.test
+++ b/tests/parallel-tests-exit-statuses.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-extra-programs.test
b/tests/parallel-tests-extra-programs.test
index 00210eb..27942d8 100755
--- a/tests/parallel-tests-extra-programs.test
+++ b/tests/parallel-tests-extra-programs.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -117,7 +117,7 @@ $AUTOMAKE -a
# on *all* the test logs).
st=0
-$MAKE check >stdout 2>stderr || st=$?
+$MAKE -k check >stdout 2>stderr || st=$?
cat stdout
cat stderr >&2
ls -l
diff --git a/tests/parallel-tests-fd-redirect-exeext.test
b/tests/parallel-tests-fd-redirect-exeext.test
index 0f9d6da..09d6297 100755
--- a/tests/parallel-tests-fd-redirect-exeext.test
+++ b/tests/parallel-tests-fd-redirect-exeext.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -34,7 +34,11 @@ AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[#include <unistd.h>]],
[[write (9, "foobar\n", 7); return 0;]])],
[AM_RUN_LOG([./conftest$EXEEXT 9>&1]) \
- && AM_RUN_LOG([(./conftest$EXEEXT 9>&1) | grep "^foobar"]) \
+dnl Leading ":;" required to avoid having two nested subshells starting
+dnl with '((' in the generated configure: that is unportable and could
+dnl confuse some shells (e.g., NetBSD 5.1 /bin/ksh) into thinking we are
+dnl trying to perform an arithmetic operation.
+ && AM_RUN_LOG([:; (./conftest$EXEEXT 9>&1) | grep "^foobar"]) \
&& am__ok=yes])
test $am__ok = yes || AS_EXIT([63])
AM_CONDITIONAL([real_EXEEXT], [test -n "$EXEEXT"])
diff --git a/tests/parallel-tests-fd-redirect.test
b/tests/parallel-tests-fd-redirect.test
index f22b31a..4af48da 100755
--- a/tests/parallel-tests-fd-redirect.test
+++ b/tests/parallel-tests-fd-redirect.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-fork-bomb.test
b/tests/parallel-tests-fork-bomb.test
index 62cc3e7..1f86c75 100755
--- a/tests/parallel-tests-fork-bomb.test
+++ b/tests/parallel-tests-fork-bomb.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-harderror.test
b/tests/parallel-tests-harderror.test
index 654400d..ae6765c 100755
--- a/tests/parallel-tests-harderror.test
+++ b/tests/parallel-tests-harderror.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-interrupt.tap
b/tests/parallel-tests-interrupt.tap
index 74b418d..795b01d 100755
--- a/tests/parallel-tests-interrupt.tap
+++ b/tests/parallel-tests-interrupt.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-log-compiler-1.test
b/tests/parallel-tests-log-compiler-1.test
index a726f9d..10a56b3 100755
--- a/tests/parallel-tests-log-compiler-1.test
+++ b/tests/parallel-tests-log-compiler-1.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-log-compiler-2.test
b/tests/parallel-tests-log-compiler-2.test
index a279abd..c3825a1 100755
--- a/tests/parallel-tests-log-compiler-2.test
+++ b/tests/parallel-tests-log-compiler-2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-log-compiler-example.test
b/tests/parallel-tests-log-compiler-example.test
index 91fe5b5..a043c5d 100755
--- a/tests/parallel-tests-log-compiler-example.test
+++ b/tests/parallel-tests-log-compiler-example.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-log-override-1.test
b/tests/parallel-tests-log-override-1.test
index 2034979..b41feef 100755
--- a/tests/parallel-tests-log-override-1.test
+++ b/tests/parallel-tests-log-override-1.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-log-override-2.test
b/tests/parallel-tests-log-override-2.test
index a66681c..a3f5f4c 100755
--- a/tests/parallel-tests-log-override-2.test
+++ b/tests/parallel-tests-log-override-2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-log-override-recheck.test
b/tests/parallel-tests-log-override-recheck.test
index f5458ec..a2255c4 100755
--- a/tests/parallel-tests-log-override-recheck.test
+++ b/tests/parallel-tests-log-override-recheck.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-no-color-in-log.test
b/tests/parallel-tests-no-color-in-log.test
index 9da4239..3161efa 100755
--- a/tests/parallel-tests-no-color-in-log.test
+++ b/tests/parallel-tests-no-color-in-log.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-no-spurious-summary.test
b/tests/parallel-tests-no-spurious-summary.test
index 70d9cb7..4a9fd23 100755
--- a/tests/parallel-tests-no-spurious-summary.test
+++ b/tests/parallel-tests-no-spurious-summary.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-once.test b/tests/parallel-tests-once.test
index 5f00715..0a7360d 100755
--- a/tests/parallel-tests-once.test
+++ b/tests/parallel-tests-once.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-reset-term.test
b/tests/parallel-tests-reset-term.test
index 0b3b6d9..eab2948 100755
--- a/tests/parallel-tests-reset-term.test
+++ b/tests/parallel-tests-reset-term.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-subdir.test b/tests/parallel-tests-subdir.test
index caae230..81de2f0 100755
--- a/tests/parallel-tests-subdir.test
+++ b/tests/parallel-tests-subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-suffix-prog.test
b/tests/parallel-tests-suffix-prog.test
index cbdd833..10438a7 100755
--- a/tests/parallel-tests-suffix-prog.test
+++ b/tests/parallel-tests-suffix-prog.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-suffix.test b/tests/parallel-tests-suffix.test
index f20704a..826bb81 100755
--- a/tests/parallel-tests-suffix.test
+++ b/tests/parallel-tests-suffix.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests-unreadable.test
b/tests/parallel-tests-unreadable.test
index 425c31a..2bb5059 100755
--- a/tests/parallel-tests-unreadable.test
+++ b/tests/parallel-tests-unreadable.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests.test b/tests/parallel-tests.test
index b1747a4..dcaf99c 100755
--- a/tests/parallel-tests.test
+++ b/tests/parallel-tests.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests10.test b/tests/parallel-tests10.test
index eca57f8..2f2cae4 100755
--- a/tests/parallel-tests10.test
+++ b/tests/parallel-tests10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test
index d0c3961..105345c 100755
--- a/tests/parallel-tests2.test
+++ b/tests/parallel-tests2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
index ea486c9..443310a 100755
--- a/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests5.test b/tests/parallel-tests5.test
index 997d011..9500f4d 100755
--- a/tests/parallel-tests5.test
+++ b/tests/parallel-tests5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests6.test b/tests/parallel-tests6.test
index eac4cf1..be7e67f 100755
--- a/tests/parallel-tests6.test
+++ b/tests/parallel-tests6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test
index d3e6f81..1681e42 100755
--- a/tests/parallel-tests8.test
+++ b/tests/parallel-tests8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parallel-tests9.test b/tests/parallel-tests9.test
index bef1674..6c47f73 100755
--- a/tests/parallel-tests9.test
+++ b/tests/parallel-tests9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/parse.test b/tests/parse.test
index 8a97cd1..37f21f9 100755
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pattern-rules.test b/tests/pattern-rules.test
index 27c1f53..83e6605 100755
--- a/tests/pattern-rules.test
+++ b/tests/pattern-rules.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pattern-rules2.test b/tests/pattern-rules2.test
index 5b92687..9ef9d74 100755
--- a/tests/pattern-rules2.test
+++ b/tests/pattern-rules2.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/phony.test b/tests/phony.test
index 2eba535..a818cfb 100755
--- a/tests/phony.test
+++ b/tests/phony.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/plain-functions.sh b/tests/plain-functions.sh
index 233f65d..0c10533 100644
--- a/tests/plain-functions.sh
+++ b/tests/plain-functions.sh
@@ -1,6 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq.test b/tests/pluseq.test
index bd6da5b..435a078 100755
--- a/tests/pluseq.test
+++ b/tests/pluseq.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq10.test b/tests/pluseq10.test
index 2b0079b..3c569c1 100755
--- a/tests/pluseq10.test
+++ b/tests/pluseq10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq11.test b/tests/pluseq11.test
index d619d3d..7da9b4f 100755
--- a/tests/pluseq11.test
+++ b/tests/pluseq11.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq2.test b/tests/pluseq2.test
index 14d6e7f..418bf90 100755
--- a/tests/pluseq2.test
+++ b/tests/pluseq2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq3.test b/tests/pluseq3.test
index 394e6d3..40ba82c 100755
--- a/tests/pluseq3.test
+++ b/tests/pluseq3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2004, 2010, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq4.test b/tests/pluseq4.test
index 831a3a9..3d8e63c 100755
--- a/tests/pluseq4.test
+++ b/tests/pluseq4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index ea3c360..5266174 100755
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq6.test b/tests/pluseq6.test
index 68710cf..f41ae51 100755
--- a/tests/pluseq6.test
+++ b/tests/pluseq6.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq7.test b/tests/pluseq7.test
index f8ceefa..7650f68 100755
--- a/tests/pluseq7.test
+++ b/tests/pluseq7.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq8.test b/tests/pluseq8.test
index 52e9854..0dae833 100755
--- a/tests/pluseq8.test
+++ b/tests/pluseq8.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pluseq9.test b/tests/pluseq9.test
index 7f72654..20c5ff8 100755
--- a/tests/pluseq9.test
+++ b/tests/pluseq9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/Cond2.pl b/tests/pm/Cond2.pl
index 94caa89..2bed028 100644
--- a/tests/pm/Cond2.pl
+++ b/tests/pm/Cond2.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/Cond3.pl b/tests/pm/Cond3.pl
index e010e4f..518eea8 100644
--- a/tests/pm/Cond3.pl
+++ b/tests/pm/Cond3.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/Condition-t.pl b/tests/pm/Condition-t.pl
index 752d340..d29407a 100644
--- a/tests/pm/Condition-t.pl
+++ b/tests/pm/Condition-t.pl
@@ -1,5 +1,4 @@
-# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/Condition.pl b/tests/pm/Condition.pl
index 1c65484..5041a84 100644
--- a/tests/pm/Condition.pl
+++ b/tests/pm/Condition.pl
@@ -1,5 +1,4 @@
-# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/DisjCon2.pl b/tests/pm/DisjCon2.pl
index 37d886a..2d28749 100644
--- a/tests/pm/DisjCon2.pl
+++ b/tests/pm/DisjCon2.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/DisjCon3.pl b/tests/pm/DisjCon3.pl
index c0e840d..ede5ab7 100644
--- a/tests/pm/DisjCon3.pl
+++ b/tests/pm/DisjCon3.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/DisjConditions-t.pl b/tests/pm/DisjConditions-t.pl
index 4acaed8..b49ae2e 100644
--- a/tests/pm/DisjConditions-t.pl
+++ b/tests/pm/DisjConditions-t.pl
@@ -1,5 +1,4 @@
-# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/DisjConditions.pl b/tests/pm/DisjConditions.pl
index b60907b..e7c9775 100644
--- a/tests/pm/DisjConditions.pl
+++ b/tests/pm/DisjConditions.pl
@@ -1,5 +1,4 @@
-# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/Version.pl b/tests/pm/Version.pl
index eec0c8e..293badc 100644
--- a/tests/pm/Version.pl
+++ b/tests/pm/Version.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/Version2.pl b/tests/pm/Version2.pl
index c1981a0..b452e47 100644
--- a/tests/pm/Version2.pl
+++ b/tests/pm/Version2.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/Version3.pl b/tests/pm/Version3.pl
index 7c45dc9..2f7d413 100644
--- a/tests/pm/Version3.pl
+++ b/tests/pm/Version3.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pm/Wrap.pl b/tests/pm/Wrap.pl
index 79b8d32..a929a6a 100644
--- a/tests/pm/Wrap.pl
+++ b/tests/pm/Wrap.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/posixsubst-data.test b/tests/posixsubst-data.test
index 49547e1..5670ddc 100755
--- a/tests/posixsubst-data.test
+++ b/tests/posixsubst-data.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/posixsubst-extradist.test b/tests/posixsubst-extradist.test
index 36f0a31..2f8b21b 100755
--- a/tests/posixsubst-extradist.test
+++ b/tests/posixsubst-extradist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/posixsubst-ldadd.test b/tests/posixsubst-ldadd.test
index 4fb7df9..6287c1e 100755
--- a/tests/posixsubst-ldadd.test
+++ b/tests/posixsubst-ldadd.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/posixsubst-libraries.test b/tests/posixsubst-libraries.test
index f6d1b86..0ade779 100755
--- a/tests/posixsubst-libraries.test
+++ b/tests/posixsubst-libraries.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/posixsubst-ltlibraries.test
b/tests/posixsubst-ltlibraries.test
index ffd09ae..9da7aeb 100755
--- a/tests/posixsubst-ltlibraries.test
+++ b/tests/posixsubst-ltlibraries.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/posixsubst-programs.test b/tests/posixsubst-programs.test
index 2b50e36..0328a10 100755
--- a/tests/posixsubst-programs.test
+++ b/tests/posixsubst-programs.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/posixsubst-scripts.test b/tests/posixsubst-scripts.test
index 73babc9..f6e1b14 100755
--- a/tests/posixsubst-scripts.test
+++ b/tests/posixsubst-scripts.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/posixsubst-sources.test b/tests/posixsubst-sources.test
index 557428e..0edec08 100755
--- a/tests/posixsubst-sources.test
+++ b/tests/posixsubst-sources.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/posixsubst-tests.test b/tests/posixsubst-tests.test
index 68eaa46..bed12ad 100755
--- a/tests/posixsubst-tests.test
+++ b/tests/posixsubst-tests.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/ppf77.test b/tests/ppf77.test
index 301ba4c..fe439a7 100755
--- a/tests/ppf77.test
+++ b/tests/ppf77.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr2.test b/tests/pr2.test
index cbddea0..026d0c4 100755
--- a/tests/pr2.test
+++ b/tests/pr2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2006, 2010, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr211.test b/tests/pr211.test
index 5ed79dd..0c62481 100755
--- a/tests/pr211.test
+++ b/tests/pr211.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr220.test b/tests/pr220.test
index b068c10..4c5b91c 100755
--- a/tests/pr220.test
+++ b/tests/pr220.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2008, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr224.test b/tests/pr224.test
index bf24935..db96161 100755
--- a/tests/pr224.test
+++ b/tests/pr224.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr229.test b/tests/pr229.test
index 09130cc..023b6a6 100755
--- a/tests/pr229.test
+++ b/tests/pr229.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr279-2.test b/tests/pr279-2.test
index 6142930..da271ec 100755
--- a/tests/pr279-2.test
+++ b/tests/pr279-2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr279.test b/tests/pr279.test
index 5f3b064..dd5961c 100755
--- a/tests/pr279.test
+++ b/tests/pr279.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr287.test b/tests/pr287.test
index fc987f6..576abeb 100755
--- a/tests/pr287.test
+++ b/tests/pr287.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2007, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr300-lib.test b/tests/pr300-lib.test
index 673845e..6745669 100755
--- a/tests/pr300-lib.test
+++ b/tests/pr300-lib.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2007, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr300-ltlib.test b/tests/pr300-ltlib.test
index 24584e3..df9c229 100755
--- a/tests/pr300-ltlib.test
+++ b/tests/pr300-ltlib.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr300-prog.test b/tests/pr300-prog.test
index 7a2aa99..0f1c074 100755
--- a/tests/pr300-prog.test
+++ b/tests/pr300-prog.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2007, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr307.test b/tests/pr307.test
index 24dd021..f6994cd 100755
--- a/tests/pr307.test
+++ b/tests/pr307.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr401.test b/tests/pr401.test
index cef770b..3ae991d 100755
--- a/tests/pr401.test
+++ b/tests/pr401.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2007, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr401b.test b/tests/pr401b.test
index 961f638..0195a00 100755
--- a/tests/pr401b.test
+++ b/tests/pr401b.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2007, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr401c.test b/tests/pr401c.test
index ee38cb2..75b516f 100755
--- a/tests/pr401c.test
+++ b/tests/pr401c.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2006, 2007, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr72.test b/tests/pr72.test
index 20db128..02d0787 100755
--- a/tests/pr72.test
+++ b/tests/pr72.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr8365-remake-timing.test b/tests/pr8365-remake-timing.test
index 7325262..841ed74 100755
--- a/tests/pr8365-remake-timing.test
+++ b/tests/pr8365-remake-timing.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr87.test b/tests/pr87.test
index 9c92c71..58cdfd2 100755
--- a/tests/pr87.test
+++ b/tests/pr87.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/pr9.test b/tests/pr9.test
index f8fa7ac..f4c8c26 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/prefix.test b/tests/prefix.test
index 482e717..5b43f76 100755
--- a/tests/prefix.test
+++ b/tests/prefix.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/primary-prefix-couples-documented-valid.test
b/tests/primary-prefix-couples-documented-valid.test
index 5bd9160..c80afcd 100755
--- a/tests/primary-prefix-couples-documented-valid.test
+++ b/tests/primary-prefix-couples-documented-valid.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/primary-prefix-couples-force-valid.test
b/tests/primary-prefix-couples-force-valid.test
index 9270023..db2594d 100755
--- a/tests/primary-prefix-couples-force-valid.test
+++ b/tests/primary-prefix-couples-force-valid.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/primary-prefix-invalid-couples.tap
b/tests/primary-prefix-invalid-couples.tap
index 5f6ccb4..3747f3b 100755
--- a/tests/primary-prefix-invalid-couples.tap
+++ b/tests/primary-prefix-invalid-couples.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/primary-prefix-valid-couples.test
b/tests/primary-prefix-valid-couples.test
index 8d03030..a345c21 100755
--- a/tests/primary-prefix-valid-couples.test
+++ b/tests/primary-prefix-valid-couples.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/primary.test b/tests/primary.test
index acf1c3a..e1a8f44 100755
--- a/tests/primary.test
+++ b/tests/primary.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/primary2.test b/tests/primary2.test
index 63e9467..1298c78 100755
--- a/tests/primary2.test
+++ b/tests/primary2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/primary3.test b/tests/primary3.test
index 024b308..a6b8995 100755
--- a/tests/primary3.test
+++ b/tests/primary3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/proginst.test b/tests/proginst.test
index 045ddba..4008b47 100755
--- a/tests/proginst.test
+++ b/tests/proginst.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/programs-primary-rewritten.test
b/tests/programs-primary-rewritten.test
index 2328bb6..65c432e 100755
--- a/tests/programs-primary-rewritten.test
+++ b/tests/programs-primary-rewritten.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2006, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/prove-runner b/tests/prove-runner
index e687c0a..33dab19 100755
--- a/tests/prove-runner
+++ b/tests/prove-runner
@@ -2,6 +2,21 @@
# Helper script to run the automake testsuite through the `prove' utility.
# See the "prove" and "installprove" targets in tests/Makefile.am.
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
set -u
nl='
diff --git a/tests/py-compile-basedir.test b/tests/py-compile-basedir.test
index 1eee980..dbedbbc 100755
--- a/tests/py-compile-basedir.test
+++ b/tests/py-compile-basedir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/py-compile-basic.test b/tests/py-compile-basic.test
index f8d083e..a2871cf 100755
--- a/tests/py-compile-basic.test
+++ b/tests/py-compile-basic.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/py-compile-basic2.test b/tests/py-compile-basic2.test
index cbb5890..87be03f 100755
--- a/tests/py-compile-basic2.test
+++ b/tests/py-compile-basic2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/py-compile-destdir.test b/tests/py-compile-destdir.test
index 1bcd17b..6dfaea0 100755
--- a/tests/py-compile-destdir.test
+++ b/tests/py-compile-destdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/py-compile-env.test b/tests/py-compile-env.test
index df6b737..967f0c4 100755
--- a/tests/py-compile-env.test
+++ b/tests/py-compile-env.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/py-compile-option-terminate.test
b/tests/py-compile-option-terminate.test
index 74bf638..cd0b7bb 100755
--- a/tests/py-compile-option-terminate.test
+++ b/tests/py-compile-option-terminate.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/py-compile-usage.test b/tests/py-compile-usage.test
index 0e2088d..db73ebc 100755
--- a/tests/py-compile-usage.test
+++ b/tests/py-compile-usage.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python-dist.test b/tests/python-dist.test
index d66ee80..6740df6 100755
--- a/tests/python-dist.test
+++ b/tests/python-dist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python-vars.test b/tests/python-vars.test
index 8e38d1f..53e2620 100755
--- a/tests/python-vars.test
+++ b/tests/python-vars.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python-virtualenv.test b/tests/python-virtualenv.test
index 0a31783..f12aab8 100755
--- a/tests/python-virtualenv.test
+++ b/tests/python-virtualenv.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python.test b/tests/python.test
index 07072da..d85631f 100755
--- a/tests/python.test
+++ b/tests/python.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python10.test b/tests/python10.test
index a585cb7..67db3fb 100755
--- a/tests/python10.test
+++ b/tests/python10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python11.test b/tests/python11.test
index 969a461..7e2c52a 100755
--- a/tests/python11.test
+++ b/tests/python11.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2006, 2008, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python12.test b/tests/python12.test
index 378a0dc..38270d0 100755
--- a/tests/python12.test
+++ b/tests/python12.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python2.test b/tests/python2.test
index 4403dda..3b13b33 100755
--- a/tests/python2.test
+++ b/tests/python2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python3.test b/tests/python3.test
index a5e12bd..6d1fda0 100755
--- a/tests/python3.test
+++ b/tests/python3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python4.test b/tests/python4.test
index cd9e4d6..65d3754 100755
--- a/tests/python4.test
+++ b/tests/python4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python5.test b/tests/python5.test
index c67d92b..f3ee778 100755
--- a/tests/python5.test
+++ b/tests/python5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python5b.test b/tests/python5b.test
index b0f76e6..e95e035 100755
--- a/tests/python5b.test
+++ b/tests/python5b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python6.test b/tests/python6.test
index 8b3c6f3..21d8d1e 100755
--- a/tests/python6.test
+++ b/tests/python6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python7.test b/tests/python7.test
index 1390a4e..070139d 100755
--- a/tests/python7.test
+++ b/tests/python7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python8.test b/tests/python8.test
index 981e64d..1ba387f 100755
--- a/tests/python8.test
+++ b/tests/python8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/python9.test b/tests/python9.test
index da95884..35929c9 100755
--- a/tests/python9.test
+++ b/tests/python9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/recurs.test b/tests/recurs.test
index d20482c..bcec365 100755
--- a/tests/recurs.test
+++ b/tests/recurs.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/recurs2.test b/tests/recurs2.test
index ef85475..e2c5213 100755
--- a/tests/recurs2.test
+++ b/tests/recurs2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-all-1.test b/tests/remake-all-1.test
index 7779bb4..59c2f69 100755
--- a/tests/remake-all-1.test
+++ b/tests/remake-all-1.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-am-pr10111.test b/tests/remake-am-pr10111.test
index 064cfe5..d6d225a 100755
--- a/tests/remake-am-pr10111.test
+++ b/tests/remake-am-pr10111.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-deleted-am-2.test b/tests/remake-deleted-am-2.test
index 07a419d..e855115 100755
--- a/tests/remake-deleted-am-2.test
+++ b/tests/remake-deleted-am-2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-deleted-am-subdir.test
b/tests/remake-deleted-am-subdir.test
index 32b6f37..022fbb7 100755
--- a/tests/remake-deleted-am-subdir.test
+++ b/tests/remake-deleted-am-subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-deleted-am.test b/tests/remake-deleted-am.test
index 3af9c0c..ba8c6f9 100755
--- a/tests/remake-deleted-am.test
+++ b/tests/remake-deleted-am.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-deleted-m4-file.test
b/tests/remake-deleted-m4-file.test
index 62dc9b9..bcd17fa 100755
--- a/tests/remake-deleted-m4-file.test
+++ b/tests/remake-deleted-m4-file.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-gnulib-add-acsubst.test
b/tests/remake-gnulib-add-acsubst.test
index de3f4fb..f794d7b 100755
--- a/tests/remake-gnulib-add-acsubst.test
+++ b/tests/remake-gnulib-add-acsubst.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-gnulib-add-header.test
b/tests/remake-gnulib-add-header.test
index 1669b9f..7422c27 100755
--- a/tests/remake-gnulib-add-header.test
+++ b/tests/remake-gnulib-add-header.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-gnulib-remove-header.test
b/tests/remake-gnulib-remove-header.test
index de1fc05..f64f7de 100755
--- a/tests/remake-gnulib-remove-header.test
+++ b/tests/remake-gnulib-remove-header.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-m4-pr10111.test b/tests/remake-m4-pr10111.test
index 5aa57ba..c988f28 100755
--- a/tests/remake-m4-pr10111.test
+++ b/tests/remake-m4-pr10111.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-moved-m4-file.test b/tests/remake-moved-m4-file.test
index 12a5196..c5d1e6e 100755
--- a/tests/remake-moved-m4-file.test
+++ b/tests/remake-moved-m4-file.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-renamed-am.test b/tests/remake-renamed-am.test
index a8eeecb..fbb7acf 100755
--- a/tests/remake-renamed-am.test
+++ b/tests/remake-renamed-am.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-renamed-m4-file.test
b/tests/remake-renamed-m4-file.test
index 7c6b338..9311b33 100755
--- a/tests/remake-renamed-m4-file.test
+++ b/tests/remake-renamed-m4-file.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-renamed-m4-macro-and-file.test
b/tests/remake-renamed-m4-macro-and-file.test
index 7e5f4a0..2d93fc8 100755
--- a/tests/remake-renamed-m4-macro-and-file.test
+++ b/tests/remake-renamed-m4-macro-and-file.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-renamed-m4-macro.test
b/tests/remake-renamed-m4-macro.test
index 09568ab..48b9e43 100755
--- a/tests/remake-renamed-m4-macro.test
+++ b/tests/remake-renamed-m4-macro.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-subdir-from-subdir.test
b/tests/remake-subdir-from-subdir.test
index d23c822..8761921 100755
--- a/tests/remake-subdir-from-subdir.test
+++ b/tests/remake-subdir-from-subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-subdir-gnu.test b/tests/remake-subdir-gnu.test
index 5537e66..2be942a 100755
--- a/tests/remake-subdir-gnu.test
+++ b/tests/remake-subdir-gnu.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-subdir-long-time.test
b/tests/remake-subdir-long-time.test
index 29b41e2..0d04b00 100755
--- a/tests/remake-subdir-long-time.test
+++ b/tests/remake-subdir-long-time.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake-subdir.test b/tests/remake-subdir.test
index eb1e3d8..44e6109 100755
--- a/tests/remake-subdir.test
+++ b/tests/remake-subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake.test b/tests/remake.test
index 236649d..e9afa4d 100755
--- a/tests/remake.test
+++ b/tests/remake.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake10a.test b/tests/remake10a.test
index 70e1d5f..3bff12d 100755
--- a/tests/remake10a.test
+++ b/tests/remake10a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake10b.test b/tests/remake10b.test
index ced2d12..94d1cd0 100755
--- a/tests/remake10b.test
+++ b/tests/remake10b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake10c.test b/tests/remake10c.test
index 58a82ce..b9df6c5 100755
--- a/tests/remake10c.test
+++ b/tests/remake10c.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake11.test b/tests/remake11.test
index b00e562..32d320d 100755
--- a/tests/remake11.test
+++ b/tests/remake11.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake12.test b/tests/remake12.test
index b477e64..4453fbf 100755
--- a/tests/remake12.test
+++ b/tests/remake12.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake1a.test b/tests/remake1a.test
index c55ffb6..c6f6ae5 100755
--- a/tests/remake1a.test
+++ b/tests/remake1a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake2.test b/tests/remake2.test
index 486da34..95d210f 100755
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake3.test b/tests/remake3.test
index b32235b..6e7e232 100755
--- a/tests/remake3.test
+++ b/tests/remake3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake3a.test b/tests/remake3a.test
index 33b9174..4aa549a 100755
--- a/tests/remake3a.test
+++ b/tests/remake3a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake4.test b/tests/remake4.test
index c4c21ad..e2fd132 100755
--- a/tests/remake4.test
+++ b/tests/remake4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake5.test b/tests/remake5.test
index f93baf4..3c41547 100755
--- a/tests/remake5.test
+++ b/tests/remake5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake6.test b/tests/remake6.test
index c7d01e1..b7e5f0b 100755
--- a/tests/remake6.test
+++ b/tests/remake6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake7.test b/tests/remake7.test
index 39f7ca9..6e3ef2a 100755
--- a/tests/remake7.test
+++ b/tests/remake7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake8a.test b/tests/remake8a.test
index 1ab0bf3..438cc37 100755
--- a/tests/remake8a.test
+++ b/tests/remake8a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake8b.test b/tests/remake8b.test
index 65a75ad..49caeeb 100755
--- a/tests/remake8b.test
+++ b/tests/remake8b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake9a.test b/tests/remake9a.test
index 30b8dea..3b5d58a 100755
--- a/tests/remake9a.test
+++ b/tests/remake9a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake9b.test b/tests/remake9b.test
index a4f8d73..7c85dd6 100755
--- a/tests/remake9b.test
+++ b/tests/remake9b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake9c.test b/tests/remake9c.test
index eb6fb83..48117c5 100755
--- a/tests/remake9c.test
+++ b/tests/remake9c.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/remake9d.test b/tests/remake9d.test
index 3d6a638..5c52f33 100755
--- a/tests/remake9d.test
+++ b/tests/remake9d.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/repeated-options.test b/tests/repeated-options.test
index dcdcbb3..827f877 100755
--- a/tests/repeated-options.test
+++ b/tests/repeated-options.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/req.test b/tests/req.test
index ef25099..abe1ef8 100755
--- a/tests/req.test
+++ b/tests/req.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/reqd.test b/tests/reqd.test
index aa723cc..021b114 100755
--- a/tests/reqd.test
+++ b/tests/reqd.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/reqd2.test b/tests/reqd2.test
index 236e521..3008583 100755
--- a/tests/reqd2.test
+++ b/tests/reqd2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/rst-formatting.test b/tests/rst-formatting.test
new file mode 100755
index 0000000..ad80aff
--- /dev/null
+++ b/tests/rst-formatting.test
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Parallel testsuite harness: check APIs for the registering the
+# "global test result" in `*.trs' files, as documented in the automake
+# manual.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+sed -n '/^am__rst_[a-z_][a-z_]* =/p' "$am_amdir"/check.am > Makefile \
+ || framework_failure_ "fetching definitions from check.am"
+
+cat >> Makefile << 'END'
+test:
+ printf '%s\n' "$$in" | $(am__rst_title) > title-got
+ printf '%s\n' "$$in" | $(am__rst_section) > section-got
+ cat title-exp
+ cat title-got
+ diff title-exp title-got
+ cat section-exp
+ cat section-got
+ diff section-exp section-got
+END
+
+# -------------------------------------------------------------------------
+
+cat > title-exp <<'END'
+==============
+ ab cd ef
+==============
+
+END
+
+cat > section-exp <<'END'
+ab cd ef
+========
+
+END
+
+env in='ab cd ef' $MAKE test
+
+# -------------------------------------------------------------------------
+
+cat > title-exp <<'END'
+============================================================================
+ 0123456789012345678901234567890123456789012345678901234567890123456789
+============================================================================
+
+END
+
+cat > section-exp <<'END'
+0123456789012345678901234567890123456789012345678901234567890123456789
+======================================================================
+
+END
+
+in=0123456789012345678901234567890123456789012345678901234567890123456789
+env in=$in $MAKE test
+
+# -------------------------------------------------------------------------
+
+cat > title-exp <<'END'
+=======
+ x
+=======
+
+END
+
+cat > section-exp <<'END'
+x
+=
+
+END
+
+env in=x $MAKE test
+
+# -------------------------------------------------------------------------
+
+:
diff --git a/tests/rulepat.test b/tests/rulepat.test
index 3d939c9..5e547a5 100755
--- a/tests/rulepat.test
+++ b/tests/rulepat.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/sanity.test b/tests/sanity.test
index 7dd31eb..0620c17 100755
--- a/tests/sanity.test
+++ b/tests/sanity.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/scripts.test b/tests/scripts.test
index 7501fff..4808358 100755
--- a/tests/scripts.test
+++ b/tests/scripts.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/seenc.test b/tests/seenc.test
index de8bcc4..0cb26d1 100755
--- a/tests/seenc.test
+++ b/tests/seenc.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-cleanup.tap b/tests/self-check-cleanup.tap
index e403dde..5a5e77f 100755
--- a/tests/self-check-cleanup.tap
+++ b/tests/self-check-cleanup.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-configure-help.test
b/tests/self-check-configure-help.test
index 16f4b50..d0442c3 100755
--- a/tests/self-check-configure-help.test
+++ b/tests/self-check-configure-help.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-dir.tap b/tests/self-check-dir.tap
index e698b0c..39bf38c 100755
--- a/tests/self-check-dir.tap
+++ b/tests/self-check-dir.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-env-sanitize.tap
b/tests/self-check-env-sanitize.tap
index 8736c54..30aa033 100755
--- a/tests/self-check-env-sanitize.tap
+++ b/tests/self-check-env-sanitize.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-exit.tap b/tests/self-check-exit.tap
index 9fe2905..93e00e7 100755
--- a/tests/self-check-exit.tap
+++ b/tests/self-check-exit.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-explicit-skips.test
b/tests/self-check-explicit-skips.test
index 530048d..ca5fb7a 100755
--- a/tests/self-check-explicit-skips.test
+++ b/tests/self-check-explicit-skips.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-is-blocked-signal.tap
b/tests/self-check-is-blocked-signal.tap
index ba20488..fa6c211 100755
--- a/tests/self-check-is-blocked-signal.tap
+++ b/tests/self-check-is-blocked-signal.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-is_newest.tap b/tests/self-check-is_newest.tap
index a41765d..c803bd0 100755
--- a/tests/self-check-is_newest.tap
+++ b/tests/self-check-is_newest.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-me.tap b/tests/self-check-me.tap
index f681f06..f545a63 100755
--- a/tests/self-check-me.tap
+++ b/tests/self-check-me.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-reexec.tap b/tests/self-check-reexec.tap
index 0982719..eca7d3f 100755
--- a/tests/self-check-reexec.tap
+++ b/tests/self-check-reexec.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-report.test b/tests/self-check-report.test
index ae90e9f..e5998b5 100755
--- a/tests/self-check-report.test
+++ b/tests/self-check-report.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-sanity.test b/tests/self-check-sanity.test
index 8626914..4f03154 100755
--- a/tests/self-check-sanity.test
+++ b/tests/self-check-sanity.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-seq.tap b/tests/self-check-seq.tap
index e643c34..5a554fa 100755
--- a/tests/self-check-seq.tap
+++ b/tests/self-check-seq.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-tap.test b/tests/self-check-tap.test
index 29350ef..371a5d4 100755
--- a/tests/self-check-tap.test
+++ b/tests/self-check-tap.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/self-check-unindent.tap b/tests/self-check-unindent.tap
index 517224a..a5202dd 100755
--- a/tests/self-check-unindent.tap
+++ b/tests/self-check-unindent.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silent-configsite.test b/tests/silent-configsite.test
index a3348e9..681c274 100755
--- a/tests/silent-configsite.test
+++ b/tests/silent-configsite.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silent-lex-gcc.test b/tests/silent-lex-gcc.test
deleted file mode 100755
index 5ab5ecd..0000000
--- a/tests/silent-lex-gcc.test
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for Lex, forcing gcc depmode.
-# Keep this in sync with sister test `silent-lex-generic.test'.
-
-required='flex gcc'
-. ./defs || Exit 1
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AM_PROG_CC_C_O
-AC_PROG_LEX
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.l
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-LDADD = $(LEXLIB)
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.l
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_CFLAGS = $(AM_CFLAGS)
-LDADD = $(LEXLIB)
-EOF
-
-cat > foo.l <<'EOF'
-%%
-"END" return EOF;
-.
-%%
-/* Avoid possible link errors. */
-int yywrap (void) { return 1; }
-int main (void) { return 0; }
-EOF
-cp foo.l sub/bar.l
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Force gcc ("fast") depmode.
-# This apparently useless "for" loop is here to simplify the syncing
-# with sister test `silent-lex-gcc.test'.
-for config_args in \
- am_cv_CC_dependencies_compiler_type=gcc
-do
- ./configure $config_args --enable-silent-rules
-
- $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- $EGREP ' (-c|-o)' stdout && Exit 1
- $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
- grep 'LEX .*foo\.' stdout
- grep 'LEX .*bar\.' stdout
- grep ' CC .*foo\.' stdout
- grep ' CC .*bar\.' stdout
- grep 'CCLD .*foo1' stdout
- grep 'CCLD .*bar1' stdout
- grep 'CCLD .*foo2' stdout
- grep 'CCLD .*bar2' stdout
-
- # Cleaning and then rebuilding with the same V flag (and without
- # removing the generated sources in between) shouldn't trigger a
- # different set of rules.
- $MAKE clean
-
- $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- $EGREP ' (-c|-o)' stdout && Exit 1
- $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
- # Don't look for LEX, as probably lex hasn't been re-run.
- grep ' CC .*foo\.' stdout
- grep ' CC .*bar\.' stdout
- grep 'CCLD .*foo1' stdout
- grep 'CCLD .*bar1' stdout
- grep 'CCLD .*foo2' stdout
- grep 'CCLD .*bar2' stdout
-
- # Ensure a truly clean rebuild.
- $MAKE clean
- rm -f foo.c sub/bar.c
-
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- grep ' -c ' stdout
- grep ' -o ' stdout
- grep 'ylwrap ' stdout
-
- $EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
-
- # Cleaning and then rebuilding with the same V flag (and without
- # removing the generated sources in between) shouldn't trigger a
- # different set of rules.
- $MAKE clean
-
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- # Don't look for ylwrap, as probably lex hasn't been re-run.
- grep ' -c ' stdout
- grep ' -o ' stdout
-
- $EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
-
- # Ensure a truly clean reconfiguration/rebuild.
- $MAKE clean
- $MAKE maintainer-clean
- rm -f foo.c sub/bar.c
-
-done
-
-:
diff --git a/tests/silent-lex-generic.test b/tests/silent-lex-generic.test
deleted file mode 100755
index a4767c2..0000000
--- a/tests/silent-lex-generic.test
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for Lex.
-# Keep this in sync with sister test `silent-lex-gcc.test'.
-
-required='cc flex'
-. ./defs || Exit 1
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AM_PROG_CC_C_O
-AC_PROG_LEX
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.l
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-LDADD = $(LEXLIB)
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.l
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_CFLAGS = $(AM_CFLAGS)
-LDADD = $(LEXLIB)
-EOF
-
-cat > foo.l <<'EOF'
-%{
-/* avoid non-ANSI #include of unistd.h */
-#define YY_NO_UNISTD_H 1
-%}
-%%
-"END" return EOF;
-.
-%%
-/* Avoid possible link errors. */
-int yywrap (void) { return 1; }
-int main (void) { return 0; }
-EOF
-cp foo.l sub/bar.l
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Force dependency tracking explicitly, so that slow dependency
-# extractors are not rejected. Try also with dependency tracking
-# explicitly disabled.
-for config_args in \
- --enable-dependency-tracking --disable-dependency-tracking
-do
- ./configure $config_args --enable-silent-rules
-
- $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- $EGREP ' (-c|-o)' stdout && Exit 1
- $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
- grep 'LEX .*foo\.' stdout
- grep 'LEX .*bar\.' stdout
- grep ' CC .*foo\.' stdout
- grep ' CC .*bar\.' stdout
- grep 'CCLD .*foo1' stdout
- grep 'CCLD .*bar1' stdout
- grep 'CCLD .*foo2' stdout
- grep 'CCLD .*bar2' stdout
-
- # Cleaning and then rebuilding with the same V flag (and without
- # removing the generated sources in between) shouldn't trigger a
- # different set of rules.
- $MAKE clean
-
- $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- $EGREP ' (-c|-o)' stdout && Exit 1
- $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
- # Don't look for LEX, as probably lex hasn't been re-run.
- grep ' CC .*foo\.' stdout
- grep ' CC .*bar\.' stdout
- grep 'CCLD .*foo1' stdout
- grep 'CCLD .*bar1' stdout
- grep 'CCLD .*foo2' stdout
- grep 'CCLD .*bar2' stdout
-
- # Ensure a truly clean rebuild.
- $MAKE clean
- rm -f foo.c sub/bar.c
-
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- grep ' -c ' stdout
- grep ' -o ' stdout
- grep 'ylwrap ' stdout
-
- $EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
-
- # Cleaning and then rebuilding with the same V flag (and without
- # removing the generated sources in between) shouldn't trigger a
- # different set of rules.
- $MAKE clean
-
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- # Don't look for ylwrap, as probably lex hasn't been re-run.
- grep ' -c ' stdout
- grep ' -o ' stdout
-
- $EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
-
- # Ensure a truly clean reconfiguration/rebuild.
- $MAKE clean
- $MAKE maintainer-clean
- rm -f foo.c sub/bar.c
-
-done
-
-:
diff --git a/tests/silent-lex.test b/tests/silent-lex.test
new file mode 100755
index 0000000..78cd53f
--- /dev/null
+++ b/tests/silent-lex.test
@@ -0,0 +1,138 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode for Lex.
+
+required=lex
+. ./defs || Exit 1
+
+set -e
+
+mkdir sub
+
+cat >>configure.in <<'EOF'
+AM_SILENT_RULES
+AM_PROG_CC_C_O
+AC_PROG_LEX
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo1 foo2
+foo1_SOURCES = foo.l
+foo2_SOURCES = $(foo1_SOURCES)
+foo2_LFLAGS = -n
+foo2_CFLAGS = $(AM_CFLAGS)
+SUBDIRS = sub
+LDADD = $(LEXLIB)
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = bar1 bar2
+bar1_SOURCES = bar.l
+bar2_SOURCES = $(bar1_SOURCES)
+bar2_LFLAGS = -n
+bar2_CFLAGS = $(AM_CFLAGS)
+LDADD = $(LEXLIB)
+EOF
+
+cat > foo.l <<'EOF'
+%%
+"END" return EOF;
+.
+%%
+/* Avoid possible link errors. */
+int yywrap (void) { return 1; }
+int main (void) { return 0; }
+EOF
+cp foo.l sub/bar.l
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# Ensure per-target rules are used, to ensure their coverage below.
+$FGREP 'foo2-foo.c' Makefile.in || Exit 99
+$FGREP 'bar2-bar.c' sub/Makefile.in || Exit 99
+
+./configure --enable-silent-rules
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+grep 'LEX .*foo\.' stdout
+grep 'LEX .*bar\.' stdout
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep 'CCLD .*foo1' stdout
+grep 'CCLD .*bar1' stdout
+grep 'CCLD .*foo2' stdout
+grep 'CCLD .*bar2' stdout
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+# Don't look for LEX, as probably lex hasn't been re-run.
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep 'CCLD .*foo1' stdout
+grep 'CCLD .*bar1' stdout
+grep 'CCLD .*foo2' stdout
+grep 'CCLD .*bar2' stdout
+
+# Ensure a truly clean rebuild.
+$MAKE clean
+rm -f *foo.c sub/*bar.c
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -c ' stdout
+grep ' -o ' stdout
+grep 'ylwrap ' stdout
+
+$EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+# Don't look for ylwrap, as probably lex hasn't been re-run.
+grep ' -c ' stdout
+grep ' -o ' stdout
+
+$EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
+
+:
diff --git a/tests/silent-many-gcc.test b/tests/silent-many-gcc.test
index b2d4174..ed05785 100755
--- a/tests/silent-many-gcc.test
+++ b/tests/silent-many-gcc.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
# This test requires the GNU compilers; keep it in sync with sister test
# `silent-many-generic.test', which should work with generic compilers.
-required='gcc g++ gfortran flex yacc'
+required='gcc g++ gfortran lex yacc'
. ./defs || Exit 1
# Avoids too much code duplication.
@@ -71,7 +71,6 @@ do_and_check_silent_build ()
# Avoids too much code duplication.
do_and_check_verbose_build ()
{
-
case $1 in
--rebuild) rebuild=true;;
*) rebuild=false;;
@@ -116,6 +115,8 @@ fo2_SOURCES = $(foo_SOURCES)
fo2_CPPFLAGS = $(AM_CPPFLAGS)
fo2_FFLAGS = $(AM_FFLAGS)
fo2_FCFLAGS = $(AM_FCFLAGS)
+fo2_YFLAGS = -v
+fo2_LFLAGS = -n
SUBDIRS = sub
AM_YFLAGS = -d
LDADD = $(LEXLIB)
@@ -132,6 +133,8 @@ ba2_SOURCES = $(baz_SOURCES)
ba2_CPPFLAGS = $(AM_CPPFLAGS)
ba2_FFLAGS = $(AM_FFLAGS)
ba2_FCFLAGS = $(AM_FCFLAGS)
+ba2_YFLAGS = -v
+ba2_LFLAGS = -n
AM_YFLAGS = -d
LDADD = $(LEXLIB)
BUILT_SOURCES = baz6.h
@@ -189,6 +192,11 @@ $AUTOCONF
# used by configure.
$FGREP am_cv_CC_dependencies_compiler_type configure
$FGREP am_cv_CXX_dependencies_compiler_type configure
+# Ensure per-target rules are used, to ensure their coverage below.
+# (We do not do an exhaustive check, that wouldn't be practical).
+$FGREP 'bar-bar.o' Makefile.in
+$FGREP 'fo2-foo5.c' Makefile.in
+$FGREP 'fo2-foo6.c' Makefile.in
# Force gcc ("fast") depmode.
depmodes="am_cv_CC_dependencies_compiler_type=gcc \
@@ -212,7 +220,7 @@ do
$MAKE clean
# This is required, since these files are not removed by `make clean'
# (as dictated by the GNU Coding Standards).
- rm -f foo5.c foo6.[ch] sub/baz5.c sub/baz6.[ch]
+ rm -f *foo5.c *foo6.[ch] sub/*baz5.c sub/*baz6.[ch]
do_and_check_verbose_build
# Cleaning and then rebuilding with the same V flag (and without
diff --git a/tests/silent-many-generic.test b/tests/silent-many-generic.test
index 4ae52de..409a08b 100755
--- a/tests/silent-many-generic.test
+++ b/tests/silent-many-generic.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
# sister test `silent-many-gcc.test', which requires the GNU compilers
# and forces the use of gcc depmode.
-required='cc c++ fortran fortran77 flex yacc'
+required='cc c++ fortran fortran77 lex yacc'
. ./defs || Exit 1
# Avoids too much code duplication.
@@ -72,7 +72,6 @@ do_and_check_silent_build ()
# Avoids too much code duplication.
do_and_check_verbose_build ()
{
-
case $1 in
--rebuild) rebuild=true;;
*) rebuild=false;;
@@ -139,6 +138,8 @@ fo2_SOURCES = $(foo_SOURCES)
fo2_CPPFLAGS = $(AM_CPPFLAGS)
fo2_FFLAGS = $(AM_FFLAGS)
fo2_FCFLAGS = $(AM_FCFLAGS)
+fo2_YFLAGS = -v
+fo2_LFLAGS = -n
SUBDIRS = sub
AM_YFLAGS = -d
LDADD = $(LEXLIB)
@@ -155,6 +156,8 @@ ba2_SOURCES = $(baz_SOURCES)
ba2_CPPFLAGS = $(AM_CPPFLAGS)
ba2_FFLAGS = $(AM_FFLAGS)
ba2_FCFLAGS = $(AM_FCFLAGS)
+ba2_YFLAGS = -v
+ba2_LFLAGS = -n
AM_YFLAGS = -d
LDADD = $(LEXLIB)
BUILT_SOURCES = baz6.h
@@ -212,6 +215,12 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
+# Ensure per-target rules are used, to ensure their coverage below.
+# (We do not do an exhaustive check, that wouldn't be practical).
+$FGREP 'bar-bar.o' Makefile.in
+$FGREP 'fo2-foo5.c' Makefile.in
+$FGREP 'fo2-foo6.c' Makefile.in
+
# Force dependency tracking explicitly, so that slow dependency
# extractors are not rejected. Try also with dependency tracking
# explicitly disabled.
@@ -232,7 +241,7 @@ do
$MAKE clean
# This is required, since these files are not removed by `make clean'
# (as dictated by the GNU Coding Standards).
- rm -f foo5.c foo6.[ch] sub/baz5.c sub/baz6.[ch]
+ rm -f *foo5.c *foo6.[ch] sub/*baz5.c sub/*baz6.[ch]
do_and_check_verbose_build
# Cleaning and then rebuilding with the same V flag (and without
diff --git a/tests/silent-yacc-gcc.test b/tests/silent-yacc-gcc.test
deleted file mode 100755
index 624b2cd..0000000
--- a/tests/silent-yacc-gcc.test
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for Yacc, forcing gcc depmode.
-# Keep this in sync with sister test `silent-yacc-generic.test'.
-
-required='gcc yacc'
-. ./defs || Exit 1
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AM_PROG_CC_C_O
-AC_PROG_YACC
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.y
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_CFLAGS = $(AM_CPPFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.y
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_CFLAGS = $(AM_CPPFLAGS)
-EOF
-
-cat > foo.y <<'EOF'
-%{
-void yyerror (char *s) {}
-int yylex (void) {return 0;}
-int main(void) {return 0;}
-%}
-%token EOF
-%%
-fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
-EOF
-cp foo.y sub/bar.y
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Force gcc ("fast") depmode.
-# This apparently useless "for" loop is here to simplify the syncing
-# with sister test `silent-yacc-gcc.test'.
-for config_args in \
- am_cv_CC_dependencies_compiler_type=gcc
-do
- ./configure $config_args --enable-silent-rules
-
- $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- $EGREP ' (-c|-o)' stdout && Exit 1
- $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
- grep 'YACC .*foo\.' stdout
- grep 'YACC .*bar\.' stdout
- grep ' CC .*foo\.' stdout
- grep ' CC .*bar\.' stdout
- grep 'CCLD .*foo1' stdout
- grep 'CCLD .*bar1' stdout
- grep 'CCLD .*foo2' stdout
- grep 'CCLD .*bar2' stdout
-
- # Cleaning and then rebuilding with the same V flag (and without
- # removing the generated sources in between) shouldn't trigger a
- # different set of rules.
- $MAKE clean
-
- $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- $EGREP ' (-c|-o)' stdout && Exit 1
- $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
- # Don't look for YACC, as probably yacc hasn't been re-run.
- grep ' CC .*foo\.' stdout
- grep ' CC .*bar\.' stdout
- grep 'CCLD .*foo1' stdout
- grep 'CCLD .*bar1' stdout
- grep 'CCLD .*foo2' stdout
- grep 'CCLD .*bar2' stdout
-
- # Ensure a truly clean rebuild.
- $MAKE clean
- rm -f foo.[ch] sub/bar.[ch]
-
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- grep ' -c ' stdout
- grep ' -o ' stdout
- grep 'ylwrap ' stdout
-
- $EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
-
- # Cleaning and then rebuilding with the same V flag (and without
- # removing the generated sources in between) shouldn't trigger a
- # different set of rules.
- $MAKE clean
-
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- # Don't look for ylwrap, as probably lex hasn't been re-run.
- grep ' -c ' stdout
- grep ' -o ' stdout
-
- $EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
-
- # Ensure a truly clean reconfiguration/rebuild.
- $MAKE clean
- $MAKE maintainer-clean
- rm -f foo.[ch] sub/bar.[ch]
-
-done
-
-:
diff --git a/tests/silent-yacc-generic.test b/tests/silent-yacc-generic.test
deleted file mode 100755
index 6579911..0000000
--- a/tests/silent-yacc-generic.test
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for Yacc.
-# Keep this in sync with sister test `silent-yacc-gcc.test'.
-
-required='cc yacc'
-. ./defs || Exit 1
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AM_PROG_CC_C_O
-AC_PROG_YACC
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.y
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_CFLAGS = $(AM_CPPFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.y
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_CFLAGS = $(AM_CPPFLAGS)
-EOF
-
-cat > foo.y <<'EOF'
-%{
-void yyerror (char *s) {}
-int yylex (void) {return 0;}
-int main(void) {return 0;}
-%}
-%token EOF
-%%
-fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
-EOF
-cp foo.y sub/bar.y
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Force dependency tracking explicitly, so that slow dependency
-# extractors are not rejected. Try also with dependency tracking
-# explicitly disabled.
-for config_args in \
- --enable-dependency-tracking --disable-dependency-tracking
-do
- ./configure $config_args --enable-silent-rules
-
- $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- $EGREP ' (-c|-o)' stdout && Exit 1
- $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
- grep 'YACC .*foo\.' stdout
- grep 'YACC .*bar\.' stdout
- grep ' CC .*foo\.' stdout
- grep ' CC .*bar\.' stdout
- grep 'CCLD .*foo1' stdout
- grep 'CCLD .*bar1' stdout
- grep 'CCLD .*foo2' stdout
- grep 'CCLD .*bar2' stdout
-
- # Cleaning and then rebuilding with the same V flag (and without
- # removing the generated sources in between) shouldn't trigger a
- # different set of rules.
- $MAKE clean
-
- $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- $EGREP ' (-c|-o)' stdout && Exit 1
- $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
- # Don't look for YACC, as probably yacc hasn't been re-run.
- grep ' CC .*foo\.' stdout
- grep ' CC .*bar\.' stdout
- grep 'CCLD .*foo1' stdout
- grep 'CCLD .*bar1' stdout
- grep 'CCLD .*foo2' stdout
- grep 'CCLD .*bar2' stdout
-
- # Ensure a truly clean rebuild.
- $MAKE clean
- rm -f foo.[ch] sub/bar.[ch]
-
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- grep ' -c ' stdout
- grep ' -o ' stdout
- grep 'ylwrap ' stdout
-
- $EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
-
- # Cleaning and then rebuilding with the same V flag (and without
- # removing the generated sources in between) shouldn't trigger a
- # different set of rules.
- $MAKE clean
-
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
- cat stdout
-
- # Don't look for ylwrap, as probably lex hasn't been re-run.
- grep ' -c ' stdout
- grep ' -o ' stdout
-
- $EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
-
- # Ensure a truly clean reconfiguration/rebuild.
- $MAKE clean
- $MAKE maintainer-clean
- rm -f foo.[ch] sub/bar.[ch]
-
-done
-
-:
diff --git a/tests/silent-yacc-headers.test b/tests/silent-yacc-headers.test
new file mode 100755
index 0000000..a870475
--- /dev/null
+++ b/tests/silent-yacc-headers.test
@@ -0,0 +1,175 @@
+#!/bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode for Yacc, when yacc-generated headers are
+# involved (i.e., the `-d' option is in *YFLAGS).
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+mkdir sub
+
+cat >>configure.in <<'EOF'
+AM_SILENT_RULES
+AC_PROG_YACC
+AC_PROG_CC
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+AM_YFLAGS = -d
+bin_PROGRAMS = foo bar
+foo_SOURCES = parse.y
+bar_SOURCES = $(foo_SOURCES)
+bar_YFLAGS = $(AM_YFLAGS)
+EOF
+
+cat > parse.y <<'EOF'
+%{
+void yyerror (char *s) { return; }
+int yylex (void) { return 0; }
+int main (void) { return 0; }
+%}
+%token EOF
+%%
+fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
+EOF
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# Check that the expected non-generic rules has been truly generated.
+# Otherwise, the coverage offered by this test will be weaker then
+# expected and planned.
+$FGREP 'bar-parse.c' Makefile.in
+$FGREP '$(bar_YFLAGS)' Makefile.in
+
+./configure --enable-silent-rules
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-d|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+grep 'YACC *parse\.c' stdout
+grep 'updating *parse\.h' stdout
+grep 'YACC *bar-parse\.c' stdout
+grep 'updating *bar-parse\.h' stdout
+
+grep ' CC *parse\.' stdout
+grep ' CC *bar-parse\.' stdout
+grep 'CCLD *foo' stdout
+grep 'CCLD *bar' stdout
+
+# Check recovering from header removal.
+rm -f parse.h bar-parse.h
+$MAKE parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-d|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+grep 'YACC *parse\.c' stdout
+grep 'updating *parse\.h' stdout
+grep 'YACC *bar-parse\.c' stdout
+grep 'updating *bar-parse\.h' stdout
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-d|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+# Don't look for "YACC *.c" and "updating *.h", as yacc shouldn't
+# have been re-run.
+grep ' CC *parse\.' stdout
+grep ' CC *bar-parse\.' stdout
+grep 'CCLD *foo' stdout
+grep 'CCLD *bar' stdout
+
+# Check recovering from header removal.
+rm -f parse.h bar-parse.h
+$MAKE parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-d|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+grep 'YACC *parse\.c' stdout
+grep 'updating *parse\.h' stdout
+grep 'YACC *bar-parse\.c' stdout
+grep 'updating *bar-parse\.h' stdout
+
+# Ensure a truly clean rebuild.
+$MAKE maintainer-clean
+
+./configure --enable-silent-rules
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -c ' stdout
+grep ' -o ' stdout
+grep ' -d ' stdout
+grep 'ylwrap ' stdout
+
+$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+
+# Check recovering from header removal.
+rm -f parse.h bar-parse.h
+$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -d ' stdout
+grep 'ylwrap ' stdout
+
+grep 'YACC' stdout && Exit 1
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+# Don't look for ylwrap, as probably lex hasn't been re-run.
+grep ' -c ' stdout
+grep ' -o ' stdout
+
+$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+
+# Check recovering from header removal.
+rm -f parse.h bar-parse.h
+$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -d ' stdout
+grep 'ylwrap ' stdout
+
+grep 'YACC' stdout && Exit 1
+
+:
diff --git a/tests/silent-yacc.test b/tests/silent-yacc.test
new file mode 100755
index 0000000..fc02353
--- /dev/null
+++ b/tests/silent-yacc.test
@@ -0,0 +1,138 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode for Yacc.
+# Keep this in sync with sister test `silent-yacc-gcc.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+mkdir sub
+
+cat >>configure.in <<'EOF'
+AM_SILENT_RULES
+AM_PROG_CC_C_O
+AC_PROG_YACC
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo1 foo2
+foo1_SOURCES = foo.y
+foo2_SOURCES = $(foo1_SOURCES)
+foo2_YFLAGS = -v
+foo2_CFLAGS = $(AM_CPPFLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = bar1 bar2
+bar1_SOURCES = bar.y
+bar2_SOURCES = $(bar1_SOURCES)
+bar2_YFLAGS = -v
+bar2_CFLAGS = $(AM_CPPFLAGS)
+EOF
+
+cat > foo.y <<'EOF'
+%{
+void yyerror (char *s) { return; }
+int yylex (void) { return 0; }
+int main (void) { return 0; }
+%}
+%token EOF
+%%
+fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
+EOF
+cp foo.y sub/bar.y
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# Ensure per-target rules are used, to ensure their coverage below.
+$FGREP 'foo2-foo.c' Makefile.in || Exit 99
+$FGREP 'bar2-bar.c' sub/Makefile.in || Exit 99
+
+./configure --enable-silent-rules
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+grep 'YACC .*foo\.' stdout
+grep 'YACC .*bar\.' stdout
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep 'CCLD .*foo1' stdout
+grep 'CCLD .*bar1' stdout
+grep 'CCLD .*foo2' stdout
+grep 'CCLD .*bar2' stdout
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+# Don't look for YACC, as probably yacc hasn't been re-run.
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep 'CCLD .*foo1' stdout
+grep 'CCLD .*bar1' stdout
+grep 'CCLD .*foo2' stdout
+grep 'CCLD .*bar2' stdout
+
+# Ensure a truly clean rebuild.
+$MAKE clean
+rm -f *foo.[ch] sub/*bar.[ch]
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -c ' stdout
+grep ' -o ' stdout
+grep 'ylwrap ' stdout
+
+$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+# Don't look for ylwrap, as probably lex hasn't been re-run.
+grep ' -c ' stdout
+grep ' -o ' stdout
+
+$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+
+:
diff --git a/tests/silent.test b/tests/silent.test
index b958727..c08fcca 100755
--- a/tests/silent.test
+++ b/tests/silent.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silent2.test b/tests/silent2.test
index fc97697..2fc32c5 100755
--- a/tests/silent2.test
+++ b/tests/silent2.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silent3.test b/tests/silent3.test
index 7f4322b..b5667a8 100755
--- a/tests/silent3.test
+++ b/tests/silent3.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silent4.test b/tests/silent4.test
index 9618791..1e71664 100755
--- a/tests/silent4.test
+++ b/tests/silent4.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silent6.test b/tests/silent6.test
index 640f666..e12ccc2 100755
--- a/tests/silent6.test
+++ b/tests/silent6.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silent7.test b/tests/silent7.test
index 39a267a..98cd55f 100755
--- a/tests/silent7.test
+++ b/tests/silent7.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silent8.test b/tests/silent8.test
index b016ad2..c8a9870 100755
--- a/tests/silent8.test
+++ b/tests/silent8.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silent9.test b/tests/silent9.test
index a8c71cd..8edfc18 100755
--- a/tests/silent9.test
+++ b/tests/silent9.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silentcxx-gcc.test b/tests/silentcxx-gcc.test
index 8d23a38..16a44ea 100755
--- a/tests/silentcxx-gcc.test
+++ b/tests/silentcxx-gcc.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silentcxx.test b/tests/silentcxx.test
index f6eab3d..3621f07 100755
--- a/tests/silentcxx.test
+++ b/tests/silentcxx.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silentf77.test b/tests/silentf77.test
index 90a8208..6075cf0 100755
--- a/tests/silentf77.test
+++ b/tests/silentf77.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/silentf90.test b/tests/silentf90.test
index 6a56175..bdecd98 100755
--- a/tests/silentf90.test
+++ b/tests/silentf90.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/space.test b/tests/space.test
index c0ed869..efefab3 100755
--- a/tests/space.test
+++ b/tests/space.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/specflg-dummy.test b/tests/specflg-dummy.test
index ce71b68..b030585d 100755
--- a/tests/specflg-dummy.test
+++ b/tests/specflg-dummy.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/specflg.test b/tests/specflg.test
index 04c9153..44fb7b8 100755
--- a/tests/specflg.test
+++ b/tests/specflg.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/specflg10.test b/tests/specflg10.test
index eaac391..76e1677 100755
--- a/tests/specflg10.test
+++ b/tests/specflg10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/specflg2.test b/tests/specflg2.test
index e246a2b..38a9168 100755
--- a/tests/specflg2.test
+++ b/tests/specflg2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/specflg3.test b/tests/specflg3.test
index 71cf8e5..b4611aa 100755
--- a/tests/specflg3.test
+++ b/tests/specflg3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/specflg6.test b/tests/specflg6.test
index 3e8d648..846eab3 100755
--- a/tests/specflg6.test
+++ b/tests/specflg6.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/specflg7.test b/tests/specflg7.test
index da062d9..83c8193 100755
--- a/tests/specflg7.test
+++ b/tests/specflg7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/specflg8.test b/tests/specflg8.test
index 99b9151..8febbcd 100755
--- a/tests/specflg8.test
+++ b/tests/specflg8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/specflg9.test b/tests/specflg9.test
index 42f6fff..c7b2012 100755
--- a/tests/specflg9.test
+++ b/tests/specflg9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/spell.test b/tests/spell.test
index 0e06e7f..a2b4752 100755
--- a/tests/spell.test
+++ b/tests/spell.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/spell2.test b/tests/spell2.test
index 9002136..0a504c0 100755
--- a/tests/spell2.test
+++ b/tests/spell2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/spell3.test b/tests/spell3.test
index a415cf2..a96fa03 100755
--- a/tests/spell3.test
+++ b/tests/spell3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/spelling.test b/tests/spelling.test
index 7112f89..fb68f31 100755
--- a/tests/spelling.test
+++ b/tests/spelling.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/spy.test b/tests/spy.test
index 1a97ae7..61fba4b 100755
--- a/tests/spy.test
+++ b/tests/spy.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/srcsub.test b/tests/srcsub.test
index 0265af1..7ecfacc 100755
--- a/tests/srcsub.test
+++ b/tests/srcsub.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/srcsub2.test b/tests/srcsub2.test
index 6eb3e54..fe4428d 100755
--- a/tests/srcsub2.test
+++ b/tests/srcsub2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/stamph2.test b/tests/stamph2.test
index 3330f0f..d3096ea 100755
--- a/tests/stamph2.test
+++ b/tests/stamph2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/stdinc.test b/tests/stdinc.test
index 1a0b485..db10243 100755
--- a/tests/stdinc.test
+++ b/tests/stdinc.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/stdlib.test b/tests/stdlib.test
index 0d986da..84412f3 100755
--- a/tests/stdlib.test
+++ b/tests/stdlib.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2004, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/stdlib2.test b/tests/stdlib2.test
index 7ee99e2..773da1d 100755
--- a/tests/stdlib2.test
+++ b/tests/stdlib2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/strictness-override.test b/tests/strictness-override.test
index 34ceae0..8acbda0 100755
--- a/tests/strictness-override.test
+++ b/tests/strictness-override.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/strictness-precedence.test b/tests/strictness-precedence.test
index 0198fa6..34b8844 100755
--- a/tests/strictness-precedence.test
+++ b/tests/strictness-precedence.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/strip.test b/tests/strip.test
index 84ae5e9..2e1338d 100755
--- a/tests/strip.test
+++ b/tests/strip.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2007, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/strip2.test b/tests/strip2.test
index 2938304..f1df905 100755
--- a/tests/strip2.test
+++ b/tests/strip2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/strip3.test b/tests/strip3.test
index 46c1303..af0ef2d 100755
--- a/tests/strip3.test
+++ b/tests/strip3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subcond.test b/tests/subcond.test
index dea041d..e0910e3 100755
--- a/tests/subcond.test
+++ b/tests/subcond.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2006, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subcond2.test b/tests/subcond2.test
index 5cece05..304b2ed 100755
--- a/tests/subcond2.test
+++ b/tests/subcond2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subcond3.test b/tests/subcond3.test
index e0c9e13..d701dde 100755
--- a/tests/subcond3.test
+++ b/tests/subcond3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subdir.test b/tests/subdir.test
index a78d74d..20ad10e 100755
--- a/tests/subdir.test
+++ b/tests/subdir.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subdir10.test b/tests/subdir10.test
index b6daff5..67a22a9 100755
--- a/tests/subdir10.test
+++ b/tests/subdir10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subdir2.test b/tests/subdir2.test
index 3547758..7311c6c 100755
--- a/tests/subdir2.test
+++ b/tests/subdir2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subdir3.test b/tests/subdir3.test
index bcf6acb..5e48d4d 100755
--- a/tests/subdir3.test
+++ b/tests/subdir3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subdir4.test b/tests/subdir4.test
index a298415..f0cf1c3 100755
--- a/tests/subdir4.test
+++ b/tests/subdir4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subdir5.test b/tests/subdir5.test
index e3af205..c0c7548 100755
--- a/tests/subdir5.test
+++ b/tests/subdir5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subdir6.test b/tests/subdir6.test
index 80ae138..44e7d51 100755
--- a/tests/subdir6.test
+++ b/tests/subdir6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subdir8.test b/tests/subdir8.test
index 502c9e4..f0c7c49 100755
--- a/tests/subdir8.test
+++ b/tests/subdir8.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subdir9.test b/tests/subdir9.test
index dd7799f..8c6a6b6 100755
--- a/tests/subdir9.test
+++ b/tests/subdir9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subdirbuiltsources.test b/tests/subdirbuiltsources.test
index ea48109..f2bba56 100755
--- a/tests/subdirbuiltsources.test
+++ b/tests/subdirbuiltsources.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj.test b/tests/subobj.test
index 1510493..291c18d 100755
--- a/tests/subobj.test
+++ b/tests/subobj.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj10.test b/tests/subobj10.test
index db071d6..30f31f1 100755
--- a/tests/subobj10.test
+++ b/tests/subobj10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj11a.test b/tests/subobj11a.test
index a46d961..0eb1b18 100755
--- a/tests/subobj11a.test
+++ b/tests/subobj11a.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj11c.test b/tests/subobj11c.test
index a401e14..a3fd7a2 100755
--- a/tests/subobj11c.test
+++ b/tests/subobj11c.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj2.test b/tests/subobj2.test
index 6c41a20..038da43 100755
--- a/tests/subobj2.test
+++ b/tests/subobj2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj4.test b/tests/subobj4.test
index b3c5696..59ccf66 100755
--- a/tests/subobj4.test
+++ b/tests/subobj4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj5.test b/tests/subobj5.test
index 730e3cf..d4bd9cd 100755
--- a/tests/subobj5.test
+++ b/tests/subobj5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj6.test b/tests/subobj6.test
index 557a214..87a6815 100755
--- a/tests/subobj6.test
+++ b/tests/subobj6.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj7.test b/tests/subobj7.test
index ff36d6c..3670731 100755
--- a/tests/subobj7.test
+++ b/tests/subobj7.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj8.test b/tests/subobj8.test
index b2fc0e5..7bfd7ed 100755
--- a/tests/subobj8.test
+++ b/tests/subobj8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobj9.test b/tests/subobj9.test
index edc9e5f..ed5c064 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2005, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subobjname.test b/tests/subobjname.test
index e585141..d10317d 100755
--- a/tests/subobjname.test
+++ b/tests/subobjname.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subpkg-yacc.test b/tests/subpkg-yacc.test
index b0a3ef3..3a62fb3 100755
--- a/tests/subpkg-yacc.test
+++ b/tests/subpkg-yacc.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subpkg.test b/tests/subpkg.test
index 658a8e5..6f85bfa 100755
--- a/tests/subpkg.test
+++ b/tests/subpkg.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subpkg2.test b/tests/subpkg2.test
index 67cc74a..fb2afe4 100755
--- a/tests/subpkg2.test
+++ b/tests/subpkg2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subpkg3.test b/tests/subpkg3.test
index ea082c2..8b48311 100755
--- a/tests/subpkg3.test
+++ b/tests/subpkg3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subpkg4.test b/tests/subpkg4.test
index 096b621..ca225ca 100755
--- a/tests/subpkg4.test
+++ b/tests/subpkg4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subst-no-trailing-empty-line.test
b/tests/subst-no-trailing-empty-line.test
index 2fb586e..862b43e 100755
--- a/tests/subst-no-trailing-empty-line.test
+++ b/tests/subst-no-trailing-empty-line.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2006, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subst.test b/tests/subst.test
index d1e832b..c28dbd7 100755
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2007, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subst3.test b/tests/subst3.test
index 6780671..47d1080 100755
--- a/tests/subst3.test
+++ b/tests/subst3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subst4.test b/tests/subst4.test
index b86a20e..7c0cc82 100755
--- a/tests/subst4.test
+++ b/tests/subst4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/subst5.test b/tests/subst5.test
index 097dfe3..ab484a9 100755
--- a/tests/subst5.test
+++ b/tests/subst5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/substre2.test b/tests/substre2.test
index 1935622..99aa3c6 100755
--- a/tests/substre2.test
+++ b/tests/substre2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/substref.test b/tests/substref.test
index a3088b0..6eb5c12 100755
--- a/tests/substref.test
+++ b/tests/substref.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/substtarg.test b/tests/substtarg.test
index 1cd5af0..abca749 100755
--- a/tests/substtarg.test
+++ b/tests/substtarg.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix-chain.tap b/tests/suffix-chain.tap
index 90ebd2a..42286d3 100755
--- a/tests/suffix-chain.tap
+++ b/tests/suffix-chain.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix.test b/tests/suffix.test
index 9f0a5ff..8529a67 100755
--- a/tests/suffix.test
+++ b/tests/suffix.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix10.tap b/tests/suffix10.tap
index 8222913..2fef1c1 100755
--- a/tests/suffix10.tap
+++ b/tests/suffix10.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ libfoo_la_SOURCES = foo.x_
&& echo 'void yyerror (char *s) {}' \
&& echo '%}' \
&& echo '%%' \
- && echo 'WORD: "foo";' \
+ && echo 'foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};' \
&& echo '%%' \
&& cat $<; \
} > address@hidden
diff --git a/tests/suffix11.tap b/tests/suffix11.tap
index bbf8dc0..d454909 100755
--- a/tests/suffix11.tap
+++ b/tests/suffix11.tap
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix12.test b/tests/suffix12.test
index 2aa1c12..e0a3d37 100755
--- a/tests/suffix12.test
+++ b/tests/suffix12.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix13.test b/tests/suffix13.test
index 315771d..73f0506 100755
--- a/tests/suffix13.test
+++ b/tests/suffix13.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix2.test b/tests/suffix2.test
index 513d017..f34a412 100755
--- a/tests/suffix2.test
+++ b/tests/suffix2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix3.tap b/tests/suffix3.tap
index e494159..7ad8088 100755
--- a/tests/suffix3.tap
+++ b/tests/suffix3.tap
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -57,7 +56,6 @@ command_ok_ "configure" ./configure
# This is deliberately valid C++, but invalid C.
cat > foo.zoo <<'END'
-#include <iostream>
using namespace std;
INTEGER main (void)
{
diff --git a/tests/suffix4.test b/tests/suffix4.test
index 4eae8e1..4523096 100755
--- a/tests/suffix4.test
+++ b/tests/suffix4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix5.test b/tests/suffix5.test
index 995db31..9f55f18 100755
--- a/tests/suffix5.test
+++ b/tests/suffix5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix6.test b/tests/suffix6.test
index c50b442..4b13ed0 100755
--- a/tests/suffix6.test
+++ b/tests/suffix6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix6b.test b/tests/suffix6b.test
index badc969..ffd9ba0 100755
--- a/tests/suffix6b.test
+++ b/tests/suffix6b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix6c.test b/tests/suffix6c.test
index 82927da..8cea2cd 100755
--- a/tests/suffix6c.test
+++ b/tests/suffix6c.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix7.test b/tests/suffix7.test
index 8d291bb..bef1031 100755
--- a/tests/suffix7.test
+++ b/tests/suffix7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix8.tap b/tests/suffix8.tap
index a4415a4..d999dcc 100755
--- a/tests/suffix8.tap
+++ b/tests/suffix8.tap
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/suffix9.test b/tests/suffix9.test
index 8cd973b..7e4547b 100755
--- a/tests/suffix9.test
+++ b/tests/suffix9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/symlink.test b/tests/symlink.test
index 790c566..1936d07 100755
--- a/tests/symlink.test
+++ b/tests/symlink.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1999, 2001, 2002, 2003, 2004, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/symlink2.test b/tests/symlink2.test
index 413c60c..f18fc28 100755
--- a/tests/symlink2.test
+++ b/tests/symlink2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/syntax.test b/tests/syntax.test
index 4957b8e..5b51a7a 100755
--- a/tests/syntax.test
+++ b/tests/syntax.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tags.test b/tests/tags.test
index 8d974db..b1b95a2 100755
--- a/tests/tags.test
+++ b/tests/tags.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tags2.test b/tests/tags2.test
index 60e6f46..efc9e48 100755
--- a/tests/tags2.test
+++ b/tests/tags2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tagsub.test b/tests/tagsub.test
index 7d449ea..807c850 100755
--- a/tests/tagsub.test
+++ b/tests/tagsub.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-ambiguous-directive.test
b/tests/tap-ambiguous-directive.test
index 203fb8a..68ed990 100755
--- a/tests/tap-ambiguous-directive.test
+++ b/tests/tap-ambiguous-directive.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-autonumber.test b/tests/tap-autonumber.test
index 43989d1..37e85ca 100755
--- a/tests/tap-autonumber.test
+++ b/tests/tap-autonumber.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-bad-prog.tap b/tests/tap-bad-prog.tap
index b02e51a..7504bbd 100755
--- a/tests/tap-bad-prog.tap
+++ b/tests/tap-bad-prog.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-bailout-and-logging.test
b/tests/tap-bailout-and-logging.test
index 65e2934..8019caa 100755
--- a/tests/tap-bailout-and-logging.test
+++ b/tests/tap-bailout-and-logging.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-bailout-leading-space.test
b/tests/tap-bailout-leading-space.test
index 1cf8940..421dfe2 100755
--- a/tests/tap-bailout-leading-space.test
+++ b/tests/tap-bailout-leading-space.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-bailout-suppress-badexit.test
b/tests/tap-bailout-suppress-badexit.test
index 080557e..b8d6554 100755
--- a/tests/tap-bailout-suppress-badexit.test
+++ b/tests/tap-bailout-suppress-badexit.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-bailout-suppress-later-diagnostic.test
b/tests/tap-bailout-suppress-later-diagnostic.test
index 5389fed..965eb3a 100755
--- a/tests/tap-bailout-suppress-later-diagnostic.test
+++ b/tests/tap-bailout-suppress-later-diagnostic.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-bailout-suppress-later-errors.test
b/tests/tap-bailout-suppress-later-errors.test
index c6a6e4a..1be0389 100755
--- a/tests/tap-bailout-suppress-later-errors.test
+++ b/tests/tap-bailout-suppress-later-errors.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-bailout.test b/tests/tap-bailout.test
index 724609e..e952b63 100755
--- a/tests/tap-bailout.test
+++ b/tests/tap-bailout.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-basic.test b/tests/tap-basic.test
index aa31ac7..ec853d3 100755
--- a/tests/tap-basic.test
+++ b/tests/tap-basic.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-color.test b/tests/tap-color.test
index 3ad0d5c..10261cc 100755
--- a/tests/tap-color.test
+++ b/tests/tap-color.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-common-setup.test b/tests/tap-common-setup.test
index 2bcd9e6..1f93cea 100755
--- a/tests/tap-common-setup.test
+++ b/tests/tap-common-setup.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-deps.test b/tests/tap-deps.test
index dde1208..7510243 100755
--- a/tests/tap-deps.test
+++ b/tests/tap-deps.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-diagnostic-custom.test b/tests/tap-diagnostic-custom.test
index 05f0875..d11fac9 100755
--- a/tests/tap-diagnostic-custom.test
+++ b/tests/tap-diagnostic-custom.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-diagnostic.test b/tests/tap-diagnostic.test
index 480e9b3..6bbd9a1 100755
--- a/tests/tap-diagnostic.test
+++ b/tests/tap-diagnostic.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-doc.test b/tests/tap-doc.test
index 94ced61..5622b3f 100755
--- a/tests/tap-doc.test
+++ b/tests/tap-doc.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-doc2.test b/tests/tap-doc2.test
index 2d64072..c23f3f3 100755
--- a/tests/tap-doc2.test
+++ b/tests/tap-doc2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-driver-stderr.test b/tests/tap-driver-stderr.test
index 5938baf..879d051 100755
--- a/tests/tap-driver-stderr.test
+++ b/tests/tap-driver-stderr.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-empty-diagnostic.test b/tests/tap-empty-diagnostic.test
index 78b95ba..9ddd115 100755
--- a/tests/tap-empty-diagnostic.test
+++ b/tests/tap-empty-diagnostic.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-empty.test b/tests/tap-empty.test
index 3d7a0a1..52ad93c 100755
--- a/tests/tap-empty.test
+++ b/tests/tap-empty.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-escape-directive-2.test
b/tests/tap-escape-directive-2.test
index 41c4e74..087a72e 100755
--- a/tests/tap-escape-directive-2.test
+++ b/tests/tap-escape-directive-2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-escape-directive.test b/tests/tap-escape-directive.test
index 4bcec59..5e0c1b4 100755
--- a/tests/tap-escape-directive.test
+++ b/tests/tap-escape-directive.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-exit.test b/tests/tap-exit.test
index 6cb3053..f7a34c4 100755
--- a/tests/tap-exit.test
+++ b/tests/tap-exit.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-fancy.test b/tests/tap-fancy.test
index b89aa09..00d973e 100755
--- a/tests/tap-fancy.test
+++ b/tests/tap-fancy.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-fancy2.test b/tests/tap-fancy2.test
index 8080861..9f26a95 100755
--- a/tests/tap-fancy2.test
+++ b/tests/tap-fancy2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-functions.sh b/tests/tap-functions.sh
index e8ce876..50abc70 100644
--- a/tests/tap-functions.sh
+++ b/tests/tap-functions.sh
@@ -1,6 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-global-log.test b/tests/tap-global-log.test
index 18a4b94..d5915ae 100755
--- a/tests/tap-global-log.test
+++ b/tests/tap-global-log.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-global-result.test b/tests/tap-global-result.test
index ee67d06..c3cd07e 100755
--- a/tests/tap-global-result.test
+++ b/tests/tap-global-result.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-log.test b/tests/tap-log.test
index 8d895f1..62cc222 100755
--- a/tests/tap-log.test
+++ b/tests/tap-log.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-merge-stdout-stderr.test
b/tests/tap-merge-stdout-stderr.test
index 80e7159..7b14c7f 100755
--- a/tests/tap-merge-stdout-stderr.test
+++ b/tests/tap-merge-stdout-stderr.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-missing-plan-and-bad-exit.test
b/tests/tap-missing-plan-and-bad-exit.test
index 8a0c40f..796b4b0 100755
--- a/tests/tap-missing-plan-and-bad-exit.test
+++ b/tests/tap-missing-plan-and-bad-exit.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-more.test b/tests/tap-more.test
index fcad2fc..413edb1 100755
--- a/tests/tap-more.test
+++ b/tests/tap-more.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-more2.test b/tests/tap-more2.test
index b1031f2..c5e173a 100755
--- a/tests/tap-more2.test
+++ b/tests/tap-more2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-msg0-bailout.test b/tests/tap-msg0-bailout.test
index f87e66e..1b94fe9 100755
--- a/tests/tap-msg0-bailout.test
+++ b/tests/tap-msg0-bailout.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-msg0-directive.test b/tests/tap-msg0-directive.test
index a61cbf8..8ca5b1c 100755
--- a/tests/tap-msg0-directive.test
+++ b/tests/tap-msg0-directive.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-msg0-misc.test b/tests/tap-msg0-misc.test
index 6202689..d6323ad 100755
--- a/tests/tap-msg0-misc.test
+++ b/tests/tap-msg0-misc.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-msg0-planskip.test b/tests/tap-msg0-planskip.test
index 76ae8ee..a089424 100755
--- a/tests/tap-msg0-planskip.test
+++ b/tests/tap-msg0-planskip.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-msg0-result.test b/tests/tap-msg0-result.test
index c616a8a..31e49cd 100755
--- a/tests/tap-msg0-result.test
+++ b/tests/tap-msg0-result.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-negative-numbers.test b/tests/tap-negative-numbers.test
index 944803d..80db0b4 100755
--- a/tests/tap-negative-numbers.test
+++ b/tests/tap-negative-numbers.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-no-disable-hard-error.test
b/tests/tap-no-disable-hard-error.test
index 0ea4409..5b2d00f 100755
--- a/tests/tap-no-disable-hard-error.test
+++ b/tests/tap-no-disable-hard-error.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-no-merge-stdout-stderr.test
b/tests/tap-no-merge-stdout-stderr.test
index a7a0da0..4cc260a 100755
--- a/tests/tap-no-merge-stdout-stderr.test
+++ b/tests/tap-no-merge-stdout-stderr.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-no-spurious-numbers.test
b/tests/tap-no-spurious-numbers.test
index 0c49995..24c6d09 100755
--- a/tests/tap-no-spurious-numbers.test
+++ b/tests/tap-no-spurious-numbers.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-no-spurious-summary.test
b/tests/tap-no-spurious-summary.test
index 12b54b5..881dec9 100755
--- a/tests/tap-no-spurious-summary.test
+++ b/tests/tap-no-spurious-summary.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-no-spurious.test b/tests/tap-no-spurious.test
index c2d5bc5..a46ba5c 100755
--- a/tests/tap-no-spurious.test
+++ b/tests/tap-no-spurious.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-not-ok-skip.test b/tests/tap-not-ok-skip.test
index 10597ef..2574f21 100755
--- a/tests/tap-not-ok-skip.test
+++ b/tests/tap-not-ok-skip.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-number-wordboundary.test
b/tests/tap-number-wordboundary.test
index 63c04e6..e8d97e7 100755
--- a/tests/tap-number-wordboundary.test
+++ b/tests/tap-number-wordboundary.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-numbers-leading-zero.test
b/tests/tap-numbers-leading-zero.test
index a58132e..e288270 100755
--- a/tests/tap-numbers-leading-zero.test
+++ b/tests/tap-numbers-leading-zero.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-numeric-description.test
b/tests/tap-numeric-description.test
index 7fcb685..3691e8e 100755
--- a/tests/tap-numeric-description.test
+++ b/tests/tap-numeric-description.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-out-of-order.test b/tests/tap-out-of-order.test
index 4b697da..efcda4d 100755
--- a/tests/tap-out-of-order.test
+++ b/tests/tap-out-of-order.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-passthrough-exit.test b/tests/tap-passthrough-exit.test
index d4d439f..a751b7e 100755
--- a/tests/tap-passthrough-exit.test
+++ b/tests/tap-passthrough-exit.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-passthrough.test b/tests/tap-passthrough.test
index cc2b1a0..17d4599 100755
--- a/tests/tap-passthrough.test
+++ b/tests/tap-passthrough.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-plan-corner.test b/tests/tap-plan-corner.test
index c1bf41b..ad7aff7 100755
--- a/tests/tap-plan-corner.test
+++ b/tests/tap-plan-corner.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-plan-errors.test b/tests/tap-plan-errors.test
index e3c02c8..f38868b 100755
--- a/tests/tap-plan-errors.test
+++ b/tests/tap-plan-errors.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-plan-leading-zero.test b/tests/tap-plan-leading-zero.test
index 8349587..d680c69 100755
--- a/tests/tap-plan-leading-zero.test
+++ b/tests/tap-plan-leading-zero.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-plan-malformed.test b/tests/tap-plan-malformed.test
index b92d5c9..35c96e8 100755
--- a/tests/tap-plan-malformed.test
+++ b/tests/tap-plan-malformed.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-plan-middle.test b/tests/tap-plan-middle.test
index ccd4605..0ca3c90 100755
--- a/tests/tap-plan-middle.test
+++ b/tests/tap-plan-middle.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-plan-whitespace.test b/tests/tap-plan-whitespace.test
index 95e20fd..086b6e4 100755
--- a/tests/tap-plan-whitespace.test
+++ b/tests/tap-plan-whitespace.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-plan.test b/tests/tap-plan.test
index 39b827f..8eacc47 100755
--- a/tests/tap-plan.test
+++ b/tests/tap-plan.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-planskip-and-logging.test
b/tests/tap-planskip-and-logging.test
index 853bfe8..968ba14 100755
--- a/tests/tap-planskip-and-logging.test
+++ b/tests/tap-planskip-and-logging.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-planskip-badexit.test b/tests/tap-planskip-badexit.test
index 9638867..1fab646 100755
--- a/tests/tap-planskip-badexit.test
+++ b/tests/tap-planskip-badexit.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-planskip-bailout.test b/tests/tap-planskip-bailout.test
index 039de23..932f6ee 100755
--- a/tests/tap-planskip-bailout.test
+++ b/tests/tap-planskip-bailout.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-planskip-case-insensitive.test
b/tests/tap-planskip-case-insensitive.test
index 2f6f1cc..ff41b56 100755
--- a/tests/tap-planskip-case-insensitive.test
+++ b/tests/tap-planskip-case-insensitive.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-planskip-late.test b/tests/tap-planskip-late.test
index 2e8d965..ef60cfb 100755
--- a/tests/tap-planskip-late.test
+++ b/tests/tap-planskip-late.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-planskip-later-errors.test
b/tests/tap-planskip-later-errors.test
index cf935a1..1dc2e1c 100755
--- a/tests/tap-planskip-later-errors.test
+++ b/tests/tap-planskip-later-errors.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-planskip-unplanned-corner.test
b/tests/tap-planskip-unplanned-corner.test
index 8435cb3..be2c7bf 100755
--- a/tests/tap-planskip-unplanned-corner.test
+++ b/tests/tap-planskip-unplanned-corner.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-planskip-unplanned.test
b/tests/tap-planskip-unplanned.test
index c5e3ccb..2f4a0e5 100755
--- a/tests/tap-planskip-unplanned.test
+++ b/tests/tap-planskip-unplanned.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-planskip-whitespace.test
b/tests/tap-planskip-whitespace.test
index 6448f5c..95d01db 100755
--- a/tests/tap-planskip-whitespace.test
+++ b/tests/tap-planskip-whitespace.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-planskip.test b/tests/tap-planskip.test
index 3108983..d5ab31f 100755
--- a/tests/tap-planskip.test
+++ b/tests/tap-planskip.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-realtime.test b/tests/tap-realtime.test
index e1d248a..624bdec 100755
--- a/tests/tap-realtime.test
+++ b/tests/tap-realtime.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-recheck-logs.test b/tests/tap-recheck-logs.test
index 16ae7c7..6168806 100755
--- a/tests/tap-recheck-logs.test
+++ b/tests/tap-recheck-logs.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-recheck.test b/tests/tap-recheck.test
index 09c17f4..6ff5d3d 100755
--- a/tests/tap-recheck.test
+++ b/tests/tap-recheck.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-result-comment.test b/tests/tap-result-comment.test
index ef7fc11..4e4fd7a 100755
--- a/tests/tap-result-comment.test
+++ b/tests/tap-result-comment.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-setup.sh b/tests/tap-setup.sh
index 00397e0..ee9d814 100755
--- a/tests/tap-setup.sh
+++ b/tests/tap-setup.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-signal.tap b/tests/tap-signal.tap
index f436bc8..58f8d0c 100755
--- a/tests/tap-signal.tap
+++ b/tests/tap-signal.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -71,6 +71,8 @@ $AUTOMAKE
./configure
+system=`uname -s -r || echo unknown` # Needed later.
+
signal_caught ()
{
numeric=$1
@@ -83,7 +85,13 @@ signal_caught ()
15) symbolic=TERM;;
*) fatal_ "unexpected signal number '$numeric'"
esac
- sig_re="((SIG)?$symbolic|$numeric)"
+ # Sending a SIGQUIT on Cygwin 1.5 can cause a segmentation fault
+ # instead (sometimes). Don't let this older bug pollute the results
+ # of our testsuite.
+ case $numeric,$system in
+ 3,CYGWIN*\ 1.5.*) sig_re="((SIG)?($symbolic|SEGV)|$numeric|11)";;
+ *) sig_re="((SIG)?$symbolic|$numeric)";;
+ esac
wbound_re="($|[^a-zA-Z0-9_-])"
pfx_re="^ERROR: signal-$numeric\\.test"
case $am_tap_implementation in
@@ -98,7 +106,17 @@ signal_caught ()
esac
}
-command_ok_ '"make check" fails' eval 'not $MAKE check >stdout'
+command_ok_ '"make check" fails' eval '
+ (
+ st=0; $MAKE check >stdout || st=$?
+ cat stdout
+ # Extra "echo" and silencing of xtraces required to avoid possible
+ # garbled output with NetBSD make, which would miss some final
+ # newlines in the expected places and thus mess up our TAP output.
+ set +x; echo
+ test $st -gt 0
+ )
+'
cat stdout # For debugging.
command_ok_ "count of test results" count_test_results \
diff --git a/tests/tap-summary-aux.sh b/tests/tap-summary-aux.sh
index b35565a..518a35f 100755
--- a/tests/tap-summary-aux.sh
+++ b/tests/tap-summary-aux.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-summary-color.test b/tests/tap-summary-color.test
index 2dacb54..c3edbcf 100755
--- a/tests/tap-summary-color.test
+++ b/tests/tap-summary-color.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-summary.test b/tests/tap-summary.test
index b49aba7..8fe4e8b 100755
--- a/tests/tap-summary.test
+++ b/tests/tap-summary.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-test-number-0.test b/tests/tap-test-number-0.test
index a198083..d9d1a5b 100755
--- a/tests/tap-test-number-0.test
+++ b/tests/tap-test-number-0.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-todo-skip-together.test
b/tests/tap-todo-skip-together.test
index 39a0177..5a07bcd 100755
--- a/tests/tap-todo-skip-together.test
+++ b/tests/tap-todo-skip-together.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-todo-skip-whitespace.test
b/tests/tap-todo-skip-whitespace.test
index 12e621f..414d2ca 100755
--- a/tests/tap-todo-skip-whitespace.test
+++ b/tests/tap-todo-skip-whitespace.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-todo-skip.test b/tests/tap-todo-skip.test
index 7bd894b..775fe35 100755
--- a/tests/tap-todo-skip.test
+++ b/tests/tap-todo-skip.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-unplanned.test b/tests/tap-unplanned.test
index 4244104..4f60ab9 100755
--- a/tests/tap-unplanned.test
+++ b/tests/tap-unplanned.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-whitespace-normalization.test
b/tests/tap-whitespace-normalization.test
index e44a659..3044f66 100755
--- a/tests/tap-whitespace-normalization.test
+++ b/tests/tap-whitespace-normalization.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-with-and-without-number.test
b/tests/tap-with-and-without-number.test
index 0865a6e..a116dba 100755
--- a/tests/tap-with-and-without-number.test
+++ b/tests/tap-with-and-without-number.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tap-xfail-tests.test b/tests/tap-xfail-tests.test
index 3b98dd2..6cede30 100755
--- a/tests/tap-xfail-tests.test
+++ b/tests/tap-xfail-tests.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tar-override.test b/tests/tar-override.test
index 3dd4180..bda62c4 100755
--- a/tests/tar-override.test
+++ b/tests/tar-override.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tar.test b/tests/tar.test
index 22fdcb9..1e6a3f2 100755
--- a/tests/tar.test
+++ b/tests/tar.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tar2.test b/tests/tar2.test
index 205a37e..0b62a7f 100755
--- a/tests/tar2.test
+++ b/tests/tar2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tar3.test b/tests/tar3.test
index a08bb70..12126b4 100755
--- a/tests/tar3.test
+++ b/tests/tar3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index cbb5e33..82ead7d 100755
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/targetclash.test b/tests/targetclash.test
index c712fd5..a2c841c 100755
--- a/tests/targetclash.test
+++ b/tests/targetclash.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-acsubst.test b/tests/test-driver-acsubst.test
index 9c29ac9..970a7b3 100755
--- a/tests/test-driver-acsubst.test
+++ b/tests/test-driver-acsubst.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-cond.test b/tests/test-driver-cond.test
index 46986ff..932df51 100755
--- a/tests/test-driver-cond.test
+++ b/tests/test-driver-cond.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-create-log-dir.test
b/tests/test-driver-create-log-dir.test
index 902ae7c..15ed0cb 100755
--- a/tests/test-driver-create-log-dir.test
+++ b/tests/test-driver-create-log-dir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-custom-multitest-recheck.test
b/tests/test-driver-custom-multitest-recheck.test
index bd9e9d6..7d9411d 100755
--- a/tests/test-driver-custom-multitest-recheck.test
+++ b/tests/test-driver-custom-multitest-recheck.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-custom-multitest-recheck2.test
b/tests/test-driver-custom-multitest-recheck2.test
index 9f15d0e..8fea8de 100755
--- a/tests/test-driver-custom-multitest-recheck2.test
+++ b/tests/test-driver-custom-multitest-recheck2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-custom-multitest.test
b/tests/test-driver-custom-multitest.test
index 6e7cdb2..b170b95 100755
--- a/tests/test-driver-custom-multitest.test
+++ b/tests/test-driver-custom-multitest.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-custom-no-extra-driver.test
b/tests/test-driver-custom-no-extra-driver.test
index 18a94e4..6bfe952 100755
--- a/tests/test-driver-custom-no-extra-driver.test
+++ b/tests/test-driver-custom-no-extra-driver.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-custom-xfail-tests.test
b/tests/test-driver-custom-xfail-tests.test
index 7758097..cfc2e9b 100755
--- a/tests/test-driver-custom-xfail-tests.test
+++ b/tests/test-driver-custom-xfail-tests.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-custom.test b/tests/test-driver-custom.test
index a6f8deb..3fc7ab9 100755
--- a/tests/test-driver-custom.test
+++ b/tests/test-driver-custom.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-fail.test b/tests/test-driver-fail.test
index fdc7251..a9359da 100755
--- a/tests/test-driver-fail.test
+++ b/tests/test-driver-fail.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-is-distributed.test
b/tests/test-driver-is-distributed.test
index 054c6d9..106c792 100755
--- a/tests/test-driver-is-distributed.test
+++ b/tests/test-driver-is-distributed.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,76 +18,77 @@
# - `test-driver' script not correctly distributed when TESTS is
# defined in a subdir Makefile
+am_create_testdir=empty
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([tests/Makefile])
-AC_OUTPUT
+ocwd=`pwd` || fatal_ "getting current working directory"
+
+do_check ()
+{
+ whereopts=$1 auxdir=$2
+ case $#,$whereopts in
+ 2,ac) ac_opts=parallel-tests am_code= ;;
+ 2,am) am_opts=parallel-tests ac_code= ;;
+ *) fatal_ "do_check: bad usage";;
+ esac
+ mkdir $whereopts
+ cd $whereopts
+ mkdir tests
+ unindent > configure.in << END
+ AC_INIT([$me], [1.0])
+ AC_CONFIG_AUX_DIR([$auxdir])
+ AM_INIT_AUTOMAKE([$ac_opts])
+ AC_CONFIG_FILES([Makefile tests/Makefile])
+ AC_OUTPUT
END
-
-rm -f depcomp # It's unneeded.
-
-mkdir tests
-
-cat > Makefile.am << 'END'
-SUBDIRS = tests
-check-local: test-top
-test-top: distdir
- ls -l $(distdir) $(distdir)/* ;: For debugging.
- test -f $(distdir)/test-driver
-.PHONY: test-top
+ if test $auxdir = .; then
+ test_driver=test-driver
+ else
+ mkdir $auxdir
+ test_driver=$auxdir/test-driver
+ fi
+ # No 'AUTOMAKE_OPTIONS' in here -- purposely.
+ unindent > Makefile.am << END
+ SUBDIRS = tests
+ check-local: test-top
+ test-top: distdir
+ ls -l \$(distdir) \$(distdir)/* ;: For debugging.
+ test -f \$(distdir)/$test_driver
+ .PHONY: test-top
END
-
-cat > tests/Makefile.am << 'END'
-check-local: test-sub
-test-sub:
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]test-driver '
-TESTS = foo.test
-EXTRA_DIST = $(TESTS)
+ unindent > tests/Makefile.am << END
+ AUTOMAKE_OPTIONS = $am_opts
+ check-local: test-sub
+ test-sub:
+ echo ' ' \$(DIST_COMMON) ' ' | grep '[ /]$test_driver '
+ TESTS = foo.test
+ EXTRA_DIST = \$(TESTS)
END
-
-cat > tests/foo.test << 'END'
-#!/bin/sh
-exit 0
+ unindent > tests/foo.test << 'END'
+ #!/bin/sh
+ exit 0
END
-chmod a+x tests/foo.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-$MAKE test-top
-cd tests; $MAKE test-sub; cd ..;
-$MAKE distcheck
-
-# Try again, with a `config_auxdir' != `.' this time.
-
-$MAKE distclean
-
-mkdir build-aux
-mv missing install-sh test-driver build-aux
-
-for d in . tests; do
- sed 's|test-driver|build-aux/test-driver|' $d/Makefile.am > $d/t
- mv -f $d/t $d/Makefile.am
- cat $d/Makefile.am # For debugging.
-done
-
-# Extra newline possibly required by OpenBSD 3.9 sed, see the autoconf
-# manual for details.
-sed '/^AC_INIT/i\
-AC_CONFIG_AUX_DIR([build-aux])
-' configure.in > t
-mv -f t configure.in
-cat configure.in # For debugging.
-
-touch aclocal.m4 # To avoid useless remakes.
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE test-top
-cd tests; $MAKE test-sub; cd ..;
-$MAKE distcheck
+ chmod a+x tests/foo.test
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a
+ ./configure
+ $MAKE test-top
+ cd tests
+ $MAKE test-sub
+ cd ..
+ $MAKE distcheck
+ # Try code path without automatic installation of required files.
+ mv -f Makefile.in Makefile.sav
+ mv -f tests/Makefile.in tests/Makefile.sav
+ $AUTOMAKE
+ diff Makefile.in Makefile.sav
+ diff tests/Makefile.in tests/Makefile.sav
+ :
+}
+
+do_check ac .
+do_check am build-aux
:
diff --git a/tests/test-driver-strip-vpath.test
b/tests/test-driver-strip-vpath.test
index 3ba34ff..f6b232b 100755
--- a/tests/test-driver-strip-vpath.test
+++ b/tests/test-driver-strip-vpath.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-driver-trs-suffix-registered.test
b/tests/test-driver-trs-suffix-registered.test
index 4a5b195..00b6669 100755
--- a/tests/test-driver-trs-suffix-registered.test
+++ b/tests/test-driver-trs-suffix-registered.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-extensions-cond.test b/tests/test-extensions-cond.test
index 0f9708c..55fc4f4 100755
--- a/tests/test-extensions-cond.test
+++ b/tests/test-extensions-cond.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-extensions.test b/tests/test-extensions.test
index e9b7e02..d024619 100755
--- a/tests/test-extensions.test
+++ b/tests/test-extensions.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-harness-vpath-rewrite.test
b/tests/test-harness-vpath-rewrite.test
index 9d61064..1ce4833 100755
--- a/tests/test-harness-vpath-rewrite.test
+++ b/tests/test-harness-vpath-rewrite.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-log.test b/tests/test-log.test
index a42cccb..588754f 100755
--- a/tests/test-log.test
+++ b/tests/test-log.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-logs-repeated.test b/tests/test-logs-repeated.test
index 0bec579..0738786 100755
--- a/tests/test-logs-repeated.test
+++ b/tests/test-logs-repeated.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-metadata-global-log.test
b/tests/test-metadata-global-log.test
index ab43802..ce956d9 100755
--- a/tests/test-metadata-global-log.test
+++ b/tests/test-metadata-global-log.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-metadata-global-result.test
b/tests/test-metadata-global-result.test
index f524328..c3682a3 100755
--- a/tests/test-metadata-global-result.test
+++ b/tests/test-metadata-global-result.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-metadata-recheck.test b/tests/test-metadata-recheck.test
index 1d34ff1..3779710 100755
--- a/tests/test-metadata-recheck.test
+++ b/tests/test-metadata-recheck.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-metadata-results.test b/tests/test-metadata-results.test
index 11feea7..373b84f 100755
--- a/tests/test-metadata-results.test
+++ b/tests/test-metadata-results.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-missing.test b/tests/test-missing.test
index 885a4c7..ee19987 100755
--- a/tests/test-missing.test
+++ b/tests/test-missing.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-missing2.test b/tests/test-missing2.test
index 25d5173..c762dd6 100755
--- a/tests/test-missing2.test
+++ b/tests/test-missing2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-trs-basic.test b/tests/test-trs-basic.test
index cbd27cb..43f78d9 100755
--- a/tests/test-trs-basic.test
+++ b/tests/test-trs-basic.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-trs-recover.test b/tests/test-trs-recover.test
index 326d005..4e527cc 100755
--- a/tests/test-trs-recover.test
+++ b/tests/test-trs-recover.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/test-trs-recover2.test b/tests/test-trs-recover2.test
index dc078bf..b4dbff8 100755
--- a/tests/test-trs-recover2.test
+++ b/tests/test-trs-recover2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tests-environment-and-log-compiler.test
b/tests/tests-environment-and-log-compiler.test
index c639355..3767790 100755
--- a/tests/tests-environment-and-log-compiler.test
+++ b/tests/tests-environment-and-log-compiler.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tests-environment-backcompat.test
b/tests/tests-environment-backcompat.test
index 36cc642..af2b5d5 100755
--- a/tests/tests-environment-backcompat.test
+++ b/tests/tests-environment-backcompat.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tests-environment-fd-redirect.test
b/tests/tests-environment-fd-redirect.test
index 855e342..dc5886f 100755
--- a/tests/tests-environment-fd-redirect.test
+++ b/tests/tests-environment-fd-redirect.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/tests-environment.test b/tests/tests-environment.test
index e3dc76a..87b0975 100755
--- a/tests/tests-environment.test
+++ b/tests/tests-environment.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/testsuite-summary-checks.sh
b/tests/testsuite-summary-checks.sh
index fcf619a..26e285f 100755
--- a/tests/testsuite-summary-checks.sh
+++ b/tests/testsuite-summary-checks.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/testsuite-summary-color.test
b/tests/testsuite-summary-color.test
index 9493744..e2a0e68 100755
--- a/tests/testsuite-summary-color.test
+++ b/tests/testsuite-summary-color.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/testsuite-summary-count-many.test
b/tests/testsuite-summary-count-many.test
index 2621b29..5e8a295 100755
--- a/tests/testsuite-summary-count-many.test
+++ b/tests/testsuite-summary-count-many.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/testsuite-summary-count.test
b/tests/testsuite-summary-count.test
index 090fabb..70936fc 100755
--- a/tests/testsuite-summary-count.test
+++ b/tests/testsuite-summary-count.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/testsuite-summary-reference-log.test
b/tests/testsuite-summary-reference-log.test
index 9d1809e..e8f9c05 100755
--- a/tests/testsuite-summary-reference-log.test
+++ b/tests/testsuite-summary-reference-log.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/transform.test b/tests/transform.test
index fb15503..acb49a3 100755
--- a/tests/transform.test
+++ b/tests/transform.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/transform2.test b/tests/transform2.test
index a7dd9f9..2b27b45 100755
--- a/tests/transform2.test
+++ b/tests/transform2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2007, 2008, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/trivial-test-driver b/tests/trivial-test-driver
index 7b3ef10..819865e 100644
--- a/tests/trivial-test-driver
+++ b/tests/trivial-test-driver
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo-unrecognized-extension.test
b/tests/txinfo-unrecognized-extension.test
index 719f508..2516580 100755
--- a/tests/txinfo-unrecognized-extension.test
+++ b/tests/txinfo-unrecognized-extension.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo.test b/tests/txinfo.test
index 3b7be76..40c92c5 100755
--- a/tests/txinfo.test
+++ b/tests/txinfo.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo10.test b/tests/txinfo10.test
index 1c58739..6908ab8 100755
--- a/tests/txinfo10.test
+++ b/tests/txinfo10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo13.test b/tests/txinfo13.test
index d50b8bd..625dd10 100755
--- a/tests/txinfo13.test
+++ b/tests/txinfo13.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2007, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo16.test b/tests/txinfo16.test
index 8ed8b11..c1b3fe7 100755
--- a/tests/txinfo16.test
+++ b/tests/txinfo16.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo17.test b/tests/txinfo17.test
index 92abcf5..1de7e9a 100755
--- a/tests/txinfo17.test
+++ b/tests/txinfo17.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo18.test b/tests/txinfo18.test
index 01e4c21..c0d1881 100755
--- a/tests/txinfo18.test
+++ b/tests/txinfo18.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2008, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo19.test b/tests/txinfo19.test
index 80602fd..c947753 100755
--- a/tests/txinfo19.test
+++ b/tests/txinfo19.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo2.test b/tests/txinfo2.test
index 39c404c..a33bf7e 100755
--- a/tests/txinfo2.test
+++ b/tests/txinfo2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo20.test b/tests/txinfo20.test
index b56cdef..2fd4cdf 100755
--- a/tests/txinfo20.test
+++ b/tests/txinfo20.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo21.test b/tests/txinfo21.test
index 18740ba..eae9515 100755
--- a/tests/txinfo21.test
+++ b/tests/txinfo21.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2006, 2008, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo22.test b/tests/txinfo22.test
index 07f0573..0b90e85 100755
--- a/tests/txinfo22.test
+++ b/tests/txinfo22.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2007, 2008, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo23.test b/tests/txinfo23.test
index de82f81..1693b82 100755
--- a/tests/txinfo23.test
+++ b/tests/txinfo23.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo24.test b/tests/txinfo24.test
index d2bacc8..f62e14a 100755
--- a/tests/txinfo24.test
+++ b/tests/txinfo24.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo25.test b/tests/txinfo25.test
index b97b1a1..5cdd293 100755
--- a/tests/txinfo25.test
+++ b/tests/txinfo25.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo26.test b/tests/txinfo26.test
index 46bb322..b958aaf 100755
--- a/tests/txinfo26.test
+++ b/tests/txinfo26.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2007, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo27.test b/tests/txinfo27.test
index 368707f..ecd98c6 100755
--- a/tests/txinfo27.test
+++ b/tests/txinfo27.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo28.test b/tests/txinfo28.test
index 808affe..058e47c 100755
--- a/tests/txinfo28.test
+++ b/tests/txinfo28.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo29.test b/tests/txinfo29.test
index 9243e38..cf6112f 100755
--- a/tests/txinfo29.test
+++ b/tests/txinfo29.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo3.test b/tests/txinfo3.test
index 57ebd71..b662def 100755
--- a/tests/txinfo3.test
+++ b/tests/txinfo3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2003, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo30.test b/tests/txinfo30.test
index ee6976f..799cefc 100755
--- a/tests/txinfo30.test
+++ b/tests/txinfo30.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo31.test b/tests/txinfo31.test
index d657f22..191bca4 100755
--- a/tests/txinfo31.test
+++ b/tests/txinfo31.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo32.test b/tests/txinfo32.test
index 6c7c751..8c25bed 100755
--- a/tests/txinfo32.test
+++ b/tests/txinfo32.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo33.test b/tests/txinfo33.test
index 38bea68..30f34f9 100755
--- a/tests/txinfo33.test
+++ b/tests/txinfo33.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo4.test b/tests/txinfo4.test
index 93acdba..f92f9c1 100755
--- a/tests/txinfo4.test
+++ b/tests/txinfo4.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2003, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo5.test b/tests/txinfo5.test
index e9c43fd..e4aa1f6 100755
--- a/tests/txinfo5.test
+++ b/tests/txinfo5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo5b.test b/tests/txinfo5b.test
index be52e0b..d4e0b19 100755
--- a/tests/txinfo5b.test
+++ b/tests/txinfo5b.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo6.test b/tests/txinfo6.test
index e6af70c..e8259d0 100755
--- a/tests/txinfo6.test
+++ b/tests/txinfo6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo7.test b/tests/txinfo7.test
index 2a3f171..2a5dc9d 100755
--- a/tests/txinfo7.test
+++ b/tests/txinfo7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo8.test b/tests/txinfo8.test
index 74acc33..e8f6107 100755
--- a/tests/txinfo8.test
+++ b/tests/txinfo8.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/txinfo9.test b/tests/txinfo9.test
index 29635b2..eb2cbdc 100755
--- a/tests/txinfo9.test
+++ b/tests/txinfo9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/uninstall-fail.test b/tests/uninstall-fail.test
index 19b9e53..640ef71 100755
--- a/tests/uninstall-fail.test
+++ b/tests/uninstall-fail.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/uninstall-pr9578.test b/tests/uninstall-pr9578.test
index f9122ce..ba961f9 100755
--- a/tests/uninstall-pr9578.test
+++ b/tests/uninstall-pr9578.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/unused.test b/tests/unused.test
index d22643f..5852f75 100755
--- a/tests/unused.test
+++ b/tests/unused.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2002, 2003, 2008, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/upc.test b/tests/upc.test
index 547aa79..6b467bc 100755
--- a/tests/upc.test
+++ b/tests/upc.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/upc2.test b/tests/upc2.test
index 616b2f4..01a8ca7 100755
--- a/tests/upc2.test
+++ b/tests/upc2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/upc3.test b/tests/upc3.test
index 3c2acfd..91826a9 100755
--- a/tests/upc3.test
+++ b/tests/upc3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vala-vpath.test b/tests/vala-vpath.test
index 89d951d..c2a3ea8 100755
--- a/tests/vala-vpath.test
+++ b/tests/vala-vpath.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vala.test b/tests/vala.test
index d027a6d..b68fd78 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vala1.test b/tests/vala1.test
index ab72025..e5d31fc 100755
--- a/tests/vala1.test
+++ b/tests/vala1.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vala2.test b/tests/vala2.test
index be3cb99..f807934 100755
--- a/tests/vala2.test
+++ b/tests/vala2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vala3.test b/tests/vala3.test
index c25bb84..ed81ba4 100755
--- a/tests/vala3.test
+++ b/tests/vala3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vala4.test b/tests/vala4.test
index 6924c04..f1ce2cc 100755
--- a/tests/vala4.test
+++ b/tests/vala4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vala5.test b/tests/vala5.test
index e0bfed0..ebad7bb 100755
--- a/tests/vala5.test
+++ b/tests/vala5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vars-assign.test b/tests/vars-assign.test
index 46bb29e..9b91c26 100755
--- a/tests/vars-assign.test
+++ b/tests/vars-assign.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vars.test b/tests/vars.test
index aa022af..1e3e91e 100755
--- a/tests/vars.test
+++ b/tests/vars.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vartar.test b/tests/vartar.test
index 8fd7716..ebac14b 100755
--- a/tests/vartar.test
+++ b/tests/vartar.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vartypo2.test b/tests/vartypo2.test
index 624e86b..c58a626 100755
--- a/tests/vartypo2.test
+++ b/tests/vartypo2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vartypos.test b/tests/vartypos.test
index cd8f718..f356385 100755
--- a/tests/vartypos.test
+++ b/tests/vartypos.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/version.test b/tests/version.test
index 48c0ff6..d7fbc03 100755
--- a/tests/version.test
+++ b/tests/version.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/version2.test b/tests/version2.test
index 86bc8d9..8a28227 100755
--- a/tests/version2.test
+++ b/tests/version2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/version3.test b/tests/version3.test
index 5423e7c..2839467 100755
--- a/tests/version3.test
+++ b/tests/version3.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/version4.test b/tests/version4.test
index 1e5510d..7fa429e 100755
--- a/tests/version4.test
+++ b/tests/version4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/version6.test b/tests/version6.test
index a7b6ca3..1c04ab4 100755
--- a/tests/version6.test
+++ b/tests/version6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/version7.test b/tests/version7.test
index febf05c..a0699ed 100755
--- a/tests/version7.test
+++ b/tests/version7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/version8.test b/tests/version8.test
index 9552aff..ace527c 100755
--- a/tests/version8.test
+++ b/tests/version8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005, 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vpath.test b/tests/vpath.test
index 76d3a53..4bfc9be 100755
--- a/tests/vpath.test
+++ b/tests/vpath.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vtexi.test b/tests/vtexi.test
index c0e49f9..09185a8 100755
--- a/tests/vtexi.test
+++ b/tests/vtexi.test
@@ -1,6 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vtexi2.test b/tests/vtexi2.test
index 958de07..18f1e9e 100755
--- a/tests/vtexi2.test
+++ b/tests/vtexi2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vtexi3.test b/tests/vtexi3.test
index b474ef6..b51e145 100755
--- a/tests/vtexi3.test
+++ b/tests/vtexi3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/vtexi4.test b/tests/vtexi4.test
index 2bdcc35..ed4c6fe 100755
--- a/tests/vtexi4.test
+++ b/tests/vtexi4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/warning-groups-win-over-strictness.test
b/tests/warning-groups-win-over-strictness.test
index 86728c6..74ead57 100755
--- a/tests/warning-groups-win-over-strictness.test
+++ b/tests/warning-groups-win-over-strictness.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/warnings-override.test b/tests/warnings-override.test
index 73c36a3..ccd557c 100755
--- a/tests/warnings-override.test
+++ b/tests/warnings-override.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/warnings-precedence.test b/tests/warnings-precedence.test
index bd6c2b7..509aa3f 100755
--- a/tests/warnings-precedence.test
+++ b/tests/warnings-precedence.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/warnings-strictness-interactions.test
b/tests/warnings-strictness-interactions.test
index 1cd557e..d9fb3fb 100755
--- a/tests/warnings-strictness-interactions.test
+++ b/tests/warnings-strictness-interactions.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/warnings-unknown.test b/tests/warnings-unknown.test
index f1fa23e..bddbb25 100755
--- a/tests/warnings-unknown.test
+++ b/tests/warnings-unknown.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/warnings-win-over-strictness.test
b/tests/warnings-win-over-strictness.test
index cf8e6f2..90497b2 100755
--- a/tests/warnings-win-over-strictness.test
+++ b/tests/warnings-win-over-strictness.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/warnopts.test b/tests/warnopts.test
index 4efba48..54c27d5 100755
--- a/tests/warnopts.test
+++ b/tests/warnopts.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/werror.test b/tests/werror.test
index 8ea6c67..606fed6 100755
--- a/tests/werror.test
+++ b/tests/werror.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/werror2.test b/tests/werror2.test
index bb5851e..302d26a 100755
--- a/tests/werror2.test
+++ b/tests/werror2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/werror3.test b/tests/werror3.test
index 86e39ec..75da976 100755
--- a/tests/werror3.test
+++ b/tests/werror3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/werror4.test b/tests/werror4.test
index df41bdc..9dd0672 100755
--- a/tests/werror4.test
+++ b/tests/werror4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/whoami.test b/tests/whoami.test
index fa1b08d..175f02b 100755
--- a/tests/whoami.test
+++ b/tests/whoami.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/xsource.test b/tests/xsource.test
index 5739413..39dbbec 100755
--- a/tests/xsource.test
+++ b/tests/xsource.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/dist-auxfile-2.test b/tests/yacc-auxdir.test
similarity index 52%
copy from tests/dist-auxfile-2.test
copy to tests/yacc-auxdir.test
index 77e6ffb..e58d9a4 100755
--- a/tests/dist-auxfile-2.test
+++ b/tests/yacc-auxdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,47 +14,45 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Files specified by AC_REQUIRE_AUX_FILE must exist, and if a Makefile
-# is present in the build-aux directory, they correctly get automatically
-# distributed.
-# Related to automake bug#9651.
+# Test to make sure ylwrap is put in right location.
+# Report from Tim Van Holder.
-am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in <<END
+set -e
+
+mkdir aux1 sub
+
+cat > configure.in << END
AC_INIT([$me], [1.0])
-AC_CONFIG_AUX_DIR([sub])
+# 'aux' is not an acceptable file/directory name on Windows systems
+AC_CONFIG_AUX_DIR([aux1])
AM_INIT_AUTOMAKE
-AC_REQUIRE_AUX_FILE([zardoz])
AC_CONFIG_FILES([Makefile sub/Makefile])
-AC_OUTPUT
+AC_PROG_CC
+AC_PROG_YACC
END
-cat > Makefile.am <<'END'
+cat > Makefile.am << 'END'
SUBDIRS = sub
-test: distdir
- ls -l $(distdir) $(distdir)/* ;: For debugging.
- test -f $(distdir)/sub/zardoz
-.PHONY: test
-check-local: test
+bin_PROGRAMS = foo
+AM_YFLAGS = -d
+foo_SOURCES = foo.y
END
-mkdir sub
-: > sub/Makefile.am
-
-echo dummy > sub/zardoz
+cat > sub/Makefile.am << 'END'
+bin_PROGRAMS = bar
+AM_YFLAGS = -d
+bar_SOURCES = bar.y main.c
+END
$ACLOCAL
-$AUTOCONF
$AUTOMAKE -a
-test -f sub/install-sh
-# Should work also without `--add-missing'.
-$AUTOMAKE
-
-./configure
-
-$MAKE test
-$MAKE distcheck
+test -f aux1/ylwrap
+test ! -f ylwrap
+test ! -f sub/ylwrap
+grep -i 'ylwrap' Makefile.in sub/Makefile.in # For debugging.
+$FGREP '$(top_srcdir)/aux1/ylwrap' Makefile.in
+$FGREP '$(top_srcdir)/aux1/ylwrap' sub/Makefile.in
:
diff --git a/tests/yacc-basic.test b/tests/yacc-basic.test
index ee153f4..ff233c0 100755
--- a/tests/yacc-basic.test
+++ b/tests/yacc-basic.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,7 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Basic semantic checks on Yacc support.
+# Basic semantic checks on Yacc support (without yacc-generated headers).
+# Keep in sync with sister test `yacc-cxx.test'.
required='cc yacc'
. ./defs || Exit 1
@@ -26,8 +27,10 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
+bin_PROGRAMS = foo bar
foo_SOURCES = parse.y foo.c
+bar_SOURCES = $(foo_SOURCES)
+bar_YFLAGS = -v
.PHONY: echo-distcom
echo-distcom:
@@ -38,7 +41,7 @@ cat > parse.y << 'END'
%{
#include <stdio.h>
#include <stdlib.h>
-int yylex () { return (getchar ()); }
+int yylex () { return getchar (); }
void yyerror (char *s) {}
%}
%%
@@ -55,9 +58,14 @@ $AUTOMAKE -a
./configure
$MAKE
-# The `parse.c' file must be created and not removed (i.e., not treated
-# like an "intermediate file" in the GNU make sense).
+ls -l
+# The Yacc-derived C sources must be created, and not removed once
+# compiled (i.e., not treated like "intermediate files" in the GNU
+# make sense).
test -f parse.c
+test -f bar-parse.c
+# Check that per-object flags are honored.
+test -f bar-parse.output
if cross_compiling; then :; else
echo a | ./foo
@@ -65,23 +73,37 @@ if cross_compiling; then :; else
: For shells with busted 'set -e'.
fi
-# The generated file `parse.c' must be shipped.
+echo a | ./bar
+echo b | ./bar && Exit 1
+
+# The Yacc-derived C sources must be shipped.
$MAKE echo-distcom
-$MAKE -s echo-distcom | grep '[ /]parse.c '
+$MAKE -s echo-distcom | grep '[ /]parse\.c '
+$MAKE -s echo-distcom | grep '[ /]bar-parse\.c '
$MAKE distdir
ls -l $distdir
test -f $distdir/parse.c
+test -f $distdir/bar-parse.c
# Sanity check on distribution.
-$MAKE distcheck
+# Note that, for this to succeed, bar-parse.output must either not
+# be distributed, or properly cleaned by automake-generated rules.
+# We don't want to set the exact semantics yet, but want to ensure
+# they are are consistent.
+yl_distcheck
-# While we are at it, make sure that parse.c is erased by
+# Make sure that the Yacc-derived C sources are erased by
# maintainer-clean, and not by distclean.
test -f parse.c
+test -f bar-parse.c
$MAKE distclean
+ls -l
test -f parse.c
-./configure # Re-create `Makefile'.
+test -f bar-parse.c
+./configure # We must re-create 'Makefile'.
$MAKE maintainer-clean
+ls -l
test ! -f parse.c
+test ! -f bar-parse.c
:
diff --git a/tests/yacc-bison-skeleton-cxx.test
b/tests/yacc-bison-skeleton-cxx.test
new file mode 100755
index 0000000..ee5cb88
--- /dev/null
+++ b/tests/yacc-bison-skeleton-cxx.test
@@ -0,0 +1,100 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure bison + bison's C++ skeleton + C++ works.
+# For Automake bug#7648 and PR automake/491.
+
+required=bison
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CXX
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.yy foo.cc
+
+# This is required even with %defines in zardoz.yy.
+AM_YFLAGS = -d
+
+BUILT_SOURCES = zardoz.hh
+EXTRA_DIST = stack.hh location.hh position.hh
+END
+
+cat > zardoz.yy << 'END'
+%skeleton "lalr1.cc"
+%defines
+
+%{
+#define YYSTYPE int
+int yylex(YYSTYPE* yylval_param);
+%}
+
+%%
+start : /* empty */
+%%
+
+int
+yylex(YYSTYPE*)
+{
+ return 0;
+}
+
+void
+yy::parser::error(const yy::parser::location_type&, const std::string& m)
+{
+ return;
+}
+END
+
+cat > foo.cc << 'END'
+#include "zardoz.hh"
+
+using namespace std;
+
+int
+main(int argc, char** argv)
+{
+ yy::parser my_parser;
+ return my_parser.parse ();
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Try a VPATH build first.
+mkdir build
+cd build
+../configure YACC='bison -y'
+$MAKE
+cd ..
+
+# Now try an in-tree build.
+./configure YACC='bison -y'
+$MAKE
+
+# Check that distribution is self-contained, and do not require
+# bison to be built.
+$MAKE distcheck YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false'
+
+:
diff --git a/tests/yacc4.test b/tests/yacc-bison-skeleton.test
similarity index 54%
copy from tests/yacc4.test
copy to tests/yacc-bison-skeleton.test
index eee210e..2b36838 100755
--- a/tests/yacc4.test
+++ b/tests/yacc-bison-skeleton.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,11 +14,14 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Some simple tests of ylwrap functionality.
+# Test to make sure bison + bison's skeleton works.
+# For Automake bug#7648 and PR automake/491.
-required='cc yacc'
+required=bison
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_YACC
@@ -26,35 +29,26 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-bin_PROGRAMS = foo bar
-foo_SOURCES = parse.y foo.c
-bar_SOURCES = bar.y foo.c
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.y foo.c
+AM_YFLAGS = -d --skeleton glr.c
END
-# First parser.
-cat > parse.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%%
-foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
-END
-
-# Second parser.
-cat > bar.y << 'END'
+# Parser.
+cat > zardoz.y << 'END'
%{
int yylex () { return 0; }
-void yyerror (char *s) {}
+void yyerror (const char *s) { return; }
%}
%%
-fubar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
END
cat > foo.c << 'END'
+#include "zardoz.h"
int main (void)
{
- return 0;
+ return yyparse ();
}
END
@@ -62,25 +56,19 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-test -f ylwrap
-
-mkdir sub
-cd sub
-
-../configure
+# Try a VPATH build first.
+mkdir build
+cd build
+../configure YACC='bison -y'
$MAKE
+cd ..
-grep '^#.*/sub/\.\./' bar.c && Exit 1
-grep '^#.*/sub/\.\./' parse.c && Exit 1
+# Now try an in-tree build.
+./configure YACC='bison -y'
+$MAKE
-# Make distclean must not erase bar.c nor parse.c (by GNU standards) ...
-$MAKE distclean
-test -f bar.c
-test -f parse.c
-# ... but maintainer-clean should.
-../configure
-$MAKE maintainer-clean
-test ! -f bar.c
-test ! -f parse.c
+# Check that distribution is self-contained, and do not require
+# bison to be built.
+$MAKE YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' distcheck
:
diff --git a/tests/yacc-clean-cxx.test b/tests/yacc-clean-cxx.test
new file mode 100755
index 0000000..1abbfba
--- /dev/null
+++ b/tests/yacc-clean-cxx.test
@@ -0,0 +1,165 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check that C++ source and header files derived from non-distributed
+# Yacc sources are cleaned by "make clean", while C++ source and
+# header files derived from distributed Yacc sources are cleaned by
+# "make maintainer-clean".
+# See also sister test `yacc-clean.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CXX
+AC_PROG_YACC
+AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+# Use two subdirectories, one to test with `-d' in YFLAGS, the
+# other one to test with empty YFLAGS.
+SUBDIRS = sub1 sub2
+END
+
+mkdir sub1 sub2
+
+cat > sub1/Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz qux
+
+foo_SOURCES = mainfoo.cc parsefoo.yxx
+
+bar_SOURCES = mainbar.cpp parsebar.yy
+bar_YFLAGS = $(AM_YFLAGS)
+
+baz_SOURCES = mainbaz.c++
+nodist_baz_SOURCES = parsebaz.y++
+
+qux_SOURCES = mainqux.cxx
+nodist_qux_SOURCES = parsequx.ypp
+qux_YFLAGS = $(AM_YFLAGS)
+
+parsebaz.y++ parsequx.ypp:
+ cp $(srcdir)/parsefoo.yxx $@
+
+CLEANFILES = parsebaz.y++ parsequx.ypp
+END
+
+cat > sub2/Makefile.am << 'END'
+include $(top_srcdir)/sub1/Makefile.am
+AM_YFLAGS = -d
+END
+
+cat > sub1/parsefoo.yxx << 'END'
+%{
+// This file should contain valid C++ but invalid C.
+#include <cstdio>
+int yylex (void) { return (getchar ()); }
+void yyerror (const char *s) { return; }
+%}
+%%
+x : 'x' { };
+END
+cp sub1/parsefoo.yxx sub1/parsebar.yy
+cp sub1/parsefoo.yxx sub2/parsefoo.yxx
+cp sub1/parsefoo.yxx sub2/parsebar.yy
+
+cat > sub1/mainfoo.cc << 'END'
+// This file should contain valid C++ but invalid C.
+using namespace std;
+int main (int argc, char **argv)
+{
+ extern int yyparse (void);
+ return yyparse ();
+}
+END
+cp sub1/mainfoo.cc sub1/mainbar.cpp
+cp sub1/mainfoo.cc sub1/mainbaz.c++
+cp sub1/mainfoo.cc sub1/mainqux.cxx
+cp sub1/main???.c* sub2
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+cp config.status config.sav
+
+$MAKE
+ls -l . sub1 sub2
+# Sanity checks.
+test -f sub1/parsefoo.cxx
+test -f sub1/bar-parsebar.cc
+test -f sub1/parsebaz.y++
+test -f sub1/parsebaz.c++
+test -f sub1/parsequx.ypp
+test -f sub1/qux-parsequx.cpp
+test -f sub2/parsefoo.cxx
+test -f sub2/parsefoo.hxx
+test -f sub2/bar-parsebar.cc
+test -f sub2/bar-parsebar.hh
+test -f sub2/parsebaz.y++
+test -f sub2/parsebaz.c++
+test -f sub2/parsebaz.h++
+test -f sub2/parsequx.ypp
+test -f sub2/qux-parsequx.cpp
+test -f sub2/qux-parsequx.hpp
+
+for target in clean distclean; do
+ $MAKE $target
+ ls -l . sub1 sub2
+ test -f sub1/parsefoo.cxx
+ test -f sub1/bar-parsebar.cc
+ test ! -r sub1/parsebaz.y++
+ test ! -r sub1/parsebaz.c++
+ test ! -r sub1/parsequx.ypp
+ test ! -r sub1/qux-parsequx.cpp
+ test -f sub2/parsefoo.cxx
+ test -f sub2/parsefoo.hxx
+ test -f sub2/bar-parsebar.cc
+ test -f sub2/bar-parsebar.hh
+ test ! -r sub2/parsebaz.y++
+ test ! -r sub2/parsebaz.c++
+ test ! -r sub2/parsebaz.h++
+ test ! -r sub2/parsequx.ypp
+ test ! -r sub2/qux-parsequx.cpp
+ test ! -r sub2/qux-parsequx.hpp
+done
+
+cp config.sav config.status
+./config.status # re-create Makefile
+
+$MAKE maintainer-clean
+ls -l . sub1 sub2
+test -f sub1/parsefoo.yxx
+test -f sub1/parsebar.yy
+test ! -r sub1/parsefoo.cxx
+test ! -r sub1/bar-parsebar.cc
+test -f sub2/parsefoo.yxx
+test -f sub2/parsebar.yy
+test ! -r sub2/parsefoo.cxx
+test ! -r sub2/parsefoo.hxx
+test ! -r sub2/bar-parsebar.cc
+test ! -r sub2/bar-parsebar.hh
+
+cp config.sav config.status
+./config.status # re-create Makefile
+
+:
diff --git a/tests/yacc-clean.test b/tests/yacc-clean.test
index ca03466..ba23007 100755
--- a/tests/yacc-clean.test
+++ b/tests/yacc-clean.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
# Check that .c and .h files derived from non-distributed .y sources
# are cleaned by "make clean", while .c and .h files derived from
# distributed .y sources are cleaned by "make maintainer-clean".
+# See also sister test `yacc-cxx-clean.test'.
required='cc yacc'
. ./defs || Exit 1
@@ -143,11 +144,4 @@ test ! -r sub2/parse.h
test ! -r sub2/bar-parse.c
test ! -r sub2/bar-parse.h
-cp config.sav config.status
-./config.status # Re-create `Makefile'.
-
-# The distribution must work correctly, assuming the user has
-# the proper tools to process yacc files.
-$MAKE distcheck
-
:
diff --git a/tests/yacc-cxx.test b/tests/yacc-cxx.test
new file mode 100755
index 0000000..71fb61c
--- /dev/null
+++ b/tests/yacc-cxx.test
@@ -0,0 +1,139 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Basic semantic checks on Yacc + C++ support (when yacc-generated
+# headers are not involved).
+# Keep in sync with sister test `yacc-basic.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CXX
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo1 foo2 foo3 foo4
+foo1_SOURCES = parse1.yy foo.cc
+foo2_SOURCES = parse2.y++ bar.c++
+foo3_SOURCES = parse3.yxx foo.cc
+foo4_SOURCES = parse4.ypp bar2.cxx
+foo3_YFLAGS = -v
+foo4_YFLAGS = $(foo3_YFLAGS)
+
+.PHONY: echo-distcom
+echo-distcom:
+ @echo ' ' $(DIST_COMMON) ' '
+END
+
+cat > parse1.yy << 'END'
+%{
+// Valid C++, but deliberately invalid C.
+#include <cstdio>
+#include <cstdlib>
+int yylex (void) { return getchar (); }
+void yyerror (const char *s) { return; }
+%}
+%%
+a : 'a' { exit(0); };
+END
+cp parse1.yy parse2.y++
+cp parse1.yy parse3.yxx
+cp parse1.yy parse4.ypp
+
+cat > foo.cc << 'END'
+// Valid C++, but deliberately invalid C.
+using namespace std;
+int main (int argc, char **argv)
+{
+ int yyparse (void);
+ yyparse ();
+ return 1;
+}
+END
+cp foo.cc bar.c++
+cp foo.cc bar2.cxx
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE
+
+# The Yacc-derived C++ sources must be created, and not removed once
+# compiled (i.e., not treated like "intermediate files" in the GNU
+# make sense).
+test -f parse1.cc
+test -f parse2.c++
+test -f foo3-parse3.cxx
+test -f foo4-parse4.cpp
+# Check that per-object flags are honored.
+test -f foo3-parse3.output
+test -f foo4-parse4.output
+
+for i in 1 2 3 4; do
+ echo a | ./foo$i
+ echo b | ./foo$i && Exit 1
+ : For shells with busted 'set -e'.
+done
+
+# The Yacc-derived C++ sources must be shipped.
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]parse1\.cc '
+$MAKE -s echo-distcom | grep '[ /]parse2\.c++ '
+$MAKE -s echo-distcom | grep '[ /]foo3-parse3\.cxx '
+$MAKE -s echo-distcom | grep '[ /]foo4-parse4\.cpp '
+$MAKE distdir
+ls -l $distdir
+test -f $distdir/parse1.cc
+test -f $distdir/parse2.c++
+test -f $distdir/foo3-parse3.cxx
+test -f $distdir/foo4-parse4.cpp
+
+# Sanity check on distribution.
+# Note that, for this to succeed, foo3-parse3.output and foo4-parse4.output
+# must either not be distributed, or properly cleaned by automake-generated
+# rules. We don't want to set the exact semantics yet, but want to ensure
+# they are are consistent.
+yl_distcheck
+
+# Make sure that the Yacc-derived C++ sources are erased by
+# maintainer-clean, and not by distclean.
+test -f parse1.cc
+test -f parse2.c++
+test -f foo3-parse3.cxx
+test -f foo4-parse4.cpp
+$MAKE distclean
+ls -l
+test -f parse1.cc
+test -f parse2.c++
+test -f foo3-parse3.cxx
+test -f foo4-parse4.cpp
+./configure # we must re-create `Makefile'
+$MAKE maintainer-clean
+ls -l
+test ! -f parse1.cc
+test ! -f parse2.c++
+test ! -f foo3-parse3.cxx
+test ! -f foo4-parse4.cpp
+
+:
diff --git a/tests/yacc-d-basic.test b/tests/yacc-d-basic.test
index e705f06..933b2bd 100755
--- a/tests/yacc-d-basic.test
+++ b/tests/yacc-d-basic.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,14 +14,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Tests on basic Yacc support for when we have -d in YFLAGS, AM_YFLAGS
-# or maude_YFLAGS.
+# Tests Yacc support with yacc-generated headers
+# (i.e., '-d' in *YFLAGS).
+# Keep in sync with sister test `yacc-d-cxx.test'.
required='cc yacc'
. ./defs || Exit 1
-tab=' '
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_YACC
@@ -108,7 +107,7 @@ test -f bar/parse.h
test -f baz/zardoz-parse.c
test -f baz/zardoz-parse.h
-# The generated C and header files must be shipped.
+# The generated C source and header files must be shipped.
for dir in foo bar; do
cd $dir
$MAKE echo-distcom
@@ -132,7 +131,7 @@ test -f $distdir/baz/zardoz-parse.c
test -f $distdir/baz/zardoz-parse.h
# Sanity check the distribution.
-$MAKE distcheck
+yl_distcheck
# While we are at it, make sure that `parse.c' and `parse.h' are erased
# by maintainer-clean, and not by distclean.
diff --git a/tests/yacc-d-cxx.test b/tests/yacc-d-cxx.test
new file mode 100755
index 0000000..21d8302
--- /dev/null
+++ b/tests/yacc-d-cxx.test
@@ -0,0 +1,233 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Various tests on Yacc/C++ support with yacc-generated headers
+# (i.e., '-d' in *YFLAGS).
+# Keep in sync with sister test `yacc-d-basic.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+write_parse ()
+{
+ header=$1
+ sed 's/^ *//' <<END
+ %{
+ // Valid C++, but deliberately invalid C.
+ #include <cstdlib>
+ #include "$header"
+ int yylex (void) { return 0; }
+ void yyerror (const char *s) {}
+ %}
+ %%
+ x : 'x' {};
+ %%
+END
+}
+
+write_main ()
+{
+ header=$1
+ sed 's/^ *//' <<END
+ // Valid C++, but deliberately invalid C.
+ #include <cstdio>
+ #include "$header"
+ int main (int argc, char **argv)
+ {
+ int yyparse (void);
+ return yyparse ();
+ }
+END
+}
+
+cat >> configure.in << 'END'
+AC_PROG_CXX
+AC_PROG_YACC
+AC_CONFIG_FILES([foo/Makefile bar/Makefile baz/Makefile qux/Makefile])
+AC_OUTPUT
+END
+
+mkdir foo bar baz qux baz/sub
+
+# These makefiles will be extended later.
+cat > Makefile.am <<'END'
+.PHONY: echo-distcom
+echo-distcom:
+ @echo ' ' $(DIST_COMMON) ' '
+END
+cp Makefile.am foo/Makefile.am
+cp Makefile.am bar/Makefile.am
+cp Makefile.am baz/Makefile.am
+cp Makefile.am qux/Makefile.am
+
+cat >> Makefile.am <<'END'
+SUBDIRS = foo bar baz qux
+END
+
+$ACLOCAL
+$AUTOCONF
+
+cp $testsrcdir/../lib/ylwrap .
+
+$AUTOMAKE Makefile
+
+# Try with -d in $(YFLAGS) (don't do this in real life!).
+cat >> foo/Makefile.am <<END
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = parse.yy main.cc
+BUILT_SOURCES = parse.hh
+YFLAGS=\
+-d
+END
+
+$AUTOMAKE -Wno-gnu foo/Makefile
+
+write_parse parse.hh > foo/parse.yy
+write_main parse.hh > foo/main.cc
+
+# Try with -d in $(AM_YFLAGS).
+cat >> bar/Makefile.am <<END
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = parse.ypp main.cpp
+BUILT_SOURCES = parse.hpp
+AM_YFLAGS${tab}= -d ${tab}
+END
+
+$AUTOMAKE bar/Makefile
+
+write_parse parse.hpp > bar/parse.ypp
+write_main parse.hpp > bar/main.cpp
+
+# Try with -d in $(AM_YFLAGS), and a subdir parser.
+cat >> baz/Makefile.am <<END
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = joe
+joe_SOURCES = sub/parse.y++ sub/main.c++
+BUILT_SOURCES = sub/parse.h++
+AM_YFLAGS = \
+${tab}-d
+END
+
+$AUTOMAKE baz/Makefile
+
+write_parse sub/parse.h++ > baz/sub/parse.y++
+write_main sub/parse.h++ > baz/sub/main.c++
+
+# Try with -d in $(xxx_YFLAGS) (per-object flag).
+cat >> qux/Makefile.am <<END
+bin_PROGRAMS = maude
+maude_SOURCES = parse.yxx main.cxx
+maude_YFLAGS=${tab} -d${tab}
+BUILT_SOURCES = maude-parse.hxx
+END
+
+$AUTOMAKE qux/Makefile
+
+write_parse maude-parse.hxx > qux/parse.yxx
+write_main maude-parse.hxx > qux/main.cxx
+
+./configure
+
+$MAKE
+ls -l . foo bar baz baz/sub qux # For debugging.
+
+test -f foo/parse.cc
+test -f foo/parse.hh
+test -f bar/parse.cpp
+test -f bar/parse.hpp
+test -f baz/sub/parse.c++
+test -f baz/sub/parse.h++
+test -f qux/maude-parse.cxx
+test -f qux/maude-parse.hxx
+
+# The ylwrap script must be shipped.
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]ylwrap '
+
+# The generated C++ source and header files must be shipped.
+cd foo
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]parse\.cc '
+$MAKE -s echo-distcom | grep '[ /]parse\.hh '
+cd ..
+cd bar
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]parse\.cpp '
+$MAKE -s echo-distcom | grep '[ /]parse\.hpp '
+cd ..
+cd baz
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]sub/parse\.c++ '
+$MAKE -s echo-distcom | grep '[ /]sub/parse\.h++ '
+cd ..
+cd qux
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]maude-parse\.cxx '
+$MAKE -s echo-distcom | grep '[ /]maude-parse\.hxx '
+cd ..
+
+$MAKE distdir
+find $distdir # For debugging.
+
+test -f $distdir/ylwrap
+test -f $distdir/foo/parse.cc
+test -f $distdir/foo/parse.hh
+test -f $distdir/bar/parse.cpp
+test -f $distdir/bar/parse.hpp
+test -f $distdir/baz/sub/parse.c++
+test -f $distdir/baz/sub/parse.h++
+test -f $distdir/qux/maude-parse.cxx
+test -f $distdir/qux/maude-parse.hxx
+
+# The Yacc-derived C++ sources must be created, and not removed once
+# compiled (i.e., not treated like "intermediate files" in the GNU
+# make sense).
+yl_distcheck
+
+# Check that we can recover from deleted headers.
+$MAKE clean
+rm -f foo/parse.hh bar/parse.hpp baz/sub/parse.h++ qux/maude-parse.hxx
+$MAKE
+test -f foo/parse.hh
+test -f bar/parse.hpp
+test -f baz/sub/parse.h++
+test -f qux/maude-parse.hxx
+
+# Make sure that the Yacc-derived C++ sources are erased by
+# maintainer-clean, and not by distclean.
+$MAKE distclean
+test -f foo/parse.cc
+test -f foo/parse.hh
+test -f bar/parse.cpp
+test -f bar/parse.hpp
+test -f baz/sub/parse.c++
+test -f baz/sub/parse.h++
+test -f qux/maude-parse.cxx
+test -f qux/maude-parse.hxx
+./configure # We must re-create `Makefile'.
+$MAKE maintainer-clean
+test ! -f foo/parse.cc
+test ! -f foo/parse.hh
+test ! -f bar/parse.cpp
+test ! -f bar/parse.hpp
+test ! -f baz/sub/parse.c++
+test ! -f baz/sub/parse.h++
+test ! -f qux/maude-parse.cxx
+test ! -f qux/maude-parse.hxx
+
+:
diff --git a/tests/yacc-d-vpath.test b/tests/yacc-d-vpath.test
index 87e6946..bbd5c36 100755
--- a/tests/yacc-d-vpath.test
+++ b/tests/yacc-d-vpath.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ END
# Original parser, with `foobar'.
cat > parse.y << 'END'
%{
-int yylex () {return 0;}
+int yylex () { return 0; }
void yyerror (char *s) {}
%}
%token FOOBAR
@@ -73,7 +73,7 @@ $sleep
# New parser, with `fubar'.
cat > ../parse.y << 'END'
%{
-int yylex () {return 0;}
+int yylex () { return 0; }
void yyerror (char *s) {}
%}
%token FUBAR
@@ -93,7 +93,7 @@ $sleep
# New parser, with `maude'.
cat > ../parse.y << 'END'
%{
-int yylex () {return 0;}
+int yylex () { return 0; }
void yyerror (char *s) {}
%}
%token MAUDE
diff --git a/tests/yacc-deleted-headers.test b/tests/yacc-deleted-headers.test
new file mode 100755
index 0000000..146eafd
--- /dev/null
+++ b/tests/yacc-deleted-headers.test
@@ -0,0 +1,165 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Tests that we can recover from deleted headers generated by `yacc -d'.
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = p1 p2 p3 p4
+# The order in which files are listed in the p*_SOURCES variables
+# below is significant, since it causes make failures whenever
+# the proper definition of BUILT_SOURCES or the declaration of
+# extra dependencies for `main3.o' are removed.
+p1_SOURCES = main1.c parse1.y
+p2_SOURCES = main2.c parse2.y
+p3_SOURCES = main3.c parse3.y parse3.h
+p4_SOURCES = parse4.y
+AM_YFLAGS = -d
+p2_YFLAGS = -d
+
+BUILT_SOURCES = parse1.h p2-parse2.h
+
+# When we know which files include a yacc-generated header, we
+# should be able to just declare dependencies directly instead
+# of relying on the BUILT_SOURCES hack, and things should still
+# work correctly.
address@hidden@: parse3.h
+
+.PHONY: clean-p3 build-p3
+build-p3: p3$(EXEEXT)
+clean-p3:
+ rm -f p3$(EXEEXT)
+END
+
+cat > parse1.y << 'END'
+%{
+#include "parse1.h"
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%token ZARDOZ
+%%
+x : 'x' {};
+%%
+END
+
+cat > main1.c << 'END'
+#include "parse1.h"
+int main (void)
+{
+ return ZARDOZ + yyparse ();
+}
+END
+
+sed 's/"parse1\.h"/"p2-parse2.h"/' parse1.y > parse2.y
+sed 's/"parse1\.h"/"p2-parse2.h"/' main1.c > main2.c
+
+sed 's/"parse1\.h"/"parse3.h"/' parse1.y > parse3.y
+sed 's/"parse1\.h"/"parse3.h"/' main1.c > main3.c
+
+cat > parse4.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%%
+x : 'x' {};
+%%
+int main (void)
+{
+ return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+
+headers='parse1.h p2-parse2.h parse3.h parse4.h'
+
+# Check that we remake only the necessary headers.
+
+rm -f $headers
+$MAKE parse1.h
+test -f parse1.h
+test ! -r p2-parse2.h
+test ! -r parse3.h
+test ! -r parse4.h
+
+rm -f $headers
+$MAKE p2-parse2.h
+test ! -r parse1.h
+test -f p2-parse2.h
+test ! -r parse3.h
+test ! -r parse4.h
+
+rm -f $headers
+$MAKE parse3.h
+test ! -r parse1.h
+test ! -r p2-parse2.h
+test -f parse3.h
+test ! -r parse4.h
+# Since we declared parse3.h into $(p3_SOURCES), make should be
+# able to rebuild it automatically before remaking `p3'.
+rm -f $headers
+$MAKE clean-p3
+test ! -f parse3.h # Sanity check.
+$MAKE build-p3
+test -f parse3.h
+
+$MAKE
+
+rm -f $headers
+$MAKE parse4.h
+test ! -r parse1.h
+test ! -r p2-parse2.h
+test ! -r parse3.h
+test -f parse4.h
+
+# Now remake all the headers together.
+
+rm -f $headers
+$MAKE $headers
+test -f parse1.h
+test -f p2-parse2.h
+test -f parse3.h
+test -f parse4.h
+
+# Most headers should be remade by "make all".
+
+rm -f $headers
+$MAKE all
+test -f parse1.h
+test -f p2-parse2.h
+test -f parse3.h
+# parse4.h is not declared in any *_SOURCES variable, nor #included
+# by any C source file, so it shouldn't be rebuilt by "make all".
+test ! -r parse4.h
+
+:
diff --git a/tests/yacc-dist-nobuild.test b/tests/yacc-depend.test
similarity index 50%
copy from tests/yacc-dist-nobuild.test
copy to tests/yacc-depend.test
index acdba6a..5cd4f15 100755
--- a/tests/yacc-dist-nobuild.test
+++ b/tests/yacc-depend.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,12 +14,14 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check that distributed Yacc-generated parsers are not uselessly
-# remade from an unpacked distributed tarball.
+# Make sure depcomp does not needlessly update headers for yacc rules.
+# Report from Paolo Bonzini.
-required='cc yacc'
+required=yacc
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_YACC
@@ -27,59 +29,56 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-bin_PROGRAMS = foobar zardoz
-foobar_SOURCES = parse.y main.c
-zardoz_SOURCES = $(foobar_SOURCES)
-zardoz_YFLAGS = -d
+bin_PROGRAMS = foo
+AM_YFLAGS = -d
+foo_SOURCES = foo.y main.c
+BUILT_SOURCES = foo.h
END
-cat > parse.y << 'END'
+cat > foo.y << 'END'
%{
int yylex () { return 0; }
-void yyerror (char *s) {}
+void yyerror (char *s) { return; }
%}
+%token TOKEN
%%
foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
END
+
cat > main.c << 'END'
-int main () { return 0; }
+#include "foo.h"
+int main(void)
+{
+ return yyparse ();
+}
END
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-./configure
+# Try to enable dependency tracking if possible, even if that means
+# using slow dependency extractors.
+./configure --enable-dependency-tracking
$MAKE
+ls -l # For debugging.
-$MAKE distdir
-chmod -R a-w $distdir
-
-mkdir bin
-cat > bin/yacc <<'END'
-#!/bin/sh
-echo "$0 invoked, shouldn't happen!" >&2
-exit 1
-END
-cp bin/yacc bin/bison
-chmod a+x bin/yacc bin/bison
-PATH=`pwd`/bin$PATH_SEPARATOR$PATH
-
-YACC=yacc BISON=bison
-export YACC BISON
-
-mkdir build
-cd build
-../$distdir/configure
+# Make sure foo.h is not updated if not really needed.
+$sleep
+: > my-timestamp
+$sleep
+touch foo.y
$MAKE
+stat my-timestamp foo.* || : # For debugging.
+is_newest my-timestamp foo.h
-# Sanity check.
-chmod u+w ../$distdir
-rm -f ../$distdir/parse.c
-chmod a-w ../$distdir
-$MAKE >out 2>&1 && { cat out; Exit 1; }
-cat out
-$FGREP parse.c out
+# Make sure foo.h is updated if needed.
+$sleep
+sed 's/TOKEN/TEKON/g' foo.y > t
+mv -f t foo.y
+$MAKE
+stat my-timestamp foo.* || : # For debugging.
+is_newest foo.h my-timestamp
:
diff --git a/tests/yacc-depend2.test b/tests/yacc-depend2.test
new file mode 100755
index 0000000..b067e69
--- /dev/null
+++ b/tests/yacc-depend2.test
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure depcomp does not needlessly update headers and objects
+# for yacc rules. This test still fails with FreeBSD make (but passes
+# with NetBSD make).
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+AM_YFLAGS = -d
+foo_SOURCES = foo.y main.c
+BUILT_SOURCES = foo.h
+.PHONY: debug-info test-time-unchanged test-time-changed
+debug-info:
+ ls -l
+ stat *.[ch] *.$(OBJEXT) my-timestamp || :
+test-time-unchanged: debug-info
+ test `ls -1t main.$(OBJEXT) my-timestamp | sed 1q` = my-timestamp
+test-time-changed: debug-info
+ test `ls -1t main.$(OBJEXT) my-timestamp | sed 1q` = main.$(OBJEXT)
+END
+
+cat > foo.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%token TOKEN
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+
+cat > main.c << 'END'
+#include "foo.h"
+int main(void)
+{
+ return yyparse ();
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Try to enable dependency tracking if possible, even if that means
+# using slow dependency extractors.
+./configure --enable-dependency-tracking
+$MAKE
+ls -l # For debugging.
+
+$sleep
+: > my-timestamp
+$sleep
+touch foo.y
+$MAKE
+$MAKE test-time-unchanged
+$sleep
+sed 's/TOKEN/TEKON/g' foo.y > t
+mv -f t foo.y
+$MAKE
+$MAKE test-time-changed
+
+:
diff --git a/tests/yacc-dist-nobuild-subdir.test
b/tests/yacc-dist-nobuild-subdir.test
index 7597a81..18d22ed 100755
--- a/tests/yacc-dist-nobuild-subdir.test
+++ b/tests/yacc-dist-nobuild-subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,9 @@
required=yacc
. ./defs || Exit 1
-distdir=$me-1.0
+# This test is bounded to fail for any implementation that
+# triggers automake bug#7884.
+useless_vpath_rebuild && skip_ "would trip on automake bug#7884"
cat >> configure.in << 'END'
AC_PROG_CC
diff --git a/tests/yacc-dist-nobuild.test b/tests/yacc-dist-nobuild.test
index acdba6a..0d678f1 100755
--- a/tests/yacc-dist-nobuild.test
+++ b/tests/yacc-dist-nobuild.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
# Check that distributed Yacc-generated parsers are not uselessly
# remade from an unpacked distributed tarball.
+# See automake bug#7884.
required='cc yacc'
. ./defs || Exit 1
diff --git a/tests/yacc-line.test b/tests/yacc-line.test
new file mode 100755
index 0000000..4475b08
--- /dev/null
+++ b/tests/yacc-line.test
@@ -0,0 +1,115 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake yacc support ensures that yacc-generated C
+# files use correct "#line" directives. Try also with the
+# `subdir-object' option enabled.
+# See also sister test `lex-line.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+mkdir dir sub sub/dir
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+bin_PROGRAMS = foo bar
+AM_YFLAGS = -d
+bar_YFLAGS =
+foo_SOURCES = zardoz.y
+bar_SOURCES = dir/quux.y
+## Avoid spurious failures with Solaris make.
address@hidden@: zardoz.c
address@hidden@: bar-quux.c
+END
+
+cat > sub/Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+noinst_PROGRAMS = foo bar
+foo_YFLAGS = -d
+foo_SOURCES = zardoz.y
+bar_SOURCES = dir/quux.y
+## Avoid spurious failures with Solaris make.
address@hidden@: foo-zardoz.c
+dir/address@hidden@: dir/quux.c
+END
+
+cat > zardoz.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%%
+x : 'x' {};
+%%
+int main(void)
+{
+ return yyparse ();
+}
+END
+
+cp zardoz.y dir/quux.y
+cp zardoz.y sub/zardoz.y
+cp zardoz.y sub/dir/quux.y
+
+c_outputs='zardoz.c bar-quux.c sub/foo-zardoz.c sub/dir/quux.c'
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+for vpath in : false; do
+
+ if $vpath; then
+ srcdir=..
+ mkdir build
+ cd build
+ else
+ srcdir=.
+ fi
+
+ $srcdir/configure
+ $MAKE
+
+ # For debugging,
+ ls -l . sub sub/dir
+ $FGREP '.y' $c_outputs
+
+ # Adjusted "#line" should not contain reference to the builddir.
+ $EGREP '#.*line.*(build|\.\.).*\.y' $c_outputs && Exit 1
+ # Adjusted "#line" should not contain reference to the default
+ # output file names, e.g., `y.tab.c' and `y.tab.h'.
+ $EGREP '#.*line.*y\.tab\.' $c_outputs && Exit 1
+ # Don't be excessively strict in grepping, to avoid spurious failures.
+ grep '#.*line.*zardoz\.y' zardoz.c
+ grep '#.*line.*quux\.y' bar-quux.c
+ grep '#.*line.*zardoz\.y' sub/foo-zardoz.c
+ grep '#.*line.*quux\.y' sub/dir/quux.c
+ cd $srcdir
+
+done
+
+:
diff --git a/tests/yacc-mix-c-cxx.test b/tests/yacc-mix-c-cxx.test
new file mode 100755
index 0000000..722a01c
--- /dev/null
+++ b/tests/yacc-mix-c-cxx.test
@@ -0,0 +1,208 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check that many different Yacc parsers (both C and C++) can co-exists
+# in the same directory.
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = c1 c2 cxx1 cxx2 cxx3
+AM_YFLAGS = -d
+
+c1_SOURCES = p.y p.h 1.c
+c2_SOURCES = p.y 2.c
+c2_YFLAGS =
+
+cxx1_SOURCES = parse.yy main1.cc parse.hh
+
+cxx2_SOURCES = parse2.y++ main2.c++
+cxx2_YFLAGS =
+
+cxx3_SOURCES = parse3.yxx main3.cxx
+
+BUILT_SOURCES = p.h parse.hh parse3.hxx
+END
+
+# The content of all the .c and .y files created below is valid C but
+# deliberately invalid C++.
+# Vice versa, the content of all the .c++, .cxx, .cc, .y++, .yxx and
+# .yy files created below is valid C++ but deliberately invalid C.
+
+cat > p.y <<'END'
+%{
+int yylex (void) { int new = 0; return new; }
+void yyerror (char *s) { return; }
+%}
+%token ZARDOZ
+%%
+x : 'x' {};
+%%
+END
+
+cat > 1.c <<'END'
+#include "p.h"
+int main ()
+{
+ int new = ZARDOZ;
+ return yyparse () + new;
+}
+
+END
+
+cat > 2.c <<'END'
+int main ()
+{
+ int yyparse ();
+ int new = 0;
+ return yyparse () + new;
+}
+END
+
+cat > parse.yy <<'END'
+%{
+#include <cstdlib>
+#include "parse.hh"
+int yylex (void) { return 0; }
+void yyerror (const char *s) { return; }
+%}
+%token FOOBAR
+%%
+x : 'x' {};
+%%
+END
+
+cat > parse2.y++ <<'END'
+%{
+#include <cstdlib>
+int yylex (void) { return 0; }
+void yyerror (const char *s) { return; }
+%}
+%%
+x : 'x' {};
+%%
+END
+
+cat > main1.cc <<'END'
+using namespace std;
+#include "parse.hh"
+int main (int argc, char **argv)
+{
+ int yyparse (void);
+ return yyparse () + FOOBAR;
+}
+END
+
+cat > main2.c++ <<'END'
+using namespace std;
+int main (int argc, char **argv)
+{
+ int yyparse (void);
+ return yyparse ();
+}
+END
+
+edit () { sed -e 's/FOOBAR/BAZQUUX/' -e 's/"parse\.hh"/"parse3.hxx"/'; }
+edit <parse.yy >parse3.yxx
+edit <main1.cc >main3.cxx
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Try a VPATH and by default serial build first, and then an in-tree
+# and by default parallel build.
+
+for try in 0 1; do
+
+ if test $try -eq 0; then
+ # VPATH serial build.
+ mkdir build
+ cd build
+ srcdir=..
+ debug_info="ls -l . $srcdir"
+ run_make=$MAKE
+ elif test $try -eq 1; then
+ # In-tree parallel build.
+ srcdir=.
+ debug_info="ls -l"
+ case $MAKE in
+ *\ -j*)
+ # Degree of parallelism already specified by the user: do
+ # not override it.
+ run_make=$MAKE;;
+ *)
+ # Some make implementations (e.g., HP-UX) don't grok `-j',
+ # some require no space between `-j' and the number of jobs
+ # (e.g., older GNU make versions), and some *do* require a
+ # space between `-j' and the number of jobs (e.g., Solaris
+ # dmake). We need a runtime test to see what works.
+ echo 'all:' > Makefile
+ for run_make in "$MAKE -j3" "$MAKE -j 3" "$MAKE"; do
+ $run_make && break
+ done
+ rm -f Makefile
+ esac
+ else
+ echo "$me: invalid value of \$try '$try'" >&2
+ Exit 99
+ fi
+
+ $srcdir/configure
+
+ $run_make
+ $debug_info
+
+ test -f p.c
+ test -f p.h
+ test -f c2-p.c
+ test ! -r c2-p.h
+
+ test -f parse.cc
+ test -f parse.hh
+ test -f parse3.cxx
+ test -f parse3.hxx
+
+ test -f cxx2-parse2.c++
+ test ! -r parse2.h++
+ test ! -r cxx2-parse2.h++
+
+ # Minimal checks about recovering from header removal.
+ rm -f p.h parse.hh parse3.hxx
+ $run_make p.h parse.hh
+ $debug_info
+ test -f p.h
+ test -f parse.hh
+ test ! -r parse3.hxx
+ $run_make
+ $debug_info
+ test -f parse3.hxx
+
+ cd $srcdir
+
+done
+
+:
diff --git a/tests/yacc-nodist.test b/tests/yacc-nodist.test
index 83f63dd..7bfd886 100755
--- a/tests/yacc-nodist.test
+++ b/tests/yacc-nodist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,7 +14,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Checks for .c and .h files derived from non-distributed .y sources.
+# Checks for .c and .h files derived from non-distributed yacc sources.
+# The test 'yacc-pr204.test' does similar check with AM_MAINTAINER_MODE
+# enabled.
+# The tests 'lex-nodist.test' and 'lex-pr204.test' does similar checks
+# for lex-generated .c files.
required='cc yacc'
. ./defs || Exit 1
@@ -28,7 +32,7 @@ END
cat > Makefile.am << 'END'
SUBDIRS = sub1 sub2
-.PHONY: test
+.PHONY: test-build test-dist
test-build: all
ls -l . sub1 sub2
test -f sub1/parse.y
@@ -60,8 +64,8 @@ parse.y:
&& echo "%%" \
&& echo "maude : 'm' 'a' 'u' 'd' 'e' {}"; \
} > address@hidden
- chmod a-w address@hidden
- mv -f address@hidden $@
+ chmod a-w address@hidden && mv -f address@hidden $@
+
bin_PROGRAMS = prog
prog_SOURCES = main.c
nodist_prog_SOURCES = parse.y
diff --git a/tests/pr204.test b/tests/yacc-pr204.test
similarity index 78%
rename from tests/pr204.test
rename to tests/yacc-pr204.test
index 1c4b0fa..30fff2a 100755
--- a/tests/pr204.test
+++ b/tests/yacc-pr204.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,7 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# For PR 204.
-# Sources derived from nodist_ sources should not be distributed.
+# C sources derived from nodist_ yacc sources should not be distributed.
+# See also related test `yacc-nodist.test'.
+# The tests 'lex-nodist.test' and 'lex-pr204.test' does similar checks
+# for lex-generated C files.
required='cc yacc'
. ./defs || Exit 1
@@ -71,9 +74,11 @@ test -f parse2.c
# Ensure the rebuild rule works despite AM_MAINTAINER_MODE, because
# it's a nodist_ parser.
$sleep
-touch parse.y
+touch parse.y parse2.y
$sleep
$MAKE parse.c parse2.c
-test `ls -1t parse.c parse.y | sed 1q` = parse.c
+stat parse.c parse.y parse2.c parse2.y || : # For debugging.
+test `ls -t parse.c parse.y | sed 1q` = parse.c
+test `ls -t parse2.c parse2.y | sed 1q` = parse2.c
:
diff --git a/tests/cond17.test b/tests/yacc-weirdnames.test
similarity index 55%
copy from tests/cond17.test
copy to tests/yacc-weirdnames.test
index 26a8ebb..6fa19cc 100755
--- a/tests/cond17.test
+++ b/tests/yacc-weirdnames.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,29 +14,43 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test for being able to define an object to be generated in different ways
-# according to a conditional.
-# Report from Richard Boulton.
+# Check that yacc sources with many dots in their name are handled
+# correctly.
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_CXX
-AM_CONDITIONAL([COND1], [true])
+AC_PROG_YACC
AC_OUTPUT
END
cat > Makefile.am << 'END'
-bin_PROGRAMS = helldl
-if COND1
-helldl_SOURCES = foo.cc
-else
-helldl_SOURCES = foo.c
-endif
+bin_PROGRAMS = foo bar foo2 bar2
+
+foo_SOURCES = parse.y.y
+bar_SOURCES = parse.s.f..y
+bar_YFLAGS = -d
+
+foo2_SOURCES = parse..5.y++
+bar2_SOURCES = parse.yxx.yy
+bar2_YFLAGS = -d
END
+outputs=' parse.y.c bar-parse.s.f..c bar-parse.s.f..h
+ parse..5.c++ bar2-parse.yxx.cc bar2-parse.yxx.hh '
+
$ACLOCAL
$AUTOMAKE -a
+$EGREP '(\.[ch]|parse)' Makefile.in # For debugging.
+
+# All expected files should be mentioned in the generated Makefile.in.
+for s in $outputs; do
+ $FGREP $s Makefile.in
+done
+
:
diff --git a/tests/yacc.test b/tests/yacc.test
index 9a5db93..8829e8b 100755
--- a/tests/yacc.test
+++ b/tests/yacc.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/yacc2.test b/tests/yacc2.test
index 0476a90..a0c671e 100755
--- a/tests/yacc2.test
+++ b/tests/yacc2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/yacc4.test b/tests/yacc4.test
index eee210e..7c87c53 100755
--- a/tests/yacc4.test
+++ b/tests/yacc4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ END
# First parser.
cat > parse.y << 'END'
%{
-int yylex () {return 0;}
+int yylex () { return 0; }
void yyerror (char *s) {}
%}
%%
diff --git a/tests/yacc5.test b/tests/yacc5.test
index bac61aa..4aa1c80 100755
--- a/tests/yacc5.test
+++ b/tests/yacc5.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/yacc6.test b/tests/yacc6.test
deleted file mode 100755
index edf9dea..0000000
--- a/tests/yacc6.test
+++ /dev/null
@@ -1,108 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2010, 2011 Free
-# Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure ylwrap put in right location.
-# Report from Tim Van Holder.
-# Also make sure depcomp does not needlessly update headers.
-# Report from Paolo Bonzini.
-
-required='gcc yacc'
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT([yacc6], [1.0])
-# `aux' is not an acceptable file/directory name on Windows systems.
-AC_CONFIG_AUX_DIR([aux1])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile sub/Makefile])
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_YACC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-
-test-time-unchanged:
- test `ls -1t sub/main.$(OBJEXT) z | sed 1q` = z
-test-time-changed:
- test `ls -1t sub/main.$(OBJEXT) z | sed 1q` = sub/main.$(OBJEXT)
-END
-
-mkdir aux1 sub
-
-cat > sub/Makefile.am << 'END'
-bin_PROGRAMS = foo bar
-AM_YFLAGS = -d
-foo_SOURCES = foo.y main.c
-foo_CPPFLAGS = -DFOO
-bar_SOURCES = bar.y main.c
-BUILT_SOURCES = foo.h bar.h
-END
-
-cat > sub/foo.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%token TOKEN
-%%
-foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
-END
-
-cp sub/foo.y sub/bar.y
-
-cat >sub/main.c <<'EOF'
-#ifdef FOO
-# include "foo.h"
-#else
-# include "bar.h"
-#endif
-
-int
-main()
-{
- return 0;
-}
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-test -f aux1/ylwrap
-test ! -f ylwrap
-test ! -f sub/ylwrap
-$FGREP '$(top_srcdir)/aux1/ylwrap' sub/Makefile.in
-./configure
-$MAKE
-grep '#.*line.*foo\.y' sub/foo.c
-grep '#.*line.*bar\.y' sub/bar.c
-
-$sleep
-: > z
-$sleep
-touch sub/bar.y
-$MAKE
-$MAKE test-time-unchanged
-$sleep
-sed s/TOKEN/TEKON/g sub/bar.y >sub/bar.yt
-mv -f sub/bar.yt sub/bar.y
-$MAKE
-$MAKE test-time-changed
-
-:
diff --git a/tests/yacc7.test b/tests/yacc7.test
index 64a536b..5dc0102 100755
--- a/tests/yacc7.test
+++ b/tests/yacc7.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/yacc8.test b/tests/yacc8.test
index ec04a75..ad841bc 100755
--- a/tests/yacc8.test
+++ b/tests/yacc8.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -50,7 +49,7 @@ mkdir foo
cat > foo/parse.y << 'END'
%{
-int yylex () {return 0;}
+int yylex () { return 0; }
void yyerror (char *s) {}
%}
%%
diff --git a/tests/yaccdry.test b/tests/yaccdry.test
index fed10d3..92f506a 100755
--- a/tests/yaccdry.test
+++ b/tests/yaccdry.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ END
cat > parse.y << 'END'
%{
-int yylex () {return 0;}
+int yylex () { return 0; }
void yyerror (char *s) {}
%}
%%
diff --git a/tests/yaccpp.test b/tests/yaccpp.test
index 0d0591d..0f12331 100755
--- a/tests/yaccpp.test
+++ b/tests/yaccpp.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2006, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,8 +14,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure Yacc + C++ is supported.
-# Please keep this is sync with sister test lexcpp.test.
+# Test to make sure Yacc + C++ is not obviously broken.
+# See also related tests `yacc-cxx.test' and `yacc-d-cxx.test',
+# which does much more in-depth checks (but requires an actual
+# Yacc program and a working C++ compiler).
. ./defs || Exit 1
@@ -36,10 +37,45 @@ END
$ACLOCAL
$AUTOMAKE -a
+$EGREP '(\.[ch]|foo|bar|baz|qux)' Makefile.in # For debugging.
+
+$EGREP '(foo|bar|baz|qux)\.h' Makefile.in && Exit 1
+
sed -e 's/^/ /' -e 's/$/ /' Makefile.in >mk
+
$FGREP ' foo.c++ ' mk
$FGREP ' bar.cpp ' mk
$FGREP ' baz.cc ' mk
$FGREP ' qux.cxx ' mk
+cat >> Makefile.am <<END
+AM_YFLAGS = -d
+qux_YFLAGS = foo
+END
+
+$AUTOMAKE
+
+$EGREP '(\.[ch]|foo|bar|baz|qux)' Makefile.in # For debugging.
+
+sed -e 's/^/ /' -e 's/$/ /' Makefile.in >mk
+
+$FGREP ' foo.c++ ' mk
+$FGREP ' foo.h++ ' mk
+$FGREP ' bar.cpp ' mk
+$FGREP ' bar.hpp ' mk
+$FGREP ' baz.cc ' mk
+$FGREP ' baz.hh ' mk
+
+$EGREP '(^| )foo\.h\+\+(:| .*:)' Makefile.in
+$EGREP '(^| )bar\.hpp(:| .*:)' Makefile.in
+$EGREP '(^| )baz\.hh(:| .*:)' Makefile.in
+
+grep ' foo\.h[ :]' mk && Exit 1
+grep ' bar\.h[ :]' mk && Exit 1
+grep ' baz\.h[ :]' mk && Exit 1
+
+$FGREP ' qux-qux.cxx ' mk
+$EGREP '(^| )qux-qux\.cxx(:| .*:)' Makefile.in
+grep 'qux\.h.*:' Makefile.in && Exit 1
+
:
diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index c98fb46..d11fbaf 100755
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,8 +25,6 @@
required='cc yacc'
. ./defs || Exit 1
-distdir=$me-1.0
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_YACC
@@ -42,7 +39,7 @@ END
# Original parser, with `foobar'.
cat > parse.y << 'END'
%{
-int yylex () {return 0;}
+int yylex () { return 0; }
void yyerror (char *s) {}
%}
%%
@@ -69,7 +66,7 @@ $sleep
# New parser, with `fubar'.
cat > ../parse.y << 'END'
%{
-int yylex () {return 0;}
+int yylex () { return 0; }
void yyerror (char *s) {}
%}
%%
@@ -87,7 +84,7 @@ $sleep
# New parser, with `maude'.
cat > ../parse.y << 'END'
%{
-int yylex () {return 0;}
+int yylex () { return 0; }
void yyerror (char *s) {}
%}
%%
diff --git a/tests/yflags-cmdline-override.test
b/tests/yflags-cmdline-override.test
index ec6a9b5..b69fc4f 100755
--- a/tests/yflags-cmdline-override.test
+++ b/tests/yflags-cmdline-override.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/yflags-conditional.test b/tests/yflags-conditional.test
index 8849af4..40f040f 100755
--- a/tests/yflags-conditional.test
+++ b/tests/yflags-conditional.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/yflags-d-false-positives.test
b/tests/yflags-d-false-positives.test
index 6decf9d..0f497d0 100755
--- a/tests/yflags-d-false-positives.test
+++ b/tests/yflags-d-false-positives.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/yflags-force-conditional.test
b/tests/yflags-force-conditional.test
index a5b3599..c587537 100755
--- a/tests/yflags-force-conditional.test
+++ b/tests/yflags-force-conditional.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/yflags-force-override.test b/tests/yflags-force-override.test
index 3ed1b38..e792d02 100755
--- a/tests/yflags-force-override.test
+++ b/tests/yflags-force-override.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -59,6 +59,4 @@ test -f foo.c
test -f foo.h
test -f foo.output
-$MAKE distcheck
-
:
diff --git a/tests/yflags-var-expand.test b/tests/yflags-var-expand.test
index 5117b6b..af7ede8 100755
--- a/tests/yflags-var-expand.test
+++ b/tests/yflags-var-expand.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/yflags.test b/tests/yflags.test
index d37cad1..4bed0c9 100755
--- a/tests/yflags.test
+++ b/tests/yflags.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/tests/yflags2.test b/tests/yflags2.test
index 8c2beda..0f76b4c 100755
--- a/tests/yflags2.test
+++ b/tests/yflags2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11-1988-g0e03530,
Stefano Lattarini <=