also use local libraries for unit tests

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index f42f00208813261b97547a9222243e92868cb5d8..e98c12985c46da395fc7eefa551c75533cb5ab43 100644 (file)
--- 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 1f73022b25a14e48d74701bae20f5be4893f67c6..2a6ca82d115f2295e8d991c20e68052799a58eb8 100644 (file)
--- 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}: