[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1767-gc45e3c3

[Stefano Lattarini]

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=c45e3c37a9a0e9df08484ba3a6100af9761a2d97

The branch, master has been updated
       via  c45e3c37a9a0e9df08484ba3a6100af9761a2d97 (commit)
      from  b94e8bb67517e6cbfb84a7666e5690d4abc56d97 (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 c45e3c37a9a0e9df08484ba3a6100af9761a2d97
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jan 18 17:25:24 2012 +0100

    tests: don't use custom TAP diagnostic in our own tests
    
    We simply don't need it (yet), we are not actually using it (the
    set up for using it is there in the Makefile, but no test script
    makes actual use of that).
    
    * tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Remove '-comments' and
    '--diagnostic-string' options.
    * tests/defs ($diag_string_): Remove redefinition.

-----------------------------------------------------------------------

Summary of changes:
 tests/Makefile.am |   11 +----------
 tests/defs        |    4 ----
 2 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5696b44..0ccbb45 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,16 +28,7 @@ AM_PL_LOG_FLAGS = -Mstrict -I $(top_builddir)/lib -I 
$(top_srcdir)/lib -w
 
 TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
 
-AM_TAP_LOG_DRIVER_FLAGS = --merge --comments
-## Avoid spurious TAP diagnostic.  We use an awful indirection with a
-## shell command substitution here, since the string needs to contain
-## `#' characters, and these can't be escaped portably in a make macro
-## definition.
-## FIXME: this is quite inefficient though, as it adds one extra fork
-## FIXME: per TAP test script; this is OK for the moment, since we have
-## FIXME: few such scripts, but might become an issue in the future.
-## Keep this in sync with the definition of $diag_string_ in tests/defs.
-AM_TAP_LOG_DRIVER_FLAGS += --diagnostic-string `printf '\043%%\043\n'`
+AM_TAP_LOG_DRIVER_FLAGS = --merge
 
 EXTRA_DIST = ChangeLog-old
 
diff --git a/tests/defs b/tests/defs
index 41ee262..d6bc51e 100644
--- a/tests/defs
+++ b/tests/defs
@@ -230,10 +230,6 @@ else
 fi
 unset am_funcs_file
 
-# Avoid spurious TAP diagnostic.  Keep this in sync with the definition
-# of $(TAP_LOG_DRIVER_FLAGS) in `tests/Makefile.am'.
-diag_string_="#%#"
-
 # cross_compiling
 # ---------------
 # Tell whether we are cross-compiling.  This is especially useful to skip


hooks/post-receive
-- 
GNU Automake