Match the RADIUS instance with the whole test name

diff --git a/src/tests/eapol_test/all.mk b/src/tests/eapol_test/all.mk
index 8e0b25a032a2bc932f683a50a5acb179042ddbb2..b1182ada183a6e421a79e695816319b32e686ea6 100644 (file)
--- a/src/tests/eapol_test/all.mk
+++ b/src/tests/eapol_test/all.mk
@@ -54,6 +54,7 @@ EAP_TYPES_LIST   := $(patsubst rlm_eap_%.la,%,$(EAP_TARGETS))
 EAP_TYPES        := $(filter-out $(IGNORED_EAP_TYPES),$(EAP_TYPES_LIST))
 EAPOL_TEST_FILES := $(foreach x,$(EAP_TYPES),$(wildcard $(DIR)/$(x)*.conf))
 EAPOL_OK_FILES  := $(patsubst $(DIR)/%.conf,$(OUTPUT)/%.ok,$(EAPOL_TEST_FILES))
+EAP_TESTS        := $(sort $(patsubst $(DIR)/%.conf,%,$(EAPOL_TEST_FILES)))
 
 #
 #  Add rules so that we can run individual tests for each EAP method.
@@ -93,7 +94,7 @@ endef
 #
 #  Setup rules to spawn a different RADIUSD instance for each EAP type
 #
-$(foreach TEST,$(addprefix test., $(subst _,-,$(EAP_TYPES))),$(eval $(call RADIUSD_SERVICE,servers,$(OUTPUT)/$(TEST)))$(eval $(call ADD_TEST_EAP_OUTPUT,$(TEST))))
+$(foreach TEST,$(addprefix test., $(subst _,-,$(EAP_TESTS))),$(eval $(call RADIUSD_SERVICE,servers,$(OUTPUT)/$(TEST)))$(eval $(call ADD_TEST_EAP_OUTPUT,$(TEST))))
 
 #  Reset
 TEST := test.eap