Add missing integration of squid.conf test with Unit-Test PASS/FAIL results

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index a917a61564317b04ec8afbe09aa8ebd747639632..2760a8cbf62e90469ee8b83ce4a03f4850f72c92 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -113,8 +113,19 @@ VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc $(DEBUG_SOURCE)
 ##$(TARGLIB): $(LIBOBJS)
 ##     $(AR_R) $(TARGLIB) $(LIBOBJS)
 
-squid-conf-tests:
-       ../src/squid -k parse -f ../src/squid.conf.default || exit 1
-       for t in `ls -1 $(srcdir)/squidconf/*`; do
-               ../src/squid -k parse -f $t || exit 1
-       done
+squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*
+       @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \
+       for cfg in $$cfglist ; do \
+               $(top_builddir)/src/squid -k parse -f $$cfg || \
+                       { echo "FAIL: squid.conf test: $$cfg" | \
+                               sed s%$(top_builddir)/src/%% | \
+                               sed s%$(srcdir)/squidconf/%% ; \
+                               failed=1; break; \
+                       }; \
+               if test "$$failed" -eq 0; then \
+                       echo "PASS: squid.conf test: $$cfg" | \
+                               sed s%$(top_builddir)/src/%% | \
+                               sed s%$(srcdir)/squidconf/%% ; \
+               else break; fi; \
+       done; \
+       if test "$$failed" -eq 0; then cp $(TRUE) $@ ; fi