------------------------------------------------------------
revno: 13015
revision-id: squid3@treenet.co.nz-20130928090123-l2t59il16ke97877
parent: squid3@treenet.co.nz-20130927161440-4he2odzvf59088ba
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Sat 2013-09-28 03:01:23 -0600
message:
  Automated squid.conf parser testing with squid -k parse
  
  This make the build process testing run 'squid -k parse' with a series
  of test configuration files to exercise edge cases and backward
  compatibility.
  
  The default squid.conf which is to be installed on new systems is always
  tested.
  
  Other config files with unit tests can be dropped into
  test-suite/squidconf/ and will be parse tested automatically.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130928090123-l2t59il16ke97877
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 08af8833558a996fc2611574e2cbeca67148ed56
# timestamp: 2013-09-28 09:14:53 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20130927161440-\
#   4he2odzvf59088ba
# 
# Begin patch
=== modified file 'test-suite/Makefile.am'
--- test-suite/Makefile.am	2012-10-29 04:59:58 +0000
+++ test-suite/Makefile.am	2013-09-28 09:01:23 +0000
@@ -34,7 +34,8 @@
 	MemPoolTest\
 	mem_node_test\
 	mem_hdr_test\
-	$(ESI_TESTS)
+	$(ESI_TESTS) \
+	squid-conf-tests
 
 ## Sort by alpha - any build failures are significant.
 check_PROGRAMS += debug \
@@ -111,3 +112,9 @@
 ##
 ##$(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

=== added directory 'test-suite/squidconf'
=== added file 'test-suite/squidconf/empty'