Merge branch 'master' into testsuite-work
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 24 Dec 2011 10:05:24 +0000 (11:05 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 24 Dec 2011 10:05:24 +0000 (11:05 +0100)
* master:
  gitignore: use only one .gitignore file, in the top-level directory
  tests: one more fixlet for gettext macros requirement
  tests: fix handling of gettext macros requirement

1  2 
.gitignore
ChangeLog
tests/gettext-macros.test

diff --cc .gitignore
@@@ -8,8 -8,58 +8,55 @@@ Makefil
  /config.status
  /config.status.lineno
  /configure.lineno
- Makefile.in
- Makefile
+ /aclocal
+ /automake
+ /doc/amhello-*.tar.gz
+ /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/amhello/Makefile.in
+ /doc/amhello/aclocal.m4
+ /doc/amhello/config.h.in
+ /doc/amhello/config.h.in~
+ /doc/amhello/configure
+ /doc/amhello/depcomp
+ /doc/amhello/install-sh
+ /doc/amhello/missing
+ /lib/Automake/Config.pm
+ /lib/Automake/tests/*.log
 -/lib/Automake/tests/*.log-t
 -/tests/*.log
 -/tests/*.log-t
 -/tests/*.dir
++/lib/Automake/tests/*.trs
+ /tests/aclocal-1.*
+ /tests/automake-1.*
+ /tests/defs-static
 -/tests/instspc-tests.am
 -/tests/parallel-tests.am
 -/tests/instspc-*-build.test
 -/tests/instspc-*-install.test
 -/tests/*.test-t
 -/tests/*-p.test
++/tests/testsuite-part.am
++/tests/*-w.tap
++/tests/*-w.test
++/tests/*.dir
++/tests/*.log
++/tests/*.trs
  cscope.files
  cscope.in.out
  cscope.out
diff --cc ChangeLog
+++ b/ChangeLog
+ 2011-12-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       gitignore: use only one .gitignore file, in the top-level directory
+       * doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore,
+       lib/Automake/tests/.gitignore, tests/.gitignore: Deleted, their
+       contents merged into ...
+       * .gitignore: ... this top-level file.  Since we are at it, improve
+       it by anchoring files where it makes sense.
+ 2011-12-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       tests: one more fixlet for gettext macros requirement
+       * tests/gettext-macros.test (configure.in): Add calls to
+       AC_INIT and AC_PROG_CC, to avoid a spurious failure in the
+       later aclocal invocation.
+       Luckily, this wart wasn't causing any spurious SKIP or FAIL,
+       but only the redundant addition to the `-Wno-syntax' option
+       to some aclocal invocations in the gettext tests.
+ 2011-12-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       tests: fix handling of gettext macros requirement
+       The code introduced in the earlier change `v1.11-581-gb7d67d5'
+       and aimed at automatically fetching all the .m4 files provided by
+       gettext has proven inadequate, since it hasn't managed to truly
+       and always get *all* the required .m4 files.  For example, it has
+       failed to fetch the file `intldir.m4' (present in gettext 0.18.1,
+       and where the macro `AM_GNU_GETTEXT_INTL_SUBDIR' is defined),
+       which in turn has caused spurious SKIPs of at least the test
+       `gettext3.test'.
+       The reason for this debacle is that autopoint looks at the version
+       specified in AM_GNU_GETTEXT_VERSION to decide which version of the
+       gettext infrastructure to bring in; since we were unconditionally
+       specifying the older 0.10.35 version, the newer `.m4' files weren't
+       brought in.
+       * tests/gettext-macros.test: In AM_GNU_GETTEXT_VERSION, instead
+       of unconditionally specifying the older 0.10.35 version, specify
+       the version of the available `gettextize' or `autopoint' program,
+       dynamically extracted with the help of ...
+       (extract_program_version):... this new function, and saved ...
+       ($autopoint_version): ... in this new variable.
 +2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: automatically handle deps also for generated tests
 +      * tests/gen-testsuite-part: The test scripts are now scanned for
 +      automatic dependency generation *after* the auto-generated tests
 +      have been created, so they too will be scanned.  It is a little
 +      tricky to ensure that the freshly-generated tests are correctly
 +      scanned, and we do that with the help of ...
 +      (@generated_tests): ... this new variable.
 +      Other related minor changes and refactorings.
 +
 +2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: auto-generate deps for tests requiring libtool/gettext
 +      * tests/gen-testsuite-part: Tests requiring libtool (or related
 +      programs) will need libtool-provided m4 macros, so they should
 +      be run after `libtool-macros.test'.  Similarly for gettext tests.
 +      So, generate proper declarations of such dependencies.
 +      * tests/Makefile.am: Remove now-unneeded hand-written declaration
 +      of those dependencies.
 +
 +2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: remove FIXME comments from tricks to pacify syntax checks
 +      Originally, I myself had insisted on adding those "FIXME" comments
 +      near every unusual construct or use of "creative quoting" whose
 +      only purpose was to avoid false positive from out syntax checks.
 +      I did that with the expectation that we could have easily and soon
 +      added a whitelisting capability to our maintainer-specific syntax
 +      checks.  This hasn't been the case unfortunately, and now those
 +      "FIXME" in the comments are just distracting noise, making it more
 +      difficult to grep the test cases for stuff that could really use a
 +      fix or an improvement.  So just get rid of them.
 +      * tests/instdir-ltlib.test: Remove that extra "FIXME".
 +      * tests/instdir-prog.test: Likewise.
 +      * tests/parallel-tests3.test: Likewise.
 +      * tests/parallel-tests-dry-run.test: Likewise.
 +      * tests/parallel-tests-console-output.test: Likewise.
 +      * tests/parallel-tests-no-color-in-log.test: Likewise.
 +      * tests/tap-realtime.test: Likewise.
 +      * tests/test-trs-recover.test: Likewise.
 +      * tests/tap-deps.test: Likewise.
 +
 +2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: few minor fixlets, improvements and tweakings
 +      * tests/defs-static.in ($top_testbuilddir): New, for consistency
 +      and completeness.
 +      * tests/Makefile.am (do_subst): Substitute @abs_top_testbuilddir@
 +      as well.
 +      * tests/java-compile-run-mested.test: Prefer AM_TESTS_ENVIRONMENT
 +      over TESTS_ENVIRONMENT, now that the former has become available.
 +      * tests/java-compile-run-flat.test: Correct a botched "FIXME"
 +      comment.
 +      * tests/tap-realtime.test: Remove extra whitespace in comments.
 +      * tests/missing-tar.test: Use `get_shell_script' to bring in the
 +      `missing' script, to increase coverage.  Remove redundant call to
 +      `set -e'.  Fix a typo in comments.
 +      * tests/get-sysconf.test: Remove redundant definitions of
 +      `$top_testsrcdir', `testbuilddir' and `$top_testbuilddir'.
 +
 +2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: remove redundant uses of `set -e'
 +      * tests/deleted-am.test: Do not set the `errexit' shell flag, as
 +      it is already set by `tests/defs'.
 +      * tests/deleted-m4.test: Likewise.
 +      * tests/dist-missing-am.test: Likewise.
 +      * tests/dist-missing-am.test: Likewise.
 +      * tests/dist-missing-m4.test: Likewise.
 +      * tests/dist-missing-included-m4.test: Likewise.
 +      * tests/get-sysconf.test: Likewise.
 +      * tests/makefile-deps.test: Likewise.
 +      * tests/remake-m4-pr10111.test: Likewise.
 +      * tests/remake-am-pr10111.test: Likewise.
 +      * tests/remake-deleted-am.test: Likewise.
 +      * tests/remake-deleted-am2.test: Likewise.
 +      * tests/remake-deleted-am-subdir.test: Likewise.
 +      * tests/remake-renamed-am.test: Likewise.
 +
  2011-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: fix failure due to debugging code forgotten into a test
Simple merge