t/: Always use testwrapper.sh for running tests.

… using automake's LOG_COMPILER variable.

diff --git a/t/Makefile.am b/t/Makefile.am
index c5560e976eb5642be9ce1b753d8f1a2b9d88a2e8..da85f5d61f540e2262d485e4f59f6bf8845fbe1d 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -18,6 +18,8 @@ check_LTLIBRARIES =
 # unit tests
 #
 
+LOG_COMPILER = $(abs_srcdir)/testwrapper.sh
+
 if UNIT_TESTING
 TESTS += unit/libsysdb_test unit/libsysdb_net_test
 check_PROGRAMS += unit/libsysdb_test unit/libsysdb_net_test

diff --git a/t/cibuild.sh b/t/cibuild.sh
index 9e21eb2b1fe15a75eb6fbe08f4f613b0cd110830..61f4a8b09b658e3b13c75dd17cc7249517a275d7 100755 (executable)
--- a/t/cibuild.sh
+++ b/t/cibuild.sh
@@ -17,7 +17,7 @@ case "$CICFLAGS" in
                # skip regular tests
                ;;
        *)
-               make test TESTS_ENVIRONMENT="./testwrapper.sh"
+               make test
                ;;
 esac