Merge branch 'tests-init'

diff --cc ChangeLog
index f2897573bc619361136e38cb9557109350308ce2,634a3ed25a172b85a7ef94f7f7dfece6b40e0e5d..815f1a6f0b723c92145a3bec4835457a27d599ee
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,50 -1,65 +1,112 @@@
+ 2010-11-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Tests defs: improve messages for skipped tests.
+       * tests/defs: Give meaningful messages about the reasons of a
+       test skip; this is especially useful as this file is run without
+       verbose xtraces on.  Related reorderings in the code and new
+       comments.
+ 
+ 2010-11-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Tests defs: move static definitions in a new file `defs-static'.
+       The new file is meant to be idempotent w.r.t. mutiple inclusions.
+       * tests/defs.in: Removed, its contents split among ...
+       * tests/defs-static.in: ... this new file ...
+       * tests/defs: ... and this new file, including the former.
+       * configure.ac (AC_CONFIG_FILES): Remove `tests/defs', add
+       `tests/defs-static'.
+       (AC_CONFIG_LINKS): Add `tests/defs'.
+       * tests/Makefile.am ($(parallel_tests)): Update.
+       ($(instspc_tests)): Likewise.
+       * tests/.gitignore: Update.
+ 
+       Tests defs: $testsbuilddir is now AC_SUBST'ed.
+       * tests/defs.in ($testsbuilddir): Substitute from @abs_builddir@.
+       Add sanity check on $testsbuilddir, similar to those on
+       $testsrcdir and $top_testsrcdir.
+ 
+       Tests defs: do not print message "Running test $0" anymore.
+       * tests/defs.in: Printing the message "=== Running test $0" at
+       the beginning of each tests made sense when Automake used the old
+       test-driver, which sent all the output directly to stdout/stderr.
+       Now that the parallel test-driver is used, which saves output of
+       each test in its correspoding log file, that old message is just
+       useless noise.
+ 
+       Tests defs: rename $curdir -> $testbuilddir
+       * tests/defs.in: Rename $curdir to $testbuildir, for clarity and
+       consistency with $testsrcdir and $top_testsrcdir.
+ 
+       Tests defs: prefer "$curdir" over "`pwd`".
+       * tests/defs.in: We already save the value of `pwd` in $curdir
+       early in the file, so there no need to recalculate it later, when
+       the current working directory is not changed.
+ 
+       Tests defs: use `$me' in more error messages.
+       * tests/defs.in: Also use `$me' in error messages referring to
+       missing `defs' or `defs.in', since that variable is now defined
+       before those checks.
+ 
+       Tests defs: do not use `Exit' where plain `exit' suffices.
+       * tests/defs.in: Use "exit 77" rather than "Exit 77" to skip the
+       test when required libtool/gettext macros are not found, since
+       such skips would take place before the exit trap is installed.
+ 
+       Tests defs: improve and extends comments.
+       * tests/defs.in: Improve and extends some comments, especially in
+       relation with the changes introduced by the previous reordering.
+ 
+       Tests defs: various reorderings.
+       * tests/defs.in: Reordered various snippets of code in a
+       clearer way.
+ 
 +2010-11-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Fix bug in test `backcompat4.test' (stale autom4te cache).
 +      * tests/backcompat4.test: Remove stale autom4te cache directory
 +      before re-running aclocal and automake.  Also, since we are at
 +      it, be more verbose in displaying contents of generated files,
 +      to ease debuggability.
 +      Reported by Ralf Wildenhues.
 +
 +2010-11-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Fix a bug in variable concatanation with `+='.
 +      * lib/Automake/VarDef.pm (append): Since the content of the
 +      "appended-to" variable is going to be unconditionally normalized
 +      later, simply separate the appended value with a single whitespace
 +      character, instead of trying to be uselesssly smarter by using
 +      escaped newlines.  This fixes a bug in which extra backslashes
 +      where erroneously inserted in the variable's final value.
 +      * tests/pluseq11.test: New test, exposing the bug.
 +      * tests/Makefile.am (TESTS): Update.
 +      Reported by Andy Wingo.
 +
 +2010-11-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Modernize, improve and/or tweak various test scripts.
 +      * tests/stamph2.test: Improve m4 quoting in `configure.in', and
 +      prefer trailing `:' over trailing `Exit 0'.
 +      * tests/syntax.test: Escape literal dots in grep regexps.
 +      * tests/copy.test: Enable `errexit' shell flag.  Extend test by
 +      checking with `test' utility that the script `install-sh' is
 +      copied, but not symlinked.
 +      * tests/depdist.test: Move setting of `errexit' shell flag earlier
 +      in the script (just after inclusion of ./defs).  Avoid obsoleted
 +      constructs in generated `configure.in'.  Prefer to do our checks
 +      by running configure and make over grepping Makefile.in.
 +      * tests/target-cflags: Move setting of `errexit' shell flag
 +      earlier in the script (just after inclusion of ./defs). Use the
 +      `configure.in' stub created by `./defs', rather than writing it
 +      from scratch.
 +      * tests/target-clash: Do not uselessly run autoconf.
 +      * tests/ctarget1.test: Renamed ...
 +      * tests/cond-basic.test: ... to this.  Use the `configure.in' stub
 +      created by `./defs', rather than writing it from scratch.
 +      Move setting of `errexit' shell flag earlier in the script (just
 +      after inclusion of ./defs).  Other minor cosmetic changes.
 +      * tests/Makefile.am (TESTS): Updated.
 +
  2010-11-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        New tests on obsoleted usages of automake/autoconf macros (such

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge