Merge branch '4249-compile-test-files-during-make' into 'main'

Compile system test binaries during make

Closes #4249

See merge request isc-projects/bind9!8189

.gitlab-ci.yml

@@ -1445,7 +1445,7 @@ respdiff-short:asan:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined"
     LDFLAGS: "-fsanitize=address,undefined"
-    EXTRA_CONFIGURE: "--without-jemalloc"
+    EXTRA_CONFIGURE: "--disable-dnsrps --without-jemalloc"
     MAX_DISAGREEMENTS_PERCENTAGE: "0.5"
   script:
     - bash respdiff.sh -s named -q "${PWD}/10k_a.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named"
@@ -1458,7 +1458,7 @@ respdiff-short:tsan:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--enable-pthread-rwlock --without-jemalloc"
+    EXTRA_CONFIGURE: "--disable-dnsrps --enable-pthread-rwlock --without-jemalloc"
     MAX_DISAGREEMENTS_PERCENTAGE: "0.5"
     TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}"
   script:
@@ -1486,7 +1486,7 @@ respdiff-long:asan:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined"
     LDFLAGS: "-fsanitize=address,undefined"
-    EXTRA_CONFIGURE: "--without-jemalloc"
+    EXTRA_CONFIGURE: "--disable-dnsrps --without-jemalloc"
     MAX_DISAGREEMENTS_PERCENTAGE: "0.5"
   script:
     - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named"
@@ -1499,7 +1499,7 @@ respdiff-long:tsan:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--enable-pthread-rwlock --without-jemalloc"
+    EXTRA_CONFIGURE: "--disable-dnsrps --enable-pthread-rwlock --without-jemalloc"
     MAX_DISAGREEMENTS_PERCENTAGE: "0.5"
     TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}"
   script:

bin/tests/system/Makefile.am

@@ -25,7 +25,7 @@ LDADD +=			\
 
 if HAVE_PERL
 
-check_PROGRAMS =		\
+noinst_PROGRAMS =		\
 	feature-test		\
 	makejournal		\
 	pipelined/pipequeries	\

bin/tests/system/conftest.py

@@ -189,28 +189,6 @@ else:
         # Ensure this hook only runs on the main pytest instance if xdist is
         # used to spawn other workers.
         if not XDIST_WORKER:
-            CONFTEST_LOGGER.debug("compiling required files")
-            env = os.environ.copy()
-            env["TESTS"] = ""  # disable automake test framework - compile-only
-            try:
-                # FUTURE: Remove the need to run this compilation command
-                # before executing tests. Currently it's only here to have
-                # on-par functionality with the legacy test framework.
-                proc = subprocess.run(
-                    "make -e check",
-                    shell=True,
-                    check=True,
-                    cwd=FILE_DIR,
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT,
-                    env=env,
-                )
-            except subprocess.CalledProcessError as exc:
-                CONFTEST_LOGGER.debug(exc.stdout)
-                CONFTEST_LOGGER.error("failed to compile test files: %s", exc)
-                raise exc
-            CONFTEST_LOGGER.debug(proc.stdout)
-
             if config.pluginmanager.has_plugin("xdist") and config.option.numprocesses:
                 # system tests depend on module scope for setup & teardown
                 # enforce use "loadscope" scheduler or disable paralelism

bin/tests/system/dlzexternal/driver/Makefile.am

@@ -4,7 +4,7 @@ AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
 	$(LIBDNS_CFLAGS)
 
-check_LTLIBRARIES = dlzexternal.la
+noinst_LTLIBRARIES = dlzexternal.la
 
 dlzexternal_la_SOURCES =	\
 	driver.c		\

bin/tests/system/dyndb/driver/Makefile.am

@@ -4,7 +4,7 @@ AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
 	$(LIBDNS_CFLAGS)
 
-check_LTLIBRARIES = sample.la
+noinst_LTLIBRARIES = sample.la
 
 sample_la_SOURCES =	\
 	db.c		\

bin/tests/system/hooks/driver/Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS +=			\
 	$(LIBNS_CFLAGS)		\
 	$(LIBISCCFG_CFLAGS)
 
-check_LTLIBRARIES = test-async.la
+noinst_LTLIBRARIES = test-async.la
 
 test_async_la_SOURCES = test-async.c
 test_async_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -rpath $(abs_builddir)

bin/tests/system/rpz/testlib/Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS +=			\
 
 AM_CFLAGS += -Wall -pedantic
 
-check_LTLIBRARIES = libdummyrpz.la
+noinst_LTLIBRARIES = libdummyrpz.la
 libdummyrpz_la_SOURCES= dummylib.c test-data.c trpz.h test-data.h
 libdummyrpz_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -rpath $(abs_builddir)
 LDADD += -lpthread $(DLOPEN_LIBS)

bin/tests/system/rpz/testlib/dummylib.c

@@ -267,7 +267,6 @@ pack_soa_record(unsigned char *rdatap, size_t rbufsz, size_t *rdlenp,
 	ISC_U32TO8_BE(rdatap, psoa->expire);
 	rdatap += 4;
 	ISC_U32TO8_BE(rdatap, psoa->minimum);
-	rdatap += 4;
 	used += (4 * 5);
 
 	SET_IF_NOT_NULL(rdlenp, used);