make-rules: support for TEST_CONFLICTING_PACKAGES

Marcel Telka

2023-05-13 f3591a9003e7672ab0cbe8a45bec9ac67af6f85b

make-rules: support for TEST_CONFLICTING_PACKAGES

 make-rules/environment.mk

@@ -63,6 +63,11 @@
    $(call separator-line,Required Additional Packages Needed for Testing Only)
    @[ -z "$(strip $(USERLAND_TEST_REQUIRED_PACKAGES))$(strip $(TEST_REQUIRED_PACKAGES))" ] || \
        /usr/bin/pkg list -vH $(USERLAND_TEST_REQUIRED_PACKAGES:%=/%) $(TEST_REQUIRED_PACKAGES:%=/%)
    @C=0 ; \
        for p in $(TEST_CONFLICTING_PACKAGES) ; do \
            /usr/bin/pkg list -q /$$p && echo "Conflicting package $$p found" && C=1 ; \
        done ; \
        exit $$C
    $(call separator-line)

component-test-environment-prep::

 make-rules/shared-macros.mk

@@ -1349,6 +1349,9 @@
REQUIRED_PACKAGES += $(foreach ver,$(PERL_VERSIONS),$(PERL_REQUIRED_PACKAGES:%=%-$(shell echo $(ver) | tr -d .)))
TEST_REQUIRED_PACKAGES += $(foreach ver,$(PERL_VERSIONS),$(TEST_REQUIRED_PACKAGES.perl:%=%-$(shell echo $(ver) | tr -d .)))

# Generate conflicting packages for all built python version variants for given package
TEST_CONFLICTING_PACKAGES += $(foreach ver,$(PYTHON_VERSIONS),$(TEST_CONFLICTING_PACKAGES.python:%=%-$(shell echo $(ver) | tr -d .)))

include $(WS_MAKE_RULES)/environment.mk
include $(WS_MAKE_RULES)/depend.mk
include $(WS_MAKE_RULES)/component.mk