------------------------------------------------------------
revno: 13016
revision-id: squid3@treenet.co.nz-20130928091443-a8ib46q0w0rxrljk
parent: squid3@treenet.co.nz-20130928090123-l2t59il16ke97877
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Sat 2013-09-28 03:14:43 -0600
message:
  Add missing integration of squid.conf test with Unit-Test PASS/FAIL results
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130928091443-a8ib46q0w0rxrljk
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: df1aeadaa165bb821f340e62739077060ef887a3
# timestamp: 2013-09-28 09:14:57 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20130928090123-\
#   l2t59il16ke97877
# 
# Begin patch
=== modified file 'test-suite/Makefile.am'
--- test-suite/Makefile.am	2013-09-28 09:01:23 +0000
+++ test-suite/Makefile.am	2013-09-28 09:14:43 +0000
@@ -113,8 +113,19 @@
 ##$(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