Re-enable ldap_sync tests and improve error reporting

diff --git a/src/tests/all.mk b/src/tests/all.mk
index 236ab1ec870dc7ecb6198ddf2b5ec076f988ba62..5f1dd13fd47da5b8afcd561bb03971120046a237 100644 (file)
--- 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 49b541c414ab54dfe57624f022c7ce972b4ae79b..55145732c0101faff90eb16d340f650bb705ed08 100644 (file)
--- 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 69410666b2badfa8ec45d44c5d83b015e548bfd3..60c62f5a1b87e78228d830154ba75a395ccb0a3f 100644 (file)
--- 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 238e58f0d5ff095c4a40fa077eea77e30be2d87a..eaade22f10157caaeb5c1df58ab34cf39db8ebcb 100644 (file)
--- 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 $@