From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 22 Apr 2022 21:06:53 +0000 (-0500)
Subject: MODULE_TEST_UNLANG is a path
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95ce93b148863532f3e2326ddaa6dcaaedd37f44;p=thirdparty%2Ffreeradius-server.git

MODULE_TEST_UNLANG is a path
---

diff --git a/src/tests/modules/all.mk b/src/tests/modules/all.mk
index 39d8d25fc83..944e5b74996 100644
--- a/src/tests/modules/all.mk
+++ b/src/tests/modules/all.mk
@@ -90,11 +90,13 @@ $(foreach x, $(filter sql_%,$(FILES)), $(eval $$(OUTPUT.$(TEST))/$x: $(patsubst
 #  Otherwise, check the log file for a parse error which matches the
 #  ERROR line in the input.
 #
+$(OUTPUT)/%: TEST=$(lastword $(subst /, ,$(dir $@))) $(basename $(notdir $@))
+
 $(OUTPUT)/%: $(DIR)/%.unlang $(TEST_BIN_DIR)/unit_test_module | build.raddb
-	@echo "MODULE-TEST $(lastword $(subst /, ,$(dir $@))) $(basename $(notdir $@))"
+	@echo "MODULE-TEST $(TEST)"
 	${Q}mkdir -p $(dir $@)
 	${Q}cp $(if $(wildcard $(basename $<).attrs),$(basename $<).attrs,src/tests/modules/default-input.attrs) $@.attrs
-	${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 \
+	${Q}if ! MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< TEST="$(TEST)" $(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"; \
diff --git a/src/tests/modules/sql_sqlite/module.conf b/src/tests/modules/sql_sqlite/module.conf
index cd153a3549d..3a5f75c87a6 100644
--- a/src/tests/modules/sql_sqlite/module.conf
+++ b/src/tests/modules/sql_sqlite/module.conf
@@ -3,7 +3,7 @@ sql {
 	dialect = "sqlite"
 	sqlite {
 		# Path to the sqlite database
-		filename = "$ENV{MODULE_TEST_DIR}/sql_sqlite/$ENV{MODULE_TEST_UNLANG}/rlm_sql_sqlite.db"
+		filename = "$ENV{MODULE_TEST_DIR}/sql_sqlite/$ENV{TEST}/rlm_sql_sqlite.db"
 
 		# If the file above does not exist and bootstrap is set
 		# a new database file will be created, and the SQL statements