test: Take advantage of TAP test driver

diff --git a/.gitignore b/.gitignore
index db38c6810af879ea527f1cd67e12bcc0b30c3b03..21116e6f282d436aa368bdb7ca3ca44289f7f4b5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,7 @@ Makefile
 Makefile.in
 missing
 stamp-h1
+tap-driver.sh
 temp.txt
 test-driver
 

diff --git a/Makefile.am b/Makefile.am
index b6d3fb8e3995ff75654669776224c8a67b540bd4..2616be0472e3dbbc7016d698f0d23158fd6ea093 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,6 +64,10 @@ AM_TESTS_ENVIRONMENT = \
        export abs_top_builddir;
 AM_TESTS_FD_REDIRECT = 9>&2;
 
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+       $(top_srcdir)/build/litter/tap-driver.sh
+LOG_DRIVER_FLAGS = --comments --ignore-exit
+
 MEMCHECK_ENV = $(TEST_RUNNER) valgrind --error-exitcode=80 --quiet
 
 LEAKCHECK_ENV = $(TEST_RUNNER) valgrind --error-exitcode=81 --quiet --leak-check=yes

diff --git a/configure.ac b/configure.ac
index bbb81e9f23f8fce89617a9fe2be1ab678e692b06..69d58ffb8877088cdf857b518e8b1a9e629d598d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ P11KIT_AGE=3
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([build/m4])
 AC_CONFIG_AUX_DIR([build/litter])
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
 AM_INIT_AUTOMAKE([1.12 foreign subdir-objects])
 AM_SANITY_CHECK
 AM_MAINTAINER_MODE([enable])