From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 11 Jan 2024 17:48:10 +0000 (+0000)
Subject: Better failure messages
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=084df8397eb132c6a23c5cb19c3ad3e92e5dc2e6;p=thirdparty%2Ffreeradius-server.git

Better failure messages
---

diff --git a/src/tests/ldap_sync/active_directory/all.mk b/src/tests/ldap_sync/active_directory/all.mk
index 55145732c01..567c60246dd 100644
--- a/src/tests/ldap_sync/active_directory/all.mk
+++ b/src/tests/ldap_sync/active_directory/all.mk
@@ -59,7 +59,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 	${Q}if [ ! -e $(OUT_DIR)/$(OUT).out ] ; then	\
 		$(MAKE) --no-print-directory test.ldap_sync/active_directory.radiusd_kill; \
 		cat $(OUT_DIR)/radiusd.log					\
-		echo "LDAP_SYNC FAILED $@ - expected output file not produced";	\
+		echo "LDAP_SYNC FAILED $(TARGET) - expected output file not produced";	\
 		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/active_directory;	\
 		exit 1;								\
 	fi
@@ -68,7 +68,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 	${Q}if [ -e "$(EXPECTED)" ] && ! cmp -s $(FOUND) $(EXPECTED); then	\
 		$(MAKE) --no-print-directory test.ldap_sync/active_directory.radiusd_kill; \
 		cat $(OUT_DIR)/radiusd.log					\
-		echo "LDAP_SYNC FAILED $@";					\
+		echo "LDAP_SYNC FAILED $(TARGET)";				\
 		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/active_directory;	\
 		exit 1;								\
 	fi
diff --git a/src/tests/ldap_sync/persistent_search/all.mk b/src/tests/ldap_sync/persistent_search/all.mk
index 60c62f5a1b8..1c5dee42cb4 100644
--- a/src/tests/ldap_sync/persistent_search/all.mk
+++ b/src/tests/ldap_sync/persistent_search/all.mk
@@ -55,7 +55,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 	${Q}if [ ! -e $(OUT_DIR)/$(OUT).out ] ; then	\
 		$(MAKE) --no-print-directory test.ldap_sync/persistent_search.radiusd_kill; \
 		cat $(OUT_DIR)/radiusd.log					\
-		echo "LDAP_SYNC FAILED $@ - expected output file not produced";	\
+		echo "LDAP_SYNC FAILED $(TARGET) - expected output file not produced";	\
 		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/persistent_search;	\
 		exit 1;								\
 	fi
@@ -64,7 +64,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 	${Q}if [ -e "$(EXPECTED)" ] && ! cmp -s $(FOUND) $(EXPECTED); then	\
 		$(MAKE) --no-print-directory test.ldap_sync/persistent_search.radiusd_kill; \
 		cat $(OUT_DIR)/radiusd.log					\
-		echo "LDAP_SYNC FAILED $@";					\
+		echo "LDAP_SYNC FAILED $(TARGET)";				\
 		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/persistent_search;	\
 		exit 1;								\
 	fi
diff --git a/src/tests/ldap_sync/rfc4533/all.mk b/src/tests/ldap_sync/rfc4533/all.mk
index eaade22f101..8f5b5fb06ab 100644
--- a/src/tests/ldap_sync/rfc4533/all.mk
+++ b/src/tests/ldap_sync/rfc4533/all.mk
@@ -55,7 +55,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 	${Q}if [ ! -e $(OUT_DIR)/$(OUT).out ] ; then	\
 		$(MAKE) --no-print-directory test.ldap_sync/rfc4533.radiusd_kill; \
 		cat $(OUT_DIR)/radiusd.log					\
-		echo "LDAP_SYNC FAILED $@ - expected output file not produced";	\
+		echo "LDAP_SYNC FAILED $(TARGET) - expected output file not produced";	\
 		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/rfc4533;		\
 		exit 1;								\
 	fi
@@ -63,7 +63,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 	${Q}if [ -e "$(EXPECTED)" ] && ! cmp -s $(FOUND) $(EXPECTED); then	\
 		$(MAKE) --no-print-directory test.ldap_sync/rfc4533.radiusd_kill; \
 		cat $(OUT_DIR)/radiusd.log					\
-		echo "LDAP_SYNC FAILED $@";					\
+		echo "LDAP_SYNC FAILED $(TARGET)";				\
 		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/rfc4533;		\
 		exit 1;								\
 	fi