Merge branch 'test-protocols' into testsuite-work

* test-protocols:
  fix: improve latest ChangeLog entry after merge
  parallel-tests: don't allow @substitutions@ in TEST_EXTENSIONS
  tests: fix spurious error in 'test-extensions.test'
  tests: fix spurious failure in 'insthook.test'
  maintcheck: fix spurious failure
  regenerate Makefile.in

diff --cc ChangeLog
index 686a30d,f58b01a..ae91c84
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,48 +1,57 @@@
  2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       parallel-tests: don't allow @substitutions@ in TEST_EXTENSIONS
+       Even after the last commit `v1.11-476-g90bea64', the checks
+       performed by automake on entries in $(TEST_EXTENSIONS) tried to
+       allow for @substitited@ stuff.  This however ends up allowing
+       quite brittle setups, which, most importantly, are of no real
+       practical usefulness anyway.  So it's better to just disallow
+       @substitutions@ in TEST_EXTENSIONS altogether, offering a clear
+       error message, instead of risking weird bugs and unexpected
+       behaviors in the generated Makefile.in.
+       * automake.in ($TEST_EXTENSION_PATTERN): Turned from a regular
+       expression ...
+       (is_valid_test_extension): ... into this subroutine.  Don't allow
+       generic @substitutions@ anymore (possibly making an exception for
+       `@EXEEXT@' under the proper circumstances).
+       * tests/test-extensions.test: Adjust and extend.  This test does
+       not cause any internal error in automake anymore now.
+ 
+ 2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix spurious failure in 'insthook.test'
+       * tests/insthook.test (Makefile.am): Add a proper `uninstall-hook'
+       target to remove the symlink created by the `install-exec-hook'
+       target; this prevents "make distcheck" from failing spuriously.
+       Since we are at it, delete an extra blank line, and add a trailing
+       `:' command.
+ 
+ 2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       maintcheck: fix spurious failure
+       * lib/am/distdir.am: Use `$(infodir)', not `${infodir}', to avoid
+       complaints from the `sc_no_brace_variable_expansions' maintainer
+       check.
+ 
+ 2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix spurious error in 'test-extensions.test'
+       * tests/test-extensions.test: Call automake with the option
+       `--add-missing', to ensure the required script `test-driver'
+       gets installed.  Note that the test still fails due to an
+       internal error in automake, though.
+ 
+ 2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 +      tests: avoid few useless uses of the `-e' make option
 +      * tests/python12.test: Using `make -e' is not required to override
 +      the DESTDIR variable, since this variable shouldn't be defined in
 +      any automake-generated Makefile.in file.
 +      * tests/man2.test: Likewise.
 +      * tests/man5.test: Likewise.
 +
 +2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
        fix: make a test script executable
        * tests/nobase-nodist.test: Make executable.
  

diff --cc Makefile.in
Simple merge

diff --cc tests/test-extensions.test
Simple merge