summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
-rwxr-xr-xtests/test-run.sh4
3 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 92da1f6..107c3ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,8 @@ test_bwrap_SOURCES=
include Makefile-docs.am
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
+LOG_COMPILER =
TESTS = tests/test-run.sh
TESTS_ENVIRONMENT = BWRAP=$(abs_top_builddir)/test-bwrap
diff --git a/configure.ac b/configure.ac
index b96b5e2..d7a9f23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,9 @@ AS_IF([ test "x$enable_require_userns" = "xyes" ], [
AC_DEFINE(ENABLE_REQUIRE_USERNS, 1, [Define if userns should be used by default in suid mode])
])
+AC_PROG_AWK
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+
AC_CONFIG_FILES([
Makefile
])
diff --git a/tests/test-run.sh b/tests/test-run.sh
index 114f76c..c73e9f9 100755
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -50,6 +50,8 @@ if ! $RUN true; then
skip Seems like bwrap is not working at all. Maybe setuid is not working
fi
+echo "1..3"
+
# Test help
${BWRAP} --help > help.txt
assert_file_has_content help.txt "usage: ${BWRAP}"
@@ -165,4 +167,4 @@ for die_with_parent_argv in "--die-with-parent" "--die-with-parent --unshare-pid
echo "ok die with parent ${die_with_parent_argv}"
done
-echo OK
+echo "ok - End of test"