move method tests to their own directory structure

to avoid stupid linking / enabling issues, and methods
interfering with each other.

diff --git a/src/tests/eapol_test/all.mk b/src/tests/eapol_test/all.mk
index fb06b702fcbc9d2254e00f9465674b92a7af3b28..2754c7e78fbfcf4a7ef10d943903a004c9930d9e 100644 (file)
--- a/src/tests/eapol_test/all.mk
+++ b/src/tests/eapol_test/all.mk
@@ -37,7 +37,6 @@ 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))
-EAPOL_METH_FILES := $(addprefix $(CONFIG_PATH)/methods-enabled/,$(EAP_TYPES))
 
 #
 #  Generic rules to start / stop the radius service.
@@ -45,47 +44,6 @@ EAPOL_METH_FILES := $(addprefix $(CONFIG_PATH)/methods-enabled/,$(EAP_TYPES))
 include src/tests/radiusd.mk
 $(eval $(call RADIUSD_SERVICE,servers,$(OUTPUT)))
 
-#
-#  Rules to add EAP methods enabled, and mods-enabled / sites-enabled things
-#  for various EAP methods
-#
-$(CONFIG_PATH)/methods-enabled:
-       ${Q}mkdir -p $@
-
-$(CONFIG_PATH)/methods-enabled/%: $(BUILD_DIR)/lib/rlm_eap_%.la | $(CONFIG_PATH)/methods-enabled
-       ${Q}ln -sf $(CONFIG_PATH)/methods-available/$(notdir $@) $(CONFIG_PATH)/methods-enabled/
-
-$(CONFIG_PATH)/mods-enabled/%: $(BUILD_DIR)/lib/rlm_eap_%.la
-       ${Q}ln -sf $(CONFIG_PATH)/mods-available/$(notdir $@) $(CONFIG_PATH)/mods-enabled/
-
-$(CONFIG_PATH)/sites-enabled/%: $(BUILD_DIR)/lib/rlm_eap_%.la
-       ${Q}ln -sf $(CONFIG_PATH)/sites-available/$(notdir $@) $(CONFIG_PATH)/sites-enabled/
-
-
-#
-#  Make sure that we clean things when asked to
-#
-.PHONY: clean.${TEST}.enabled
-clean.${TEST}.enabled:
-       ${Q}rm -rf $(CONFIG_PATH)/methods-enabled
-       ${Q}rm -f $(CONFIG_PATH)/mods-enabled/* $(CONFIG_PATH)/sites-enabled/*
-
-clean.${TEST}: clean.${TEST}.enabled
-
-#
-#  We want the tests to depend on the method configuration used by the
-#  server, too.
-#
-#  This monstrosity does that.  Note that:
-#
-#  eapol_test configuration files are named "method" or "method-foo"
-#
-#  radiusd configuration files are named "method".
-#
-$(foreach x,$(EAPOL_TEST_FILES),$(eval \
-       $(patsubst $(DIR)/%.conf,$(OUTPUT)/%.ok,${x}): ${CONFIG_PATH}/methods-enabled/$(basename $(notdir $(word 1,$(subst -, ,$(x))))) \
-))
-
 #
 #      Print the disabled list.
 #
@@ -95,14 +53,14 @@ $(IGNORED_EAP_TYPES):
 #
 #  Separate the dependencies here just to keep a bit clear.
 #
-test.eap.check: $(IGNORED_EAP_TYPES) | $(EAPOL_METH_FILES) $(OUTPUT) $(GENERATED_CERT_FILES)
+test.eap.check: $(IGNORED_EAP_TYPES) | $(OUTPUT) $(GENERATED_CERT_FILES)
 
 #
 #  Run EAP tests.
 #
-$(OUTPUT)/%.ok: $(DIR)/%.conf $(CONFIG_PATH)/methods-enabled/% $(CONFIG_PATH)/methods-enabled/md5 | $(GENERATED_CERT_FILES)
-       ${Q}$(MAKE) test.eap.radiusd_kill || true
-       ${Q}$(MAKE) test.eap.radiusd_start
+$(OUTPUT)/%.ok: $(DIR)/%.conf | $(GENERATED_CERT_FILES)
+       ${Q}$(MAKE) --no-print-directory test.eap.radiusd_kill || true
+       ${Q}$(MAKE) --no-print-directory METHOD=$(basename $(notdir $@)) test.eap.radiusd_start
        ${Q} [ -f $(dir $@)/radiusd.pid ] || exit 1
        $(eval OUT := $(patsubst %.conf,%.log,$@))
        $(eval KEY := $(shell grep key_mgmt=NONE $< | sed 's/key_mgmt=NONE/-n/'))
@@ -116,14 +74,12 @@ $(OUTPUT)/%.ok: $(DIR)/%.conf $(CONFIG_PATH)/methods-enabled/% $(CONFIG_PATH)/me
                echo "--------------------------------------------------";              \
                echo "$(EAPOL_TEST) -c \"$<\" -p $(PORT) -s $(SECRET)";                 \
                $(MAKE) test.eap.radiusd_kill;                                          \
-               echo "RADIUSD :  $(RADIUSD_RUN) -lstdout -f";                           \
+               echo "RADIUSD :  TEST_PORT=$(PORT) $$(RADIUSD_BIN) -Pxxx -d $(DIR)/config -n servers -D share/dictionary/ -lstdout -f";                         \
                echo "EAPOL   :  $(EAPOL_TEST) -c \"$<\" -p $(PORT) -s $(SECRET) $(KEY) "; \
-               rm -f $(CONFIG_PATH)/methods-enabled/*  $(CONFIG_PATH)/mods-enabled/*  $(CONFIG_PATH)/sites-enabled/* \
-               $(MAKE) test.eap.radiusd_kill                                           \
+               $(MAKE) --no-print-directory test.eap.radiusd_kill                                              \
                exit 1;\
        fi
-       ${Q}rm -f $(CONFIG_PATH)/methods-enabled/*  $(CONFIG_PATH)/mods-enabled/*  $(CONFIG_PATH)/sites-enabled/*
-       ${Q}$(MAKE) test.eap.radiusd_kill || true
+       ${Q}$(MAKE) --no-print-directory test.eap.radiusd_kill || true
        ${Q}touch $@
 
 #

diff --git a/src/tests/eapol_test/config/methods-available/aka b/src/tests/eapol_test/config/aka/methods-enabled/aka
similarity index 100%
rename from src/tests/eapol_test/config/methods-available/aka
rename to src/tests/eapol_test/config/aka/methods-enabled/aka

diff --git a/src/tests/eapol_test/config/mods-available/aka b/src/tests/eapol_test/config/aka/mods-enabled/aka
similarity index 100%
rename from src/tests/eapol_test/config/mods-available/aka
rename to src/tests/eapol_test/config/aka/mods-enabled/aka

diff --git a/src/tests/eapol_test/config/sites-available/aka b/src/tests/eapol_test/config/aka/sites-enabled/aka
similarity index 100%
rename from src/tests/eapol_test/config/sites-available/aka
rename to src/tests/eapol_test/config/aka/sites-enabled/aka

diff --git a/src/tests/eapol_test/config/methods-available/aka_prime b/src/tests/eapol_test/config/aka_prime/methods-enabled/aka_prime
similarity index 100%
rename from src/tests/eapol_test/config/methods-available/aka_prime
rename to src/tests/eapol_test/config/aka_prime/methods-enabled/aka_prime

diff --git a/src/tests/eapol_test/config/mods-available/aka_prime b/src/tests/eapol_test/config/aka_prime/mods-enabled/aka_prime
similarity index 100%
rename from src/tests/eapol_test/config/mods-available/aka_prime
rename to src/tests/eapol_test/config/aka_prime/mods-enabled/aka_prime

diff --git a/src/tests/eapol_test/config/sites-available/aka_prime b/src/tests/eapol_test/config/aka_prime/sites-enabled/aka_prime
similarity index 100%
rename from src/tests/eapol_test/config/sites-available/aka_prime
rename to src/tests/eapol_test/config/aka_prime/sites-enabled/aka_prime

diff --git a/src/tests/eapol_test/config/methods-available/gtc b/src/tests/eapol_test/config/gtc/methods-enabled/gtc
similarity index 100%
rename from src/tests/eapol_test/config/methods-available/gtc
rename to src/tests/eapol_test/config/gtc/methods-enabled/gtc

diff --git a/src/tests/eapol_test/config/methods-available/md5 b/src/tests/eapol_test/config/md5/methods-enabled/md5
similarity index 100%
rename from src/tests/eapol_test/config/methods-available/md5
rename to src/tests/eapol_test/config/md5/methods-enabled/md5

diff --git a/src/tests/eapol_test/config/mods-enabled/.empty b/src/tests/eapol_test/config/mods-enabled/.empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/tests/eapol_test/config/methods-available/mschapv2 b/src/tests/eapol_test/config/mschapv2/methods-enabled/mschapv2
similarity index 100%
rename from src/tests/eapol_test/config/methods-available/mschapv2
rename to src/tests/eapol_test/config/mschapv2/methods-enabled/mschapv2

diff --git a/src/tests/eapol_test/config/methods-available/peap b/src/tests/eapol_test/config/peap/methods-enabled/peap
similarity index 100%
rename from src/tests/eapol_test/config/methods-available/peap
rename to src/tests/eapol_test/config/peap/methods-enabled/peap

diff --git a/src/tests/eapol_test/config/methods-available/pwd b/src/tests/eapol_test/config/pwd/methods-enabled/pwd
similarity index 100%
rename from src/tests/eapol_test/config/methods-available/pwd
rename to src/tests/eapol_test/config/pwd/methods-enabled/pwd

diff --git a/src/tests/eapol_test/config/servers.conf b/src/tests/eapol_test/config/servers.conf
index 96891a7d75c0a2b5c6451d8231b46f6b52150e47..3819b95f255fcdce409c319a7c50e7fbdc3e6b05 100644 (file)
--- a/src/tests/eapol_test/config/servers.conf
+++ b/src/tests/eapol_test/config/servers.conf
@@ -55,13 +55,12 @@ modules {
 
        #
        #  Include the modules which are enabled for this particular
-       #  test.  Note that this directory MUST exist, even if it is
-       #  empty
+       #  test.
        #
-       $INCLUDE ${testdir}/mods-enabled/
+       $-INCLUDE ${testdir}/$ENV{METHOD}/mods-enabled/
 
        eap {
-               default_eap_type = md5
+               default_eap_type = $ENV{METHOD}
                ignore_unknown_eap_types = no
                cisco_accounting_username_bug = no
 
@@ -94,7 +93,11 @@ modules {
                        ocsp {
                        }
                }
-               $INCLUDE ${testdir}/methods-enabled/
+
+               #
+               #  This method MUST exist because we're running it.
+               #
+               $INCLUDE ${testdir}/$ENV{METHOD}/methods-enabled/$ENV{METHOD}
        }
 
 }
@@ -202,7 +205,6 @@ server inner-tunnel {
 }
 
 #
-#  Include the sites which are enabled for this particular test.  Note
-#  that this directory MUST exist, even if it is empty
+#  Some methods don't have a sites-enabld.  Tho arguably they should.
 #
-$INCLUDE ${testdir}/sites-enabled/
+$-INCLUDE ${testdir}/$ENV{METHOD}/sites-enabled/$ENV{METHOD}

diff --git a/src/tests/eapol_test/config/methods-available/sim b/src/tests/eapol_test/config/sim/methods-enabled/sim
similarity index 100%
rename from src/tests/eapol_test/config/methods-available/sim
rename to src/tests/eapol_test/config/sim/methods-enabled/sim

diff --git a/src/tests/eapol_test/config/mods-available/sim b/src/tests/eapol_test/config/sim/mods-enabled/sim
similarity index 100%
rename from src/tests/eapol_test/config/mods-available/sim
rename to src/tests/eapol_test/config/sim/mods-enabled/sim

diff --git a/src/tests/eapol_test/config/sites-available/sim b/src/tests/eapol_test/config/sim/sites-enabled/sim
similarity index 100%
rename from src/tests/eapol_test/config/sites-available/sim
rename to src/tests/eapol_test/config/sim/sites-enabled/sim

diff --git a/src/tests/eapol_test/config/sites-enabled/.empty b/src/tests/eapol_test/config/sites-enabled/.empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/tests/eapol_test/config/sites-available/tls b/src/tests/eapol_test/config/tls/sites-enabled/tls
similarity index 100%
rename from src/tests/eapol_test/config/sites-available/tls
rename to src/tests/eapol_test/config/tls/sites-enabled/tls

diff --git a/src/tests/eapol_test/config/methods-available/ttls b/src/tests/eapol_test/config/ttls/methods-enabled/ttls
similarity index 100%
rename from src/tests/eapol_test/config/methods-available/ttls
rename to src/tests/eapol_test/config/ttls/methods-enabled/ttls