Package tests already have the modules built

diff --git a/scripts/ci/package-test.mk b/scripts/ci/package-test.mk
index 9a3261f4aa9958736993273adc05b05e5bb68b75..354a8387f6bbfba64adb51c326c1ddb81a46b805 100644 (file)
--- 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 121011db7f765dcd84fc72996946b221641f18ca..f9e6770c56af35e61b16f8cb985c6c2fcd394542 100644 (file)
--- 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)))