From: Daiki Ueno <dueno@redhat.com>
Date: Tue, 27 Mar 2018 14:23:12 +0000 (+0200)
Subject: test: Take advantage of TAP test driver
X-Git-Tag: 0.23.11~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1eb22867b1123601387b1fa06643077225bd7590;p=p11-kit

test: Take advantage of TAP test driver
---

diff --git a/.gitignore b/.gitignore
index db38c68..21116e6 100644
--- 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 b6d3fb8..2616be0 100644
--- 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 bbb81e9..69d58ff 100644
--- 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])