Undo trunk r13270: "Refactor Vector and Stack to STL counterparts"

[thirdparty/squid.git] / test-suite / Makefile.am

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index e47b659e2c2e2d5ac5dadbca3b0daaacd5f1c51d..010a8bb4fb56fcaebbaec965adfa93a89564af6c 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -14,7 +14,9 @@ LDADD = \
 
 EXTRA_PROGRAMS = mem_node_test membanger splay tcp-banger2
 
-EXTRA_DIST = testheaders.sh
+EXTRA_DIST = \
+       $(srcdir)/squidconf/* \
+       testheaders.sh
 
 ESI_ALL_TESTS = \
        ESIExpressions
@@ -30,12 +32,12 @@ TESTS += debug \
        syntheticoperators \
        VirtualDeleteOperator \
        StackTest \
-       refcount\
        splay\
        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 \
@@ -43,7 +45,6 @@ check_PROGRAMS += debug \
                MemPoolTest\
                mem_node_test\
                mem_hdr_test \
-               refcount\
                splay \
                StackTest \
                syntheticoperators \
@@ -53,7 +54,7 @@ check_PROGRAMS += debug \
 tcp_banger2_LDADD = $(top_builddir)/lib/libmiscutil.la
 
 
-DEBUG_SOURCE = test_tools.cc stub_debug.cc stub_tools.cc
+DEBUG_SOURCE = test_tools.cc stub_debug.cc stub_tools.cc stub_fatal.cc
 
 stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
        cp $(top_srcdir)/src/tests/stub_debug.cc .
@@ -61,7 +62,10 @@ stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
 stub_tools.cc: $(top_srcdir)/src/tests/stub_tools.cc
        cp $(top_srcdir)/src/tests/stub_tools.cc .
 
-CLEANFILES += stub_debug.cc stub_tools.cc
+stub_fatal.cc: $(top_srcdir)/src/tests/stub_fatal.cc
+       cp $(top_srcdir)/src/tests/stub_fatal.cc .
+
+CLEANFILES += stub_debug.cc stub_tools.cc stub_fatal.cc
 
 ## XXX: somewhat broken. Its meant to test our debugs() implementation.
 ## but it has never been linked to the actual src/debug.cc implementation !!
@@ -83,8 +87,6 @@ mem_hdr_test_LDADD = \
 
 MemPoolTest_SOURCES = MemPoolTest.cc
 
-refcount_SOURCES = refcount.cc
-
 splay_SOURCES = splay.cc
 
 StackTest_SOURCES = StackTest.cc $(DEBUG_SOURCE)
@@ -112,3 +114,22 @@ VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc $(DEBUG_SOURCE)
 ##
 ##$(TARGLIB): $(LIBOBJS)
 ##     $(AR_R) $(TARGLIB) $(LIBOBJS)
+
+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
+
+CLEANFILES += squid-conf-tests