mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-28 04:34:54 -04:00
Compile system test binaries during make
Using check_PROGRAMS would postpone compiling the binaries needed by
system tests until `make check` would be called. Since it's preferable
to invoke pytest directly to run the system test suite, compile these
binaries without installing them during `make all` instead by using
noinst_PROGRAMS.
This removes the need to use TESTS= make -e check hack invoked from
pytest to work around this issue.
(cherry picked from commit 21980b43b8)
This commit is contained in:
parent
fb95c1b8f4
commit
ae18bc33c5
5 changed files with 4 additions and 26 deletions
|
|
@ -19,7 +19,7 @@ LDADD += \
|
|||
|
||||
if HAVE_PERL
|
||||
|
||||
check_PROGRAMS = \
|
||||
noinst_PROGRAMS = \
|
||||
feature-test \
|
||||
makejournal \
|
||||
pipelined/pipequeries \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ AM_CPPFLAGS += \
|
|||
$(LIBISC_CFLAGS) \
|
||||
$(LIBDNS_CFLAGS)
|
||||
|
||||
check_LTLIBRARIES = dlzexternal.la
|
||||
noinst_LTLIBRARIES = dlzexternal.la
|
||||
|
||||
dlzexternal_la_SOURCES = \
|
||||
driver.c \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ AM_CPPFLAGS += \
|
|||
$(LIBISC_CFLAGS) \
|
||||
$(LIBDNS_CFLAGS)
|
||||
|
||||
check_LTLIBRARIES = sample.la
|
||||
noinst_LTLIBRARIES = sample.la
|
||||
|
||||
sample_la_SOURCES = \
|
||||
db.c \
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue