From: Alan T. DeKok Date: Tue, 5 Sep 2023 22:09:50 +0000 (-0400) Subject: also use local libraries for unit tests X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36edbed5ab21e4e89cfb05222495998769cd90be;p=thirdparty%2Ffreeradius-server.git also use local libraries for unit tests --- diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk index f42f0020881..e98c12985c4 100644 --- a/src/tests/keywords/all.mk +++ b/src/tests/keywords/all.mk @@ -84,11 +84,11 @@ else $(OUTPUT)/${1}: NEW_COND=-S forbid_update=yes -S tmpl_tokenize_all_nested=yes -S pair_legacy_nested=true ifeq "${1}" "mschap" -$(OUTPUT)/${1}: $(BUILD_DIR)/lib/rlm_mschap.la +$(OUTPUT)/${1}: $(BUILD_DIR)/lib/local/rlm_mschap.la $(BUILD_DIR)/lib/rlm_mschap.la endif ifeq "${1}" "xlat-dhcpv4" -$(OUTPUT)/${1}: $(BUILD_DIR)/lib/libfreeradius-dhcpv4.la +$(OUTPUT)/${1}: $(BUILD_DIR)/lib/local/libfreeradius-dhcpv4.la $(BUILD_DIR)/lib/libfreeradius-dhcpv4.la endif endif diff --git a/src/tests/unit/all.mk b/src/tests/unit/all.mk index 1f73022b25a..2a6ca82d115 100644 --- a/src/tests/unit/all.mk +++ b/src/tests/unit/all.mk @@ -44,9 +44,9 @@ $(FILES.$(TEST)): export TZ = GMT # PROTOCOLS := $(subst $(DIR)/protocols/,,$(wildcard $(DIR)/protocols/*)) define UNIT_TEST_PROTOCOLS -$(addprefix $(OUTPUT)/,$(filter protocols/${1}/%.txt,$(FILES))): $(wildcard $(top_srcdir)/share/dictionary/${1}/dictionary*) $(BUILD_DIR)/lib/libfreeradius-${1}.la +$(addprefix $(OUTPUT)/,$(filter protocols/${1}/%.txt,$(FILES))): $(wildcard $(top_srcdir)/share/dictionary/${1}/dictionary*) $(BUILD_DIR)/lib/local/libfreeradius-${1}.la $(BUILD_DIR)/lib/libfreeradius-${1}.la -test.unit.${1}: $(addprefix $(OUTPUT)/,$(filter protocols/${1}/%.txt,$(FILES))) $(BUILD_DIR)/lib/libfreeradius-${1}.la +test.unit.${1}: $(addprefix $(OUTPUT)/,$(filter protocols/${1}/%.txt,$(FILES))) $(BUILD_DIR)/lib/libfreeradius-${1}.la $(BUILD_DIR)/lib/local/libfreeradius-${1}.la .PHONY: clean.test.unit.${1} clean.test.unit.${1}: