CI: Package tests: Use the system's dictionary (#3805)

diff --git a/scripts/ci/package-test.mk b/scripts/ci/package-test.mk
index 1d0a8716a60028c2c32cec3b42f0a78c077f49e2..9a3261f4aa9958736993273adc05b05e5bb68b75 100644 (file)
--- a/scripts/ci/package-test.mk
+++ b/scripts/ci/package-test.mk
@@ -36,6 +36,7 @@ ALL_TGTS:=$(addprefix rlm_eap_,$(notdir $(subst -,_,$(patsubst %.conf,%.la,$(wil
 RADIUSD_BIN:=$(shell which radiusd || which freeradius)
 PORT:=1812
 SECRET:=testing123
+DICT_PATH:=/usr/share/freeradius/dictionary/
 
 #
 #  We assume a preinstalled version of eapol_test

diff --git a/src/tests/eapol_test/all.mk b/src/tests/eapol_test/all.mk
index c74d5f96104ed6c7b504cfcfa029ac20fd10fcd5..7071c1b00c584250426aa91cf9411d6277b277ce 100644 (file)
--- a/src/tests/eapol_test/all.mk
+++ b/src/tests/eapol_test/all.mk
@@ -36,6 +36,7 @@ CONFIG_PATH := $(TEST_PATH)/config
 RADIUS_LOG := $(OUTPUT)/radiusd.log
 GDB_LOG := $(OUTPUT)/gdb.log
 TEST_BIN := $(BUILD_DIR)/bin/local
+DICT_PATH := $(if $(DICT_PATH),$(DICT_PATH),$(top_srcdir)/share/dictionary)
 
 #
 #   We use the stock raddb modules to help detect typos and other issues

diff --git a/src/tests/radiusd.mk b/src/tests/radiusd.mk
index e7ae4484701806d7966d58a6391f1090e0763d21..240a89819cf0137f43c85b20108e8d1d0b1a9ada 100644 (file)
--- a/src/tests/radiusd.mk
+++ b/src/tests/radiusd.mk
@@ -91,7 +91,7 @@ $(TEST).radiusd_stop: | ${2}
 #      Start radiusd instance
 #
 ${2}/radiusd.pid: ${2}
-       $$(eval RADIUSD_RUN := TESTDIR=$(DIR) OUTPUT=$(OUTPUT) TEST_PORT=$(PORT) $$(RADIUSD_BIN) -Pxxx -d $(DIR)/config -n ${1} -D share/dictionary/ -l ${2}/radiusd.log)
+       $$(eval RADIUSD_RUN := TESTDIR=$(DIR) OUTPUT=$(OUTPUT) TEST_PORT=$(PORT) $$(RADIUSD_BIN) -Pxxx -d $(DIR)/config -n ${1} -D $(DICT_PATH) -l ${2}/radiusd.log)
        ${Q}rm -f ${2}/radiusd.log
        ${Q}if ! $$(RADIUSD_RUN); then \
                echo "FAILED STARTING RADIUSD"; \