Re-name eap tests

Some test configs are <method>.conf others are <method>-<inner
method>.conf

We need to distinguish between them correctly for determining the
dependency (e.g. there is an rlm_eap_aka_prime.la, but not an rlm
_eap_ttls_pap.la)

diff --git a/src/tests/eapol_test/aka-prime.conf b/src/tests/eapol_test/aka_prime.conf
similarity index 100%
rename from src/tests/eapol_test/aka-prime.conf
rename to src/tests/eapol_test/aka_prime.conf

diff --git a/src/tests/eapol_test/all.mk b/src/tests/eapol_test/all.mk
index 75dc0b9927df49c921ba75a1e15d1225193a87f9..8e0b25a032a2bc932f683a50a5acb179042ddbb2 100644 (file)
--- a/src/tests/eapol_test/all.mk
+++ b/src/tests/eapol_test/all.mk
@@ -67,7 +67,7 @@ ifeq "$(PACKAGE_TEST)" ""
 #
 #  Ensure that we run
 #
-$(OUTPUT)/${1}.ok:  $(patsubst %,rlm_eap_%.la,$(subst -,_,${1}))
+$(OUTPUT)/${1}.ok:  $(patsubst %,rlm_eap_%.la,$(word 1,$(subst -, ,${1})))
 endif
 
 endef
@@ -116,7 +116,7 @@ test.eap.check: $(IGNORED_EAP_TYPES) | $(OUTPUT) $(GENERATED_CERT_FILES)
 #
 $(OUTPUT)/%.ok: $(DIR)/%.conf $(if $(POST_INSTALL_MAKEFILE_ARG),,$(BUILD_DIR)/lib/libfreeradius-server.la $(BUILD_DIR)/lib/libfreeradius-util.la) | $(GENERATED_CERT_FILES)
        $(eval EAPOL_TEST_LOG := $(patsubst %.ok,%.log,$@))
-       $(eval METHOD := $(notdir $(patsubst %.conf,%,$<)))
+       $(eval METHOD := $(notdir $(subst _,-,$(patsubst %.conf,%,$<))))
        $(eval KEY := $(shell grep key_mgmt=NONE $< | sed 's/key_mgmt=NONE/-n/'))
        $(eval RADIUS_LOG := $(dir $@)/test.$(METHOD)/radiusd.log)
        $(eval TEST_PORT := $($(METHOD)_port))