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.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5696b44d6ff321a3910a8328446bf35a3d882d39..0ccbb45e96b4421a1b62c6c77f58a0e7b02e4d6d 100644 (file)
--- 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 41ee2625d0e0adfaf9e84cf968cd57ea035c2a59..d6bc51e811583afe85a9d73a44bb16b9fe32e889 100644 (file)
--- 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