Restore behaviour of "make test" and "make unit"

Add recursive "test" and "unit" rules, which execute "make check"
in specific directories - "make test" runs the system tests, and
"make unit" runs the unit tests.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0565580d9920dab86497c81aa615f97b0e3e40f7..b0662fc1de3eafceedfbe8e92c819bf939f20874 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -320,7 +320,7 @@ stages:
   before_script:
     - *setup_softhsm
   script:
-    - cd lib && make -j${TEST_PARALLEL_JOBS:-1} -k check V=1
+    - make -j${TEST_PARALLEL_JOBS:-1} -k unit V=1
 
 .unit_test: &unit_test_job
   <<: *unit_test_common

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 0dda39f679dfb90e8b49ae471bf4fb823a936035..ea4d13a934454d0725d0f78d6aa0c1406a887f80 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -176,3 +176,5 @@ $(TESTS): run.sh
 
 clean-local:
        -rm -f get_ports.state get_ports.lock
+
+test-local: check

diff --git a/configure.ac b/configure.ac
index 36d038b810901a61fc17586c636dac693dee7f36..8ad62afb2709a1193ee7edffa84774f17fb1a579 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,7 @@ AC_DEFINE([PACKAGE_BUILDER], ["make"], [make or Visual Studio])
 AC_CONFIG_SRCDIR([bin/named/main.c])
 AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz -Wall -Werror])
 AM_SILENT_RULES([yes])
+AM_EXTRA_RECURSIVE_TARGETS([test unit])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/lib/dns/tests/Makefile.am b/lib/dns/tests/Makefile.am
index 177cadec1a47d3d162efb7225a56c6de2bf13261..1ce71637732daebf654f74bb39e2a97a61c69994 100644 (file)
--- a/lib/dns/tests/Makefile.am
+++ b/lib/dns/tests/Makefile.am
@@ -106,3 +106,5 @@ dst_test_CPPFLAGS =         \
 rsa_test_CPPFLAGS =            \
        $(AM_CPPFLAGS)          \
        $(OPENSSL_CFLAGS)
+
+unit-local: check

diff --git a/lib/irs/tests/Makefile.am b/lib/irs/tests/Makefile.am
index 5dc892cf394d91aaa1a528a5e48e5a954bf15703..0246f34cc798a317044a781865c9650e3072cd26 100644 (file)
--- a/lib/irs/tests/Makefile.am
+++ b/lib/irs/tests/Makefile.am
@@ -13,3 +13,5 @@ check_PROGRAMS = \
        resconf_test
 
 TESTS = $(check_PROGRAMS)
+
+unit-local: check

diff --git a/lib/isc/tests/Makefile.am b/lib/isc/tests/Makefile.am
index 9a0dc87e2900737a13c21b1b72fc40f2f55ce893..554e80645314b16df9cd884dec2289604bb38cf4 100644 (file)
--- a/lib/isc/tests/Makefile.am
+++ b/lib/isc/tests/Makefile.am
@@ -63,3 +63,5 @@ md_test_LDADD =               \
 random_test_LDADD =    \
        $(LDADD)        \
        -lm
+
+unit-local: check

diff --git a/lib/isccc/tests/Makefile.am b/lib/isccc/tests/Makefile.am
index 000e5c8d4238837f94e6255e9027d169a37b4316..a0b5abd3b82a2bbfc519bb9203320a6b81df96d8 100644 (file)
--- a/lib/isccc/tests/Makefile.am
+++ b/lib/isccc/tests/Makefile.am
@@ -13,3 +13,5 @@ check_PROGRAMS =      \
        result_test
 
 TESTS = $(check_PROGRAMS)
+
+unit-local: check

diff --git a/lib/isccfg/tests/Makefile.am b/lib/isccfg/tests/Makefile.am
index 9f31441bb2251c4be2079c1b5d68c747badbdd69..42242ad0705a0612f2165e36299270e4cb2c03c5 100644 (file)
--- a/lib/isccfg/tests/Makefile.am
+++ b/lib/isccfg/tests/Makefile.am
@@ -15,3 +15,5 @@ check_PROGRAMS = \
        parser_test
 
 TESTS = $(check_PROGRAMS)
+
+unit-local: check

diff --git a/lib/ns/tests/Makefile.am b/lib/ns/tests/Makefile.am
index 76145db571625ab1a0d8c52c4502cf1496d0c1db..c7ff73cd316ff2a1c8016adfd794d3bb453c9eee 100644 (file)
--- a/lib/ns/tests/Makefile.am
+++ b/lib/ns/tests/Makefile.am
@@ -43,3 +43,5 @@ query_test_LDFLAGS =                  \
        -Wl,--wrap=isc_nmhandle_unref
 
 endif
+
+unit-local: check