From f0a888c0d19db9d9615601661ceb8708d4c31933 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 5 Feb 2023 11:20:25 +0100 Subject: [PATCH] test: update Makefile.am and build instructions, new testserv plugin Signed-off-by: Joachim Wiberg --- configure.ac | 1 + test/Makefile.am | 4 ++++ test/README.md | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 57a70500..abc10b07 100644 --- a/configure.ac +++ b/configure.ac @@ -268,6 +268,7 @@ AM_CONDITIONAL(SULOGIN, [test "x$with_sulogin" != "xno"]) AM_CONDITIONAL(WATCHDOGD, [test "x$with_watchdog" != "xno"]) AM_CONDITIONAL(DOC, [test "x$enable_doc" = "xyes"]) AM_CONDITIONAL(CONTRIB, [test "x$enable_contrib" = "xyes"]) +AM_CONDITIONAL(TESTSERV, [test "x$enable_testserv_plugin" = "xyes"]) # Override default libdir, used for plugins and rescue.conf pkglibdir=$libdir/finit diff --git a/test/Makefile.am b/test/Makefile.am index 4e867d25..8e9b3750 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -39,6 +39,7 @@ EXTRA_DIST += start-kill-stop.sh EXTRA_DIST += start-stop-sysv.sh EXTRA_DIST += start-stop-serv.sh EXTRA_DIST += signal-service.sh +EXTRA_DIST += testserv.sh AM_TESTS_ENVIRONMENT = TENV_ROOT='$(abs_builddir)/tenv-root/'; AM_TESTS_ENVIRONMENT += export TENV_ROOT; @@ -74,6 +75,9 @@ TESTS += start-kill-stop.sh TESTS += start-stop-sysv.sh TESTS += start-stop-serv.sh TESTS += signal-service.sh +if TESTSERV +TESTS += testserv.sh +endif check-recursive: setup-chroot diff --git a/test/README.md b/test/README.md index 65bd632d..5c5f8fbe 100644 --- a/test/README.md +++ b/test/README.md @@ -16,7 +16,7 @@ Running tests To run the test suite, first [build](../doc/build.md) Finit, e.g: - ./configure --prefix=/usr --exec-prefix= --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr --exec-prefix= --sysconfdir=/etc --localstatedir=/var --enable-testserv-plugin make -j9 clean all Then run (parallel does not work atm):