Better failure messages

diff --git a/src/tests/ldap_sync/active_directory/all.mk b/src/tests/ldap_sync/active_directory/all.mk
index 55145732c0101faff90eb16d340f650bb705ed08..567c60246ddc48acf31491365226b9c4ea2d4771 100644 (file)
--- 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 60c62f5a1b87e78228d830154ba75a395ccb0a3f..1c5dee42cb4244a323f01b765b3cfe86e4833572 100644 (file)
--- 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 eaade22f10157caaeb5c1df58ab34cf39db8ebcb..8f5b5fb06abffacd144f7a9e34c500e240c9d1cb 100644 (file)
--- 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