From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 22 Dec 2014 20:16:59 +0000 (-0500)
Subject: Clarify which tests we're running
X-Git-Tag: release_3_0_7~417
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9acfb72fccc8bc8d520fc97ace91468ec8734283;p=thirdparty%2Ffreeradius-server.git

Clarify which tests we're running
---

diff --git a/src/tests/modules/subdir.mk b/src/tests/modules/subdir.mk
index a943f00e4a5..e395d057f81 100644
--- a/src/tests/modules/subdir.mk
+++ b/src/tests/modules/subdir.mk
@@ -85,7 +85,7 @@ $(TEST_DIR)/%.attrs: src/tests/$(MODULE_DIR)/%.attrs | $(TEST_DIR)
 #  ERROR line in the input.
 #
 $(TEST_DIR)/%: src/tests/$(MODULE_DIR)/%.unlang $(TEST_DIR)/%.attrs $(TESTBINDIR)/unittest | $(TEST_DIR) build.raddb
-	@echo UNIT-TEST $(notdir $@)
+	@echo MODULE-TEST $(MODULE_TEST) $(notdir $@)
 	@if ! MODULE_TEST_DIR=src/tests/$(MODULE_DIR) MODULE_TEST_UNLANG=src/tests/$(MODULE_DIR)/$(notdir $@).unlang $(TESTBIN)/unittest -D share -d src/tests/modules/ -i $@.attrs -f $@.attrs -xx > $@.log 2>&1; then \
 		if ! grep ERROR $< 2>&1 > /dev/null; then \
 			cat $@.log; \
@@ -110,6 +110,16 @@ $(TEST_DIR)/%: src/tests/$(MODULE_DIR)/%.unlang $(TEST_DIR)/%.attrs $(TESTBINDIR
 #
 $(MODULE_TEST).test: $(addprefix $(TEST_DIR)/,$(patsubst %.unlang,%,$(MODULE_FILES)))
 
+#
+#  Clean rules
+#
 .PHONY: clean.$(MODULE_TEST).test
 clean.$(MODULE_TEST).test:
 	@rm -rf $(TEST_DIR)/
+
+#
+#  We COULD make all of the module tests depend on 'tests.unit tests.keywords tests.auth'
+#  But that is annoying when we just want to run tests for one module.
+#  Instead, we have the "all.mk" file in this directory depend omn the "tests.*" targets,
+#  which is good enough for most purposes.
+#