diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am index be72b3d41c..72d464ace0 100644 --- a/bin/tests/system/Makefile.am +++ b/bin/tests/system/Makefile.am @@ -19,7 +19,7 @@ LDADD += \ if HAVE_PERL -check_PROGRAMS = \ +noinst_PROGRAMS = \ feature-test \ makejournal \ pipelined/pipequeries \ diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py index 338338f1d6..50510a000c 100644 --- a/bin/tests/system/conftest.py +++ b/bin/tests/system/conftest.py @@ -190,28 +190,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 diff --git a/bin/tests/system/dlzexternal/driver/Makefile.am b/bin/tests/system/dlzexternal/driver/Makefile.am index a8211d1fb1..0028edb573 100644 --- a/bin/tests/system/dlzexternal/driver/Makefile.am +++ b/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 \ diff --git a/bin/tests/system/dyndb/driver/Makefile.am b/bin/tests/system/dyndb/driver/Makefile.am index f8ceded031..86dddb6e7b 100644 --- a/bin/tests/system/dyndb/driver/Makefile.am +++ b/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 \ diff --git a/bin/tests/system/hooks/driver/Makefile.am b/bin/tests/system/hooks/driver/Makefile.am index ffa074a27c..b0c4b799c4 100644 --- a/bin/tests/system/hooks/driver/Makefile.am +++ b/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)