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 2718487481732c68a82c0d3a5f68c832f2ee32c5..010a8bb4fb56fcaebbaec965adfa93a89564af6c 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -1,30 +1,22 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  $Id$
-#
+include $(top_srcdir)/src/Common.am
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CFLAGS = @SQUID_CFLAGS@
-AM_CXXFLAGS = @SQUID_CXXFLAGS@
-
-INCLUDES = \
-       -I$(top_srcdir) \
-       -I. \
-       -I$(top_builddir)/include \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src
+## we need our local files too (but avoid -I. at all costs)
+INCLUDES += -I$(srcdir)
 
 LDADD = \
-       $(top_builddir)/compat/libcompat.la \
-       -L$(top_builddir)/lib -lmiscutil \
        $(top_builddir)/src/globals.o \
-       $(top_builddir)/src/time.o
+       $(top_builddir)/src/time.o \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
 
-EXTRA_PROGRAMS = mem_node_test membanger splay tcp-banger2 rfc1738
+EXTRA_PROGRAMS = mem_node_test membanger splay tcp-banger2
 
-EXTRA_DIST = testheaders.sh
+EXTRA_DIST = \
+       $(srcdir)/squidconf/* \
+       testheaders.sh
 
 ESI_ALL_TESTS = \
        ESIExpressions
@@ -36,53 +28,72 @@ else
 endif
 
 ## Sort by dependencies - test lowest layers first
-TESTS = debug \
+TESTS += debug \
        syntheticoperators \
        VirtualDeleteOperator \
        StackTest \
-       rfc1738 \
-       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 \
+check_PROGRAMS += debug \
                $(ESI_TESTS) \
                MemPoolTest\
                mem_node_test\
                mem_hdr_test \
-               refcount\
-               rfc1738\
                splay \
                StackTest \
                syntheticoperators \
                VirtualDeleteOperator
 
 
-tcp_banger2_LDADD = -L$(top_builddir)/lib -lmiscutil
-DEBUG_SOURCE = test_tools.cc
+tcp_banger2_LDADD = $(top_builddir)/lib/libmiscutil.la
+
+
+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 .
+
+stub_tools.cc: $(top_srcdir)/src/tests/stub_tools.cc
+       cp $(top_srcdir)/src/tests/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 !!
+## all it tests are the stream operators and macro in src/Debug.h
 debug_SOURCES = debug.cc $(DEBUG_SOURCE)
+
 ESIExpressions_SOURCES = ESIExpressions.cc $(DEBUG_SOURCE)
 ESIExpressions_LDADD = $(top_builddir)/src/esi/Expression.o \
                $(LDADD)
+
 mem_node_test_SOURCES = mem_node_test.cc
 mem_node_test_LDADD = $(top_builddir)/src/mem_node.o $(LDADD)
+
 mem_hdr_test_SOURCES = mem_hdr_test.cc $(DEBUG_SOURCE)
-mem_hdr_test_LDADD = $(top_builddir)/src/stmem.o \
-                    $(top_builddir)/src/mem_node.o $(LDADD)
+mem_hdr_test_LDADD = \
+       $(top_builddir)/src/stmem.o \
+       $(top_builddir)/src/mem_node.o \
+       $(LDADD)
+
 MemPoolTest_SOURCES = MemPoolTest.cc
-refcount_SOURCES = refcount.cc
 
 splay_SOURCES = splay.cc
 
 StackTest_SOURCES = StackTest.cc $(DEBUG_SOURCE)
+
 syntheticoperators_SOURCES = syntheticoperators.cc $(DEBUG_SOURCE)
-VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc $(DEBUG_SOURCE)
 
-rfc1738_SOURCES = rfc1738.cc
+VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc $(DEBUG_SOURCE)
 
 ## membanger won't link today. Bitrot..
 ##CC   = gcc
@@ -103,3 +114,22 @@ rfc1738_SOURCES = rfc1738.cc
 ##
 ##$(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