From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 21 Sep 2023 09:33:02 +0000 (+0100)
Subject: Re-enable ldap_sync tests and improve error reporting
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2375a014f4d49d77a841cfbc228bbcf362bb81fa;p=thirdparty%2Ffreeradius-server.git

Re-enable ldap_sync tests and improve error reporting
---

diff --git a/src/tests/all.mk b/src/tests/all.mk
index 236ab1ec870..5f1dd13fd47 100644
--- a/src/tests/all.mk
+++ b/src/tests/all.mk
@@ -63,6 +63,7 @@ test: \
 		test.eap	\
 		test.tacacs	\
 		test.vmps	\
+		test.ldap_sync	\
 		| build.raddb
 
 clean: clean.test
diff --git a/src/tests/ldap_sync/active_directory/all.mk b/src/tests/ldap_sync/active_directory/all.mk
index 49b541c414a..55145732c01 100644
--- a/src/tests/ldap_sync/active_directory/all.mk
+++ b/src/tests/ldap_sync/active_directory/all.mk
@@ -56,12 +56,20 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 		i=$$((i+1));				\
 	done ;
 	${Q}sleep .5
+	${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";	\
+		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/active_directory;	\
+		exit 1;								\
+	fi
 	${Q}mv $(OUT_DIR)/$(OUT).out $(FOUND)
 
 	${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 $@";					\
 		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/active_directory;	\
-		$(MAKE) --no-print-directory test.ldap_sync/active_directory.radiusd_kill; \
 		exit 1;								\
 	fi
 	${Q}touch $@
diff --git a/src/tests/ldap_sync/persistent_search/all.mk b/src/tests/ldap_sync/persistent_search/all.mk
index 69410666b2b..60c62f5a1b8 100644
--- a/src/tests/ldap_sync/persistent_search/all.mk
+++ b/src/tests/ldap_sync/persistent_search/all.mk
@@ -52,12 +52,20 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 		i=$$((i+1));				\
 	done ;
 	${Q}sleep .1
+	${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";	\
+		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/persistent_search;	\
+		exit 1;								\
+	fi
 	${Q}mv $(OUT_DIR)/$(OUT).out $(FOUND)
 
 	${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 $@";					\
 		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/persistent_search;	\
-		$(MAKE) --no-print-directory test.ldap_sync/persistent_search.radiusd_kill; \
 		exit 1;								\
 	fi
 	${Q}touch $@
diff --git a/src/tests/ldap_sync/rfc4533/all.mk b/src/tests/ldap_sync/rfc4533/all.mk
index 238e58f0d5f..eaade22f101 100644
--- a/src/tests/ldap_sync/rfc4533/all.mk
+++ b/src/tests/ldap_sync/rfc4533/all.mk
@@ -52,11 +52,19 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 		i=$$((i+1));				\
 	done ;
 	${Q}sleep .1
+	${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";	\
+		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/rfc4533;		\
+		exit 1;								\
+	fi
 	${Q}mv $(OUT_DIR)/$(OUT).out $(FOUND)
 	${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 $@";					\
 		rm -rf $(BUILD_DIR)/tests/test.ldap_sync/rfc4533;		\
-		$(MAKE) --no-print-directory test.ldap_sync/rfc4533.radiusd_kill; \
 		exit 1;								\
 	fi
 	${Q}touch $@