[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[FYI] {master} tests: don't use custom TAP diagnostic in our own tests
From: |
Stefano Lattarini |
Subject: |
[FYI] {master} tests: don't use custom TAP diagnostic in our own tests |
Date: |
Wed, 18 Jan 2012 17:26:51 +0100 |
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.
---
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
--
1.7.7.3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [FYI] {master} tests: don't use custom TAP diagnostic in our own tests,
Stefano Lattarini <=