From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 9 Oct 2019 19:19:58 +0000 (-0400)
Subject: replace build with ${BUILD_DIR}.  Fixes #3031
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cb5ea8dec707e96142ddec2bf1a00e90a3c1195;p=thirdparty%2Ffreeradius-server.git

replace build with ${BUILD_DIR}.  Fixes #3031
---

diff --git a/src/tests/all.mk b/src/tests/all.mk
index 97ce8cbaf3d..ccbd235e2ed 100644
--- a/src/tests/all.mk
+++ b/src/tests/all.mk
@@ -22,11 +22,11 @@ raddb/test.conf:
 # Don't molest STDERR as this may be used to receive output from a debugger.
 $(BUILD_DIR)/tests/radiusd-c: raddb/test.conf ${BUILD_DIR}/bin/radiusd $(GENERATED_CERT_FILES) | build.raddb
 	@printf "radiusd -C... "
-	@if ! FR_LIBRARY_PATH=./build/lib/local/.libs/ ./build/make/jlibtool --mode=execute ./build/bin/local/radiusd -XCMd ./raddb -n debug -D ./share/dictionary -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \
+	@if ! FR_LIBRARY_PATH=${BUILD_DIR}/lib/local/.libs/ ${BUILD_DIR}/make/jlibtool --mode=execute ${BUILD_DIR}/bin/local/radiusd -XCMd ./raddb -n debug -D ./share/dictionary -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \
 		rm -f raddb/test.conf; \
 		cat $(BUILD_DIR)/tests/radiusd.config.log; \
 		echo "fail"; \
-		echo "FR_LIBRARY_PATH=./build/lib/local/.libs/ ./build/make/jlibtool --mode=execute ./build/bin/local/radiusd -XCMd ./raddb -n debug -D ./share/dictionary"; \
+		echo "FR_LIBRARY_PATH=${BUILD_DIR}/lib/local/.libs/ ${BUILD_DIR}/make/jlibtool --mode=execute ${BUILD_DIR}/bin/local/radiusd -XCMd ./raddb -n debug -D ./share/dictionary"; \
 		exit 1; \
 	fi
 	@rm -f raddb/test.conf
@@ -58,7 +58,7 @@ clean: clean.test
 #  Tests specifically for Travis. We do a LOT more than just
 #  the above tests
 travis-test: raddb/test.conf test
-	@FR_LIBRARY_PATH=./build/lib/local/.libs/ ./build/make/jlibtool --mode=execute ./build/bin/local/radiusd -xxxv -n test
+	@FR_LIBRARY_PATH=${BUILD_DIR}/lib/local/.libs/ ${BUILD_DIR}/make/jlibtool --mode=execute ${BUILD_DIR}/bin/local/radiusd -xxxv -n test
 	@rm -f raddb/test.conf
 	@$(MAKE) install
 	@perl -p -i -e 's/allow_vulnerable_openssl = no/allow_vulnerable_openssl = yes/' ${raddbdir}/radiusd.conf