From: Alan T. DeKok Date: Sat, 27 Jun 2015 00:38:40 +0000 (-0400) Subject: Make the module tests depend on the auth tests X-Git-Tag: release_3_0_9~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5444d2f81b3296c272d3b7592691b298ebd7fa2;p=thirdparty%2Ffreeradius-server.git Make the module tests depend on the auth tests so they're run after everything else is run --- diff --git a/src/tests/modules/test.mk b/src/tests/modules/test.mk index 41e4d11be8b..cd9fe2dcbd9 100644 --- a/src/tests/modules/test.mk +++ b/src/tests/modules/test.mk @@ -1,7 +1,8 @@ -# +># # Add the module tests to the overall dependencies # -tests.modules: tests.unit tests.keywords tests.auth + +TESTS.MODULES_FILES := # If module requires test server, make sure TEST_SERVER of _TEST_SERVER variables are defined # If TEST_SERVER is defined, define _TEST_SERVER for all modules that have CHECK_MODULE_TEST_CAN_BE_RUN @@ -124,6 +125,7 @@ endef define MODULE_TEST_TARGET ${1}.test: $(patsubst %.unlang,%,$(subst src,$(BUILD_DIR),$(filter src/tests/modules/${1}/%,$(MODULE_UNLANG)))) +TESTS.MODULES_FILES += $(patsubst %.unlang,%,$(subst src,$(BUILD_DIR),$(filter src/tests/modules/${1}/%,$(MODULE_UNLANG)))) endef # @@ -138,6 +140,8 @@ $(foreach x,$(MODULE_ATTRS_NEEDS),$(eval $(call MODULE_COPY_ATTR,$(subst src/,,$ $(foreach x,$(MODULE_UNLANG),$(eval $(call MODULE_FILE_TARGET,$(patsubst %.unlang,%,$(subst src/,,$x))))) $(foreach x,$(MODULE_TESTS),$(eval $(call MODULE_TEST_TARGET,$x))) +$(TESTS.MODULES_FILES): $(TESTS.AUTH_FILES) + .PHONY: clean.modules.test clean.modules.test: @rm -rf $(BUILD_DIR)/tests/modules/