[libsecret/wip/dueno/tap: 79/79] build: Use stock tap-driver from automake

[Daiki Ueno <dueno src gnome org>]

commit 6ef1ec4722ce51aa49c71c498ca08863a839b1b2
Author: Daiki Ueno <dueno src gnome org>
Date:   Thu Aug 30 07:33:32 2018 +0200

    build: Use stock tap-driver from automake
    
    Previously, we used a custom TAP driver written in Python.  Now that
    Automake's TAP driver has sufficient features, the script should be no
    longer necessary.

 .gitignore       |   1 +
 Makefile.am      |  10 +-
 build/tap-driver | 429 -------------------------------------------------------
 configure.ac     |   3 +-
 4 files changed, 6 insertions(+), 437 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f2e41a..62eeb63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ stamp*
 !/build/m4/vapigen.m4
 /build/valgrind-suppressions
 /build/test-driver
+/build/litter
 
 /docs/man/secret-tool.1
 /docs/reference/libsecret/version.xml
diff --git a/Makefile.am b/Makefile.am
index 24cd118..9804b42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,18 +56,15 @@ TESTS_ENVIRONMENT = LD_LIBRARY_PATH=$(builddir)/.libs GI_TYPELIB_PATH=$(builddir
 TEST_EXTENSIONS = .py .js
 
 # Default executable tests
-LOG_DRIVER = $(srcdir)/build/tap-driver
-LOG_DRIVER_FLAGS = --format=tap
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+       $(top_srcdir)/build/litter/tap-driver.sh
+LOG_DRIVER_FLAGS = --comments --ignore-exit
 LOG_COMPILER = $(srcdir)/build/tap-gtester
 
 # Python tests
-PY_LOG_DRIVER = $(srcdir)/build/tap-driver
-PY_LOG_DRIVER_FLAGS = --format=tap
 PY_LOG_COMPILER = $(srcdir)/build/tap-unittest
 
 # Javascript tests
-JS_LOG_DRIVER = $(srcdir)/build/tap-driver
-JS_LOG_DRIVER_FLAGS = --format=simple
 JS_LOG_COMPILER = gjs
 
 VALGRIND_ARGS = --trace-children=no --quiet --error-exitcode=33 \
@@ -184,7 +181,6 @@ EXTRA_DIST = \
        tool/meson.build \
        build/valgrind \
        build/tap-gtester \
-       build/tap-driver \
        build/tap-unittest \
        $(VALGRIND_SUPPRESSIONS)
 
diff --git a/configure.ac b/configure.ac
index 1ce2375..230491b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,8 @@ SECRET_AGE=0
 # -----------------------------------------------------------------------------
 
 AC_CONFIG_MACRO_DIR([build/m4])
-AC_CONFIG_AUX_DIR([build])
+AC_CONFIG_AUX_DIR([build/litter])
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
 AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar foreign -Wno-portability subdir-objects])
 AM_SANITY_CHECK
 AC_CONFIG_HEADERS(config.h)