From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 11 Jun 2020 14:41:31 +0000 (-0400)
Subject: we don't need this any more
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=201bf08edc107ecb98c811f8f309206c9ebc826a;p=thirdparty%2Ffreeradius-server.git

we don't need this any more
---

diff --git a/src/tests/modules/test.mk b/src/tests/modules/test.mk
deleted file mode 100644
index 6f179a9867b..00000000000
--- a/src/tests/modules/test.mk
+++ /dev/null
@@ -1,172 +0,0 @@
-#
-#  Add the module tests to the overall dependencies
-#
-
-TEST.MODULES_FILES :=
-
-# If module requires test server, make sure TEST_SERVER of <MODULE>_TEST_SERVER variables are defined
-# If TEST_SERVER is defined, define <MODULE>_TEST_SERVER for all modules that have CHECK_MODULE_TEST_CAN_BE_RUN
-define CHECK_MODULE_TEST_CAN_BE_RUN
-  ifndef ${1}_require_test_server
-    test.modules: ${1}.test
-  else
-    ifdef TEST_SERVER
-      test.modules: ${1}.test
-      export $(shell echo ${1} | tr a-z A-Z)_TEST_SERVER := $(TEST_SERVER)
-    endif
-    ifdef $(shell echo ${1} | tr a-z A-Z)_TEST_SERVER
-      test.modules: ${1}.test
-    endif
-  endif
-endef
-$(foreach x,$(TEST_BUILT) $(TEST_SUBBUILT),$(eval $(call CHECK_MODULE_TEST_CAN_BE_RUN,$x)))
-
-######################################################################
-#
-#  And now more makefile magic to automatically run the tests
-#  for each module.
-#
-
-define DEFAULT_ATTRS
-ifeq "$(wildcard ${1}.attrs)"
-${1}.attrs
-else
-src/tests/modules/default-input.attrs
-endif
-endef
-
-#
-#  Files in the output dir depend on the unit tests
-#
-#	src/tests/$(MODULE_DIR)/FOO.unlang	unlang for the test
-#	src/tests/$(MODULE_DIR)/FOO.attrs	input RADIUS and output filter
-#	build/tests/$(MODULE_DIR)/FOO.out	updated if the test succeeds
-#	build/tests/$(MODULE_DIR)/FOO.log	debug output for the test
-#
-#  If the test fails, then look for ERROR in the input.  No error
-#  means it's unexpected, so we die.
-#
-#  Otherwise, check the log file for a parse error which matches the
-#  ERROR line in the input.
-#
-$(BUILD_DIR)/tests/modules/%: src/tests/modules/%.unlang $(BUILD_DIR)/tests/modules/%.attrs $(TEST_BIN_DIR)/unit_test_module | build.raddb
-	@echo "MODULE-TEST $(lastword $(subst /, ,$(dir $@))) $(basename $(notdir $@))"
-	${Q}mkdir -p $(dir $@)
-	${Q}if ! MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xxx > "$@.log" 2>&1 || ! test -f "$@"; then \
-		if ! grep ERROR $< 2>&1 > /dev/null; then \
-			cat "$@.log"; \
-			echo "# $@.log"; \
-			echo "MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
-			exit 1; \
-		fi; \
-		FOUND=$$(grep ^$< $@.log | head -1 | sed 's/:.*//;s/.*\[//;s/\].*//'); \
-		EXPECTED=$$(grep -n ERROR $< | sed 's/:.*//'); \
-		if [ "$$EXPECTED" != "$$FOUND" ]; then \
-			cat "$@.log"; \
-			echo "# $@.log"; \
-			echo "MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
-			exit 1; \
-		else \
-			touch "$@"; \
-		fi \
-	fi
-
-#
-#  Sometimes we have a default input.  So use that.  Otherwise, use
-#  the input specific to the test.
-#
-MODULE_UNLANG		:= $(wildcard src/tests/modules/*/*.unlang src/tests/modules/*/*/*.unlang)
-MODULE_ATTRS_REQUIRES	:= $(patsubst %.unlang,%.attrs,$(MODULE_UNLANG))
-MODULE_ATTRS_EXISTS	:= $(wildcard src/tests/modules/*/*.attrs src/tests/modules/*/*/*.attrs)
-MODULE_ATTRS_NEEDS	:= $(filter-out $(MODULE_ATTRS_EXISTS),$(MODULE_ATTRS_REQUIRES))
-
-MODULE_CONF_REQUIRES	:= $(patsubst %.unlang,%.conf,$(MODULE_UNLANG))
-MODULE_CONF_EXISTS	:= $(wildcard src/tests/modules/*/*.conf src/tests/modules/*/*/*.attrs)
-MODULE_CONF_NEEDS	:= $(filter-out $(MODULE_CONF_EXISTS),$(MODULE_CONF_REQUIRES))
-
-#
-#  The complete list of tests which are to be run
-#
-MODULE_TEST		:= $(patsubst src/tests/modules/%/all.mk,%,$(wildcard src/tests/modules/*/all.mk))
-
-
-#
-#  Target-specific rules
-#
-define MODULE_COPY_FILE
-$(BUILD_DIR)/${1}: src/${1}
-	@mkdir -p $$(@D)
-	@cp $$< $$@
-
-endef
-
-#
-#  Default rules
-#
-define MODULE_COPY_ATTR
-$(BUILD_DIR)/${1}: src/tests/modules/default-input.attrs
-	@mkdir -p $$(@D)
-	@cp $$< $$@
-endef
-
-#
-#  FIXME: get this working
-#
-define MODULE_COPY_CONF
-$(BUILD_DIR)/${1}: src/tests/modules/${2}/module.conf
-	@mkdir -p $$(@D)
-	@cp $$< $$@
-endef
-
-define MODULE_FILE_TARGET
-$(BUILD_DIR)/${1}: src/${1}.unlang $(BUILD_DIR)/${1}.attrs
-
-endef
-
-define MODULE_TEST_TARGET
-${1}.test: $(patsubst %.unlang,%,$(subst src,$(BUILD_DIR),$(filter src/tests/modules/${1}/%,$(MODULE_UNLANG))))
-
-TEST.MODULES_FILES += $(patsubst %.unlang,%,$(subst src,$(BUILD_DIR),$(filter src/tests/modules/${1}/%,$(MODULE_UNLANG))))
-endef
-
-#
-#  Create the rules from the list of input files
-#
-$(foreach x,$(MODULE_ATTRS_EXISTS),$(eval $(call MODULE_COPY_FILE,$(subst src/,,$x))))
-$(foreach x,$(MODULE_CONF_EXISTS),$(eval $(call MODULE_COPY_FILE,$(subst src/,,$x))))
-
-$(foreach x,$(MODULE_ATTRS_NEEDS),$(eval $(call MODULE_COPY_ATTR,$(subst src/,,$x))))
-# FIXME: copy src/tests/modules/*/module.conf to the right place, too
-
-$(foreach x,$(MODULE_UNLANG),$(eval $(call MODULE_FILE_TARGET,$(patsubst %.unlang,%,$(subst src/,,$x)))))
-$(foreach x,$(MODULE_TEST),$(eval $(call MODULE_TEST_TARGET,$x)))
-
-$(TEST.MODULES_FILES): $(TEST.AUTH_FILES)
-
-#
-#  For each file, look for precursor test.
-#  Ensure that each test depends on its precursors.
-#
--include $(BUILD_DIR)/tests/modules/depends.mk
-
-$(BUILD_DIR)/tests/modules/depends.mk: $(MODULE_UNLANG) | $(BUILD_DIR)/tests/modules
-	${Q}rm -f $@
-	${Q}for x in $^; do \
-		y=`grep PRE $$x | awk '{ print $$3 }'`; \
-		if [ "$$y" != "" ]; then \
-			z=`echo $$x | sed 's,src/,$(BUILD_DIR)/', | sed 's/.unlang//'`; \
-			d=$$(basename $$(dirname $$x)); \
-			echo "$$z: $(BUILD_DIR)/tests/modules/$$d/$$y" >> $@; \
-			echo "" >> $@; \
-		fi \
-	done
-
-.PHONY: clean.test.modules
-clean.test.modules:
-	${Q}rm -rf $(BUILD_DIR)/tests/modules/
-	${Q}rm -rf $(BUILD_DIR)/tests/test.modules
-
-clean.test: clean.test.modules
-
-test.modules:
-	${Q}touch $(BUILD_DIR)/tests/$@