From: Nick Porter Date: Tue, 23 May 2023 08:28:39 +0000 (+0100) Subject: Package tests already have the modules built X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa9cb2b05f4f1fbadef511ba602a8904fde7752;p=thirdparty%2Ffreeradius-server.git Package tests already have the modules built --- diff --git a/scripts/ci/package-test.mk b/scripts/ci/package-test.mk index 9a3261f4aa9..354a8387f6b 100644 --- a/scripts/ci/package-test.mk +++ b/scripts/ci/package-test.mk @@ -26,6 +26,7 @@ top_srcdir:=. BUILD_DIR:=build DIR:=src/tests/eapol_test OUTPUT:=$(BUILD_DIR)/tests/eapol_test +PACKAGE_TEST:=true ALL_TGTS:=$(addprefix rlm_eap_,$(notdir $(subst -,_,$(patsubst %.conf,%.la,$(wildcard $(DIR)/*.conf))))) diff --git a/src/tests/eapol_test/all.mk b/src/tests/eapol_test/all.mk index 121011db7f7..f9e6770c56a 100644 --- a/src/tests/eapol_test/all.mk +++ b/src/tests/eapol_test/all.mk @@ -63,10 +63,12 @@ test.eap.${1}: $(OUTPUT)/${1}.ok test.eap.help: TEST_EAP_HELP += test.eap.${1} +ifeq "$(PACKAGE_TEST)" "" # # Ensure that we run # $(OUTPUT)/${1}.ok: $(patsubst %,rlm_eap_%.la,$(subst -,_,${1})) +endif endef $(foreach x,$(patsubst $(DIR)/%.conf,%,$(EAPOL_TEST_FILES)),$(eval $(call ADD_TEST_EAP,$x)))