more simplifications

Makefile

@@ -79,7 +79,8 @@ $(BUILD_DIR)/tests/radiusd-c: raddb/test.conf ${BUILD_DIR}/bin/radiusd $(GENERAT
 test: ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient tests.bin tests.trie tests.unit tests.xlat tests.keywords tests.auth tests.modules $(BUILD_DIR)/tests/radiusd-c tests.eap | build.raddb
 	@$(MAKE) -C src/tests tests
 
-clean.test: clean.tests.keywords clean.tests.trie clean.tests.map clean.tests.xlat clean.tests.dict clean.tests.eap clean.tests.auth clean.tests.modules clean.tests.bin
+.PHONY: clean.test
+clean.test: clean.tests.modules
 	@$(MAKE) -C src/tests clean
 
 #  Tests specifically for Travis. We do a LOT more than just

src/tests/auth/all.mk

@@ -112,8 +112,8 @@ TESTS.AUTH_FILES := $(addprefix $(BUILD_DIR)/tests/auth/,$(AUTH_FILES))
 #
 tests.auth: $(TESTS.AUTH_FILES)
 
-$(TESTS.AUTH_FILES): $(TESTS.KEYWORDS_FILES)
-
 .PHONY: clean.tests.auth
 clean.tests.auth:
 	${Q}rm -rf $(BUILD_DIR)/tests/auth/
+
+clean.test: clean.tests.auth

src/tests/bin/all.mk

@@ -51,3 +51,4 @@ tests.bin: $(TESTS.BIN_FILES)
 clean.tests.bin:
 	${Q}rm -rf $(BUILD_DIR)/tests/bin/
 
+clean.test: clean.tests.bin

src/tests/dict/all.mk

@@ -50,6 +50,8 @@ $(TEST): $(BUILD_DIR)/tests/$(TEST)
 clean.$(TEST):
 	${Q}rm -rf $(BUILD_DIR)/src/tests/dict $(BUILD_DIR)/tests/tests.dict
 
+clean.test: clean.$(TEST)
+
 #  And the actual script to run each test.
 #
 #  The parser expects to read "foo/dictionary", so we make a

src/tests/eapol_test/all.mk

@@ -47,9 +47,6 @@ $(CONFIG_PATH)/methods-enabled:
 $(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/
 
-.PHONY: eap clean clean.tests.eap
-clean: clean.tests.eap
-
 #
 #   Only run EAP tests if we have a "test" target
 #
@@ -80,11 +77,14 @@ radiusd.kill: | $(OUTPUT_DIR)
 		exit $$ret; \
 	fi
 
+.PHONY: clean.tests.eap
 clean.tests.eap:
 	${Q}rm -f $(OUTPUT_DIR)/*.ok $(OUTPUT_DIR)/*.log $(OUTPUT_DIR)/eapol_test.skip
 	${Q}rm -f "$(CONFIG_PATH)/test.conf"
 	${Q}rm -rf "$(CONFIG_PATH)/methods-enabled"
 
+clean.test: clean.tests.eap
+
 ifneq "$(EAPOL_TEST)" ""
 $(CONFIG_PATH)/dictionary:
 	${Q}echo "# test dictionary not install.  Delete at any time." > $@

src/tests/map/all.mk

@@ -53,3 +53,4 @@ tests.map: $(MAP_OUTPUT)
 clean.tests.map:
 	${Q}rm -rf $(BUILD_DIR)/tests/map/
 
+clean.test: clean.tests.map

src/tests/trie/test.mk

@@ -34,3 +34,5 @@ $(TESTS.TRIE_FILES): $(TESTS.UNIT_FILES)
 .PHONY: clean.tests.trie
 clean.tests.trie:
 	${Q}rm -rf $(BUILD_DIR)/tests/trie/
+
+clean.test: clean.tests.trie

src/tests/unit/all.mk

@@ -82,6 +82,8 @@ $(TEST): $(BUILD_DIR)/tests/$(TEST)
 clean.$(TEST):
 	${Q}rm -rf $(BUILD_DIR)/src/tests/unit $(BUILD_DIR)/tests/tests.unit
 
+clean.test: clean.$(TEST)
+
 #
 #  And the actual script to run each test.
 #

src/tests/xlat/all.mk

@@ -57,6 +57,8 @@ $(TEST): $(BUILD_DIR)/tests/$(TEST)
 clean.$(TEST):
 	${Q}rm -rf $(BUILD_DIR)/src/tests/xlat $(BUILD_DIR)/tests/tests.xlat
 
+clean.test: clean.$(TEST)
+
 #
 #  And the actual script to run each test.
 #