Source Format Enforcement (#763)

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

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index b20bf6f4a45a579a179ce40d484398402a6e49f3..75b86a7c9ed4ac143a5d042227ffa31894d77ed8 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -1,6 +1,11 @@
-include $(top_srcdir)/src/Common.am
+## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
 
-AUTOMAKE_OPTIONS = subdir-objects
+include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
 AM_CPPFLAGS += -I$(srcdir)
@@ -13,7 +18,7 @@ LDADD = \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 
-EXTRA_PROGRAMS = mem_node_test membanger splay tcp-banger2
+EXTRA_PROGRAMS = mem_node_test splay tcp-banger2
 
 EXTRA_DIST = \
        $(srcdir)/squidconf/* \
@@ -22,10 +27,10 @@ EXTRA_DIST = \
 ESI_ALL_TESTS = \
        ESIExpressions
 
-if USE_ESI
+if ENABLE_ESI
   ESI_TESTS = $(ESI_ALL_TESTS)
 else
-  ESI_TESTS = 
+  ESI_TESTS =
 endif
 
 ## Sort by dependencies - test lowest layers first
@@ -33,7 +38,6 @@ TESTS += debug \
        syntheticoperators \
        VirtualDeleteOperator \
        splay\
-       MemPoolTest\
        mem_node_test\
        mem_hdr_test\
        $(ESI_TESTS) \
@@ -42,7 +46,6 @@ TESTS += debug \
 ## Sort by alpha - any build failures are significant.
 check_PROGRAMS += debug \
                $(ESI_TESTS) \
-               MemPoolTest\
                mem_node_test\
                mem_hdr_test \
                splay \
@@ -52,67 +55,89 @@ check_PROGRAMS += debug \
 
 tcp_banger2_LDADD = $(top_builddir)/lib/libmiscutil.la
 
-STUBS = stub_debug.cc stub_SBuf.cc stub_tools.cc stub_fatal.cc
+#do not include stub_libmem.cc here, as it would override libmem.la in
+# several tests whose purpose is testing libmem itself.
+STUBS = \
+       stub_cbdata.cc \
+       stub_debug.cc \
+       stub_MemBuf.cc \
+       stub_SBuf.cc \
+       stub_tools.cc \
+       stub_fatal.cc \
+       STUB.h
 DEBUG_SOURCE = test_tools.cc $(STUBS)
-CLEANFILES += $(STUBS)
+CLEANFILES += $(STUBS) stub_libmem.cc
+
+stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc
+       cp $(top_srcdir)/src/tests/stub_cbdata.cc $@
 
 stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
-       cp $(top_srcdir)/src/tests/stub_debug.cc .
+       cp $(top_srcdir)/src/tests/stub_debug.cc $@
+
+stub_MemBuf.cc: $(top_srcdir)/src/tests/stub_MemBuf.cc
+       cp $(top_srcdir)/src/tests/stub_MemBuf.cc $@
 
 stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc
-       cp $(top_srcdir)/src/tests/stub_SBuf.cc .
+       cp $(top_srcdir)/src/tests/stub_SBuf.cc $@
 
 stub_tools.cc: $(top_srcdir)/src/tests/stub_tools.cc
-       cp $(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 .
+       cp $(top_srcdir)/src/tests/stub_fatal.cc $@
+
+stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
+       cp $(top_srcdir)/src/tests/stub_libmem.cc $@
+       
+STUB.h: $(top_srcdir)/src/tests/STUB.h
+       cp $(top_srcdir)/src/tests/STUB.h $@
 
 ## 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)
+debug_SOURCES = \
+       $(DEBUG_SOURCE) \
+       debug.cc \
+       stub_libmem.cc
+
+ESIExpressions_SOURCES = \
+       $(DEBUG_SOURCE) \
+       ESIExpressions.cc \
+       stub_libmem.cc
 ESIExpressions_LDADD = $(top_builddir)/src/esi/Expression.o \
                $(LDADD)
 
-mem_node_test_SOURCES = mem_node_test.cc $(DEBUG_SOURCE)
-mem_node_test_LDADD = $(top_builddir)/src/mem_node.o $(LDADD)
+mem_node_test_SOURCES = \
+       $(DEBUG_SOURCE) \
+       mem_node_test.cc
+mem_node_test_LDADD = \
+       $(top_builddir)/src/mem_node.o \
+       $(top_builddir)/src/mem/libmem.la \
+       $(LDADD)
 
-mem_hdr_test_SOURCES = mem_hdr_test.cc $(DEBUG_SOURCE)
+mem_hdr_test_SOURCES = \
+       $(DEBUG_SOURCE) \
+       mem_hdr_test.cc
 mem_hdr_test_LDADD = \
        $(top_builddir)/src/stmem.o \
        $(top_builddir)/src/mem_node.o \
+       $(top_builddir)/src/mem/libmem.la \
        $(LDADD)
 
-MemPoolTest_SOURCES = MemPoolTest.cc $(DEBUG_SOURCE)
-
-splay_SOURCES = splay.cc $(DEBUG_SOURCE)
-
-syntheticoperators_SOURCES = syntheticoperators.cc $(DEBUG_SOURCE)
+splay_SOURCES = \
+       $(DEBUG_SOURCE) \
+       splay.cc \
+       stub_libmem.cc
 
-VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc $(DEBUG_SOURCE)
+syntheticoperators_SOURCES = \
+       $(DEBUG_SOURCE) \
+       stub_libmem.cc \
+       syntheticoperators.cc
 
-## membanger won't link today. Bitrot..
-##CC   = gcc
-##CFLAGS       = -g -Wall -I../include -I../src
-##OBJS = membanger.o hash.o SizeToPool.o
-##LIB  = -L. -lMem
-##TARGLIB = libMem.a
-##LIBOBJS = Mem.o \
-##          Stack.o
-##AR_R      = /usr/bin/ar r
-##RM      = rm
-##XTRA_LIBS = -lm  -lmalloc
-##
-##all:  membanger
-##
-##membanger: $(OBJS) $(TARGLIB)
-##     $(CC) -o membanger $(OBJS) $(LIB)
-##
-##$(TARGLIB): $(LIBOBJS)
-##     $(AR_R) $(TARGLIB) $(LIBOBJS)
+VirtualDeleteOperator_SOURCES = \
+       $(DEBUG_SOURCE) \
+       VirtualDeleteOperator.cc \
+       stub_libmem.cc
 
 squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*
        @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \