Merge branch 'test-protocols' into tap-testsuite-work

* test-protocols:
  tap: fix whitespace munging of diagnostic messages

diff --cc ChangeLog
index 9bf5470a9e62b7c17e553f2a542803fc37a7bee9,e07ef47ab20d51ab1e7561f669f0b680990eaa1d..be562fb1b7056aa9a6a655c18b88c89083ffc143
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,98 -1,10 +1,105 @@@
+ 2011-08-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tap: fix whitespace munging of diagnostic messages
+       * lib/tap-driver (extract_tap_comment): Pass the `g' flag to the
+       substitution operator, to strip also trailing whitespaces.  Fixes
+       a failure in test `tap-whitespace-normalization.test'.
+ 
 +2011-08-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: refactor and cleanup 'instspc.tap'
 +      * tests/instspc.tap (is_in_list): New helper subroutine.
 +      (expected_to_fail): Re-implement using it.
 +      (define_problematic_string): Likewise.  Also, rename the special
 +      arguments `build-fail' and 'install-fail' to respectively
 +      `builddir-fail' and `destdir-fail', and other related changes.
 +      (Test data definition): Adapt.
 +      ($instspc_xfail_builds_list): Renamed ...
 +      ($builddir_xfails): ... to this.
 +      ($instspc_xfail_installs_list): Renamed ...
 +      ($destdir_xfails): ... to this.
 +      ($instspc_names_list): Renamed ...
 +      ($test_names_list): ... to this.
 +      ($instspc_test_string): Renamed ...
 +      ($test_string): ... to this.
 +      Add some explicative and "FIXME" comments.
 +
 +2011-08-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: use TAP for `depmod*' tests, related simplifications
 +      * tests/depmod-tests.sh: Delete this complex and multifarious
 +      script, moving all it checks it used to perform into ...
 +      * tests/depmod.tap: ... this TAP-based test script.  And extend
 +      it quite a bit, since the new form of the test was papering over
 +      some pre-existing failures (this was due to the fact that the
 +      values used for the VPATH were shorter in the new test script).
 +      * tests/depmod-data.test: Deleted.
 +      * tests/Makefile.am ($(srcdir)/depmod-tests.am): Don't include
 +      nor generate it anymore.
 +      (EXTRA_DIST): Don't distribute depmod-tests.sh anymore.
 +      (TEST_EXTENSIONS): Remove '.depmod'.
 +      (DEPMOD_LOG_COMPILER): Deleted.
 +      (depmod-data.log, $(depmod_tests:.depmod=.log)): Delete
 +      dependencies for these files, which are not used anymore.
 +      ($(depmod_tests)): Delete this dummy dependency declaration.
 +      (TESTS): Remove $(depmod_tests).
 +      (handwritten_tests): Remove depmod-data.test, add depmod.tap.
 +      * bootstrap: Don't generate tests/depmod-tests.am anymore.
 +
 +2011-08-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: use TAP for `instspc*' tests, related simplifications
 +      * tests/instspc-tests.sh: Delete this complex and multifarious
 +      script, moving all it checks it used to perform into ...
 +      * tests/instspc.tap: ... this TAP-based test script.
 +      * tests/instspc-data.test: Deleted.
 +      * tests/Makefile.am ($(srcdir)/instspc-tests.am): Don't include
 +      nor generate it anymore.
 +      (EXTRA_DIST): Don't distribute instspc-tests.sh anymore.
 +      (TEST_EXTENSIONS): Remove '.instspc'.
 +      (INSTSPC_LOG_COMPILER): Deleted.
 +      (XFAIL_TESTS): Remove $(instspc_xfail_tests).
 +      (instspc-data.log, $(instspc_tests:.instspc=.log)): Delete
 +      dependencies for these files, which are not used anymore.
 +      ($(instspc_tests)): Delete this dummy dependency declaration.
 +      (TESTS): Remove $(instspc_tests).
 +      (handwritten_tests): Remove instspc-data.test, add instspc.tap.
 +      * bootstrap: Don't generate tests/instspc-tests.am anymore.
 +
 +2011-08-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: do fd redirections with $(AM_TESTS_FD_REDIRECT)
 +      * tests/Makefile.am: The redirections of file descriptors needed
 +      by our test scripts is now done using the $(AM_TESTS_FD_REDIRECT)
 +      variable (the new blessed way since commit `v1.11-906-gb9e9d54'),
 +      not using an hack involving $(AM_TESTS_ENVIRONMENT).  This has
 +      the further benefit of allowing the use of $(TESTS_ENVIRONMENT)
 +      again on part of the users.
 +      * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Remove redirection of
 +      file descriptors.
 +      (AM_TESTS_FD_REDIRECT): Redirect file descriptor 9 to original
 +      stderr.
 +      Comments adjusted.
 +      * tests/plain-functions.sh ($stderr_fileno_): Update comment.
 +
 +2011-08-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: use custom TAP diagnostic in our own tests
 +      This change allow us to easily and transparently avoid spurious
 +      TAP diagnostic in our own testsuite, with the help of the new
 +      `--diagnostic-string' option of our TAP test driver.
 +      * tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Also pass option
 +      `--diagnostic-string' with value `#%#' (necessarily obtained
 +      through some shell indirections).
 +      * tests/tap-functions.sh (diag_): Assume that the string denoting
 +      TAP diagnostic is stored in the `$diag_string_' variable.  Update
 +      comments.
 +      ($diag_string_): Initialize to "#".
 +      * tests/defs ($diag_string_): Re-define to "#%#".
 +      (show_): Remove, it's obsolete now.
 +      * add-missing.tap: Don't use `show_' anymore to avoid spurious
 +      TAP diagnostic; `cat' should suffice now.
 +
  2011-08-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tap: fix typo in TAP driver version message