MODULE_TEST_UNLANG is a path

diff --git a/src/tests/modules/all.mk b/src/tests/modules/all.mk
index 39d8d25fc83a4999088797321b546bc92660bbb9..944e5b74996de0b14a6a47e1bd5853cd535b9826 100644 (file)
--- 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 cd153a3549d8c58e9e9658bb8a9aaf7c75b7b994..3a5f75c87a663aafa1acaef10fe8c14fb2f72f3e 100644 (file)
--- 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