]> git.ipfire.org Git - thirdparty/squid.git/blobdiff - src/Makefile.am
projects / thirdparty / squid.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Broken: define and use stub_libauth.cc
[thirdparty/squid.git] / src / Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 54e6ad0ad6820aa16c82de554c45db185e865c48..f71c61444c95e57fb4a26e4bef77944d3fad4a55 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,15 +8,8 @@ include $(top_srcdir)/src/Common.am
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-if ENABLE_DNSHELPER
-DNSSOURCE = dns.cc
-DNSHELPER = dnsserver
-else
-DNSSOURCE = dns_internal.cc
-DNSHELPER =
-endif
-
-DNSSOURCE += \
+DNSSOURCE = \
+       dns_internal.cc \
        SquidDns.h \
        DnsLookupDetails.h \
        DnsLookupDetails.cc
@@ -24,7 +17,12 @@ DNSSOURCE += \
 SBUF_SOURCE= \
        base/InstanceId.h \
        MemBlob.h \
-       MemBlob.cc
+       MemBlob.cc \
+       OutOfBoundsException.h \
+       SBuf.h \
+       SBuf.cc \
+       SBufExceptions.h \
+       SBufExceptions.cc
 
 LOADABLE_MODULES_SOURCES = \
        LoadableModule.h \
@@ -43,8 +41,8 @@ check_PROGRAMS+= tests/testACLMaxUserIP
 endif
 DIST_SUBDIRS += auth
 
-SUBDIRS        += ip icmp ident log ipc mgr
-DIST_SUBDIRS += ip icmp ident log ipc mgr
+SUBDIRS        += http ip icmp ident log ipc mgr
+DIST_SUBDIRS += http ip icmp ident log ipc mgr
 
 if ENABLE_SSL
 SUBDIRS += ssl
@@ -57,6 +55,7 @@ endif
 DIST_SUBDIRS += ssl
 
 SNMP_ALL_SOURCE = \
+       SnmpRequest.h \
        snmp_core.h \
        snmp_core.cc \
        snmp_agent.h \
@@ -79,7 +78,7 @@ if USE_ESI
 SUBDIRS += esi
 ESI_LOCAL_LIBS = \
        esi/libesi.la \
-       $(top_builddir)/lib/libTrie/src/libTrie.a
+       $(top_builddir)/lib/libTrie/libTrie.a
 ESI_LIBS = $(ESI_LOCAL_LIBS) \
        $(XMLLIB) \
        $(EXPATLIB)
@@ -191,12 +190,9 @@ noinst_LTLIBRARIES = libsquid.la
 EXTRA_PROGRAMS = \
        DiskIO/DiskDaemon/diskd \
        unlinkd \
-       dnsserver \
        recv-announce \
        tests/testUfs \
-       tests/testCoss \
        tests/testRock \
-       tests/testNull \
        ufsdump
 
 ## cfgen is used when building squid
@@ -212,7 +208,6 @@ bin_PROGRAMS =
 
 
 libexec_PROGRAMS = \
-       $(DNSHELPER) \
        $(DISK_PROGRAMS) \
        $(UNLINKD)
 
@@ -271,10 +266,13 @@ squid_SOURCES = \
        AuthReg.h \
        YesNoNone.h \
        YesNoNone.cc \
+       RefreshPattern.h \
        cache_cf.cc \
        CacheDigest.h \
        CacheDigest.cc \
        cache_manager.cc \
+       NeighborTypeDomainList.h \
+       CachePeerDomainList.h \
        CachePeer.h \
        CacheManager.h \
        carp.h \
@@ -338,18 +336,20 @@ squid_SOURCES = \
        ExternalACLEntry.h \
        FadingCounter.h \
        FadingCounter.cc \
+       fatal.h \
+       fatal.cc \
        fd.h \
        fd.cc \
        fde.cc \
        fde.h \
        FileMap.h \
        filemap.cc \
-       forward.cc \
-       forward.h \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        Generic.h \
        globals.h \
        gopher.h \
@@ -358,14 +358,14 @@ squid_SOURCES = \
        helper.h \
        HelperChildConfig.h \
        HelperChildConfig.cc \
+       HelperReply.cc \
+       HelperReply.h \
        hier_code.h \
        HierarchyLogEntry.h \
        $(HTCPSOURCE) \
+       HttpStateFlags.h \
        http.cc \
        http.h \
-       HttpStatusCode.h \
-       HttpStatusLine.cc \
-       HttpStatusLine.h \
        HttpHeaderFieldStat.h \
        HttpHdrCc.h \
        HttpHdrCc.cc \
@@ -394,11 +394,12 @@ squid_SOURCES = \
        HttpParser.h \
        HttpReply.cc \
        HttpReply.h \
+       RequestFlags.h \
+       RequestFlags.cc \
        HttpRequest.cc \
        HttpRequest.h \
        HttpRequestMethod.cc \
        HttpRequestMethod.h \
-       HttpVersion.h \
        ICP.h \
        icp_opcode.h \
        icp_v2.cc \
@@ -413,8 +414,11 @@ squid_SOURCES = \
        $(LEAKFINDERSOURCE) \
        SquidList.h \
        SquidList.cc \
+       LogTags.h \
        lookup_t.h \
        main.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        mem_node.cc \
@@ -431,6 +435,8 @@ squid_SOURCES = \
        multicast.cc \
        neighbors.h \
        neighbors.cc \
+       Notes.cc \
+       Notes.h \
        Packer.cc \
        Packer.h \
        Parsing.cc \
@@ -459,10 +465,13 @@ squid_SOURCES = \
        send-announce.h \
        send-announce.cc \
        $(SBUF_SOURCE) \
+       SBufStatsAction.h \
+       SBufStatsAction.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
        SquidNew.cc \
+       IoStats.h \
        stat.h \
        stat.cc \
        StatCounters.h \
@@ -521,7 +530,6 @@ squid_SOURCES = \
        StoreSwapLogData.h \
        Server.cc \
        Server.h \
-       structs.h \
        swap_log_op.h \
        SwapDir.cc \
        SwapDir.h \
@@ -556,11 +564,6 @@ EXTRA_squid_SOURCES = \
        $(all_AUTHMODULES) \
        ConfigOption.h \
        $(DELAY_POOL_ALL_SOURCE) \
-       dns.cc \
-       dnsserver.cc \
-       dns_internal.cc \
-       DnsLookupDetails.cc \
-       DnsLookupDetails.h \
        htcp.cc \
        htcp.h \
        ipc.cc \
@@ -591,6 +594,7 @@ BUILT_SOURCES = \
        globals.cc \
        hier_code.cc \
        icp_opcode.cc \
+       LogTags.cc \
        lookup_t.cc \
        repl_modules.cc \
        swap_log_op.cc
@@ -605,7 +609,6 @@ squid_LDADD = \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        $(DISK_LIBS) \
@@ -619,6 +622,7 @@ squid_LDADD = \
        anyp/libanyp.la \
        comm/libcomm.la \
        eui/libeui.la \
+       http/libsquid-http.la \
        icmp/libicmp.la icmp/libicmp-core.la \
        log/liblog.la \
        format/libformat.la \
@@ -683,12 +687,6 @@ unlinkd_LDADD = \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 
-## dnsserver is a standalone helper. Do not link to any internal libraries
-dnsserver_SOURCES = dnsserver.cc
-dnsserver_LDADD = \
-       $(COMPAT_LIB) \
-       $(XTRA_LIBS)
-
 recv_announce_SOURCES = recv-announce.cc
 
 ## What requires what..
@@ -710,7 +708,6 @@ recv_announce_SOURCES = recv-announce.cc
 ## mem.cc wants ClientInfo.h
 ## libbase.la wants cbdata.*
 ## libbase.la wants MemBuf.*
-## structs.h wants HelperChildConfig.* (stub it)
 ufsdump_SOURCES = \
        ClientInfo.h \
        cbdata.h \
@@ -752,7 +749,6 @@ ufsdump_LDADD = \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -775,7 +771,6 @@ ufsdump_DEPENDENCIES = \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -911,7 +906,6 @@ DEFAULT_PREFIX              = $(prefix)
 DEFAULT_CONFIG_DIR     = $(sysconfdir)
 DEFAULT_CONFIG_FILE    = $(DEFAULT_CONFIG_DIR)/squid.conf
 DEFAULT_MIME_TABLE     = $(DEFAULT_CONFIG_DIR)/mime.conf
-DEFAULT_DNSSERVER      = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_SSL_CRTD       = $(libexecdir)/`echo ssl_crtd  | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_LOG_PREFIX     = $(DEFAULT_LOG_DIR)
 DEFAULT_CACHE_LOG      = $(DEFAULT_LOG_PREFIX)/cache.log
@@ -944,6 +938,9 @@ err_type.cc: err_type.h mk-string-arrays.awk
 err_detail_type.cc: err_detail_type.h mk-string-arrays.awk
        $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/err_detail_type.h | sed 's/ERR_DETAIL_//' > $@ || ($(RM) -f $@ && exit 1)
 
+LogTags.cc: LogTags.h mk-string-arrays.awk
+       $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/LogTags.h | sed 's/LOG_//' > $@ || ($(RM) -f $@ && exit 1)
+
 lookup_t.cc: lookup_t.h mk-string-arrays.awk
        $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/lookup_t.h > $@ || ($(RM) -f $@ && exit 1)
 
@@ -966,7 +963,7 @@ test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key
 cache_cf.o: cf_parser.cci
 
 # cf_gen builds the configuration files.
-cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
        $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
 
 # squid.conf.default is built by cf_gen when making cf_parser.cci
@@ -976,7 +973,9 @@ squid.conf.default squid.conf.documented: cf_parser.cci
 cf_parser.cci: cf.data cf_gen$(EXEEXT)
        ./cf_gen$(EXEEXT) cf.data $(srcdir)/cf.data.depend
 
-cf_gen_defines.cci: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre
+# The cf_gen_defines.cci is auto-generated and does not exist when the 
+# dependencies computed. We need to add its include files (autoconf.h) here
+cf_gen_defines.cci: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre $(top_builddir)/include/autoconf.h
        $(AWK) -f $(srcdir)/cf_gen_defines <$(srcdir)/cf.data.pre >$@ || ($(RM) -f $@ && exit 1)
 
 
@@ -988,7 +987,6 @@ cf.data: cf.data.pre Makefile
        -e "s%[@]DEFAULT_ICP_PORT[@]%$(DEFAULT_ICP_PORT)%g" \
        -e "s%[@]DEFAULT_CACHE_EFFECTIVE_USER[@]%$(CACHE_EFFECTIVE_USER)%g" \
        -e "s%[@]DEFAULT_MIME_TABLE[@]%$(DEFAULT_MIME_TABLE)%g" \
-       -e "s%[@]DEFAULT_DNSSERVER[@]%$(DEFAULT_DNSSERVER)%g" \
        -e "s%[@]DEFAULT_SSL_CRTD[@]%$(DEFAULT_SSL_CRTD)%g" \
        -e "s%[@]DEFAULT_UNLINKD[@]%$(DEFAULT_UNLINKD)%g" \
        -e "s%[@]DEFAULT_PINGER[@]%$(DEFAULT_PINGER)%g" \
@@ -1075,9 +1073,17 @@ check_PROGRAMS+=\
        tests/testStore \
        tests/testString \
        tests/testURL \
+       tests/testSBuf \
        tests/testConfigParser \
        tests/testStatHist \
-       $(STORE_TESTS)
+       tests/testVector
+
+if HAVE_FS_ROCK
+check_PROGRAMS += tests/testRock
+endif
+if HAVE_FS_UFS
+check_PROGRAMS += tests/testUfs
+endif
 
 ## NP: required to run the above list. check_PROGRAMS only builds the binaries...
 TESTS += $(check_PROGRAMS)
@@ -1109,7 +1115,10 @@ TESTS += $(check_PROGRAMS)
 tests_testHttpReply_SOURCES=\
        cbdata.cc \
        cbdata.h \
+       ConfigParser.cc \
        ETag.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        HttpBody.h \
        HttpBody.cc \
        HttpHeaderFieldStat.h \
@@ -1134,13 +1143,10 @@ tests_testHttpReply_SOURCES=\
        HttpMsg.h \
        HttpReply.cc \
        HttpReply.h \
-       HttpStatusCode.h \
-       HttpStatusLine.cc \
-       HttpStatusLine.h \
        Mem.h \
        mem.cc \
-    RegexList.h \
-    RegexList.cc \
+       RegexList.h \
+       RegexList.cc \
        MemBuf.cc \
        MemBuf.h \
        mime_header.h \
@@ -1162,6 +1168,7 @@ tests_testHttpReply_SOURCES=\
        tests/stub_errorpage.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_libformat.cc \
+       tests/stub_libauth.cc \
        StatCounters.h \
        StatCounters.cc \
        StatHist.h \
@@ -1184,10 +1191,10 @@ nodist_tests_testHttpReply_SOURCES=\
        $(TESTSOURCES)
 tests_testHttpReply_LDFLAGS = $(LIBADD_DL)
 tests_testHttpReply_LDADD=\
+       http/libsquid-http.la \
        acl/libacls.la \
        acl/libapi.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        anyp/libanyp.la \
        ip/libip.la \
        base/libbase.la \
@@ -1211,6 +1218,8 @@ tests_testACLMaxUserIP_SOURCES= \
        DiskIO/WriteRequest.cc \
        ETag.cc \
        event.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        FileMap.h \
        filemap.cc \
        HelperChildConfig.h \
@@ -1233,6 +1242,8 @@ tests_testACLMaxUserIP_SOURCES= \
        HttpRequestMethod.cc \
        int.h \
        int.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        SquidList.h \
        SquidList.cc \
        mem_node.cc \
@@ -1268,6 +1279,7 @@ tests_testACLMaxUserIP_SOURCES= \
        cache_cf.h \
        YesNoNone.h \
        tests/stub_cache_cf.cc \
+       tests/stub_client_side.cc \
        tests/stub_debug.cc \
        tests/stub_DelayId.cc \
        tests/stub_DiskIOModule.cc \
@@ -1277,6 +1289,7 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_HttpRequest.cc \
        tests/stub_HttpReply.cc \
        tests/stub_ipc_TypedMsgHdr.cc \
+       tests/stub_libauth.cc \
        tests/stub_libcomm.cc \
        tests/stub_libformat.cc \
        tests/stub_libsslsquid.cc \
@@ -1312,12 +1325,12 @@ tests_testACLMaxUserIP_SOURCES= \
 nodist_tests_testACLMaxUserIP_SOURCES= \
        $(TESTSOURCES)
 tests_testACLMaxUserIP_LDADD= \
+       http/libsquid-http.la \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        anyp/libanyp.la \
        base/libbase.la \
@@ -1363,6 +1376,8 @@ tests_testCacheManager_SOURCES = \
        debug.cc \
        HttpParser.cc \
        HttpParser.h \
+       RequestFlags.h \
+       RequestFlags.cc \
        HttpRequest.cc \
        HttpRequestMethod.cc \
        Mem.h \
@@ -1381,6 +1396,7 @@ tests_testCacheManager_SOURCES = \
        AuthReg.h \
        YesNoNone.h \
        YesNoNone.cc \
+       RefreshPattern.h \
        cache_cf.cc \
        CacheDigest.h \
        CacheDigest.cc \
@@ -1414,23 +1430,29 @@ tests_testCacheManager_SOURCES = \
        event.cc \
        external_acl.cc \
        ExternalACLEntry.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        fd.h \
        fd.cc \
        fde.cc \
        FileMap.h \
        filemap.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        hier_code.h \
        helper.cc \
        HelperChildConfig.h \
        HelperChildConfig.cc \
+       HelperReply.cc \
+       HelperReply.h \
        $(HTCPSOURCE) \
+       HttpStateFlags.h \
        http.cc \
        HttpBody.h \
        HttpBody.cc \
@@ -1449,7 +1471,6 @@ tests_testCacheManager_SOURCES = \
        HttpHdrScTarget.cc \
        HttpMsg.cc \
        HttpReply.cc \
-       HttpStatusLine.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -1460,9 +1481,12 @@ tests_testCacheManager_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        multicast.h \
        multicast.cc \
        mem_node.cc \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -1471,6 +1495,8 @@ tests_testCacheManager_SOURCES = \
        mime_header.cc \
        neighbors.h \
        neighbors.cc \
+       Notes.cc \
+       Notes.h \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -1491,6 +1517,7 @@ tests_testCacheManager_SOURCES = \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
+       IoStats.h \
        stat.h \
        stat.cc \
        StatCounters.h \
@@ -1498,6 +1525,7 @@ tests_testCacheManager_SOURCES = \
        StatHist.h \
        StrList.h \
        StrList.cc \
+       tests/stub_libauth.cc \
        tests/stub_StatHist.cc \
        stmem.cc \
        repl_modules.h \
@@ -1550,18 +1578,18 @@ nodist_tests_testCacheManager_SOURCES = \
        $(DISKIO_GEN_SOURCE)
 # comm.cc only requires comm/libcomm.la until fdc_table is dead.
 tests_testCacheManager_LDADD = \
+       http/libsquid-http.la \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        comm/libcomm.la \
+       eui/libeui.la \
        icmp/libicmp.la icmp/libicmp-core.la \
        log/liblog.la \
        format/libformat.la \
@@ -1605,8 +1633,12 @@ tests_testDiskIO_SOURCES = \
        ETag.cc \
        EventLoop.cc \
        event.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        fd.h \
        fd.cc \
+       fde.h \
+       fde.cc \
        FileMap.h \
        filemap.cc \
        HttpBody.h \
@@ -1627,11 +1659,12 @@ tests_testDiskIO_SOURCES = \
        HttpMsg.cc \
        HttpReply.cc \
        HttpRequestMethod.cc \
-       HttpStatusLine.cc \
        int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        MemBuf.cc \
        MemObject.cc \
        mem_node.cc \
@@ -1642,6 +1675,8 @@ tests_testDiskIO_SOURCES = \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
+       RequestFlags.h \
+       RequestFlags.cc \
        StatCounters.h \
        StatCounters.cc \
        StatHist.h \
@@ -1677,6 +1712,7 @@ tests_testDiskIO_SOURCES = \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
        tests/stub_client_db.cc \
+       client_side_request.h \
        tests/stub_client_side_request.cc \
        tests/stub_debug.cc \
        tests/stub_errorpage.cc \
@@ -1689,6 +1725,8 @@ tests_testDiskIO_SOURCES = \
        tests/stub_internal.cc \
        tests/stub_ipc.cc \
        tests/stub_ipcache.cc \
+    tests/stub_libauth.cc \
+       tests/stub_libeui.cc \
        tests/stub_libformat.cc \
        tests/stub_libicmp.cc \
        tests/stub_MemStore.cc \
@@ -1722,15 +1760,14 @@ nodist_tests_testDiskIO_SOURCES= \
        SquidMath.h \
        swap_log_op.cc
 tests_testDiskIO_LDADD = \
+       http/libsquid-http.la \
        SquidConfig.o \
        CommCalls.o \
        DnsLookupDetails.o \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        libsquid.la \
        comm/libcomm.la \
        anyp/libanyp.la \
@@ -1771,6 +1808,7 @@ tests_testEvent_SOURCES = \
        AuthReg.h \
        YesNoNone.h \
        YesNoNone.cc \
+       RefreshPattern.h \
        cache_cf.cc \
        cache_manager.cc \
        carp.h \
@@ -1807,21 +1845,26 @@ tests_testEvent_SOURCES = \
        external_acl.cc \
        ExternalACLEntry.cc \
        FadingCounter.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        fd.h \
        fd.cc \
        fde.cc \
        FileMap.h \
        filemap.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
        HelperChildConfig.h \
        HelperChildConfig.cc \
+       HelperReply.cc \
+       HelperReply.h \
        hier_code.h \
        $(HTCPSOURCE) \
        http.cc \
@@ -1844,9 +1887,10 @@ tests_testEvent_SOURCES = \
        HttpParser.cc \
        HttpParser.h \
        HttpReply.cc \
+       RequestFlags.h \
+       RequestFlags.cc \
        HttpRequest.cc \
        HttpRequestMethod.cc \
-       HttpStatusLine.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -1857,9 +1901,12 @@ tests_testEvent_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        mem_node.cc \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -1870,6 +1917,8 @@ tests_testEvent_SOURCES = \
        multicast.cc \
        neighbors.h \
        neighbors.cc \
+       Notes.cc \
+       Notes.h \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -1892,6 +1941,7 @@ tests_testEvent_SOURCES = \
        $(SNMP_SOURCE) \
        SquidMath.cc \
        SquidMath.h \
+       IoStats.h \
        stat.h \
        stat.cc \
        StatCounters.h \
@@ -1934,6 +1984,8 @@ tests_testEvent_SOURCES = \
        tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
+    tests/stub_libauth.cc \
+       tests/stub_libeui.cc \
        tests/stub_store_stats.cc \
        time.cc \
        tools.h \
@@ -1956,12 +2008,11 @@ nodist_tests_testEvent_SOURCES = \
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
 tests_testEvent_LDADD = \
+       http/libsquid-http.la \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -2008,6 +2059,7 @@ tests_testEventLoop_SOURCES = \
        AuthReg.h \
        YesNoNone.h \
        YesNoNone.cc \
+       RefreshPattern.h \
        cache_cf.cc \
        carp.h \
        carp.cc \
@@ -2043,21 +2095,26 @@ tests_testEventLoop_SOURCES = \
        external_acl.cc \
        ExternalACLEntry.cc \
        FadingCounter.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        fd.h \
        fd.cc \
        fde.cc \
        FileMap.h \
        filemap.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
        HelperChildConfig.h \
        HelperChildConfig.cc \
+       HelperReply.cc \
+       HelperReply.h \
        hier_code.h \
        $(HTCPSOURCE) \
        http.cc \
@@ -2080,9 +2137,10 @@ tests_testEventLoop_SOURCES = \
        HttpParser.cc \
        HttpParser.h \
        HttpReply.cc \
+       RequestFlags.h \
+       RequestFlags.cc \
        HttpRequest.cc \
        HttpRequestMethod.cc \
-       HttpStatusLine.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -2093,6 +2151,9 @@ tests_testEventLoop_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        Mem.h \
@@ -2106,6 +2167,8 @@ tests_testEventLoop_SOURCES = \
        multicast.cc \
        neighbors.h \
        neighbors.cc \
+       Notes.cc \
+       Notes.h \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -2126,6 +2189,7 @@ tests_testEventLoop_SOURCES = \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
+       IoStats.h \
        stat.h \
        stat.cc \
        StatCounters.h \
@@ -2170,6 +2234,7 @@ tests_testEventLoop_SOURCES = \
        tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
+       tests/stub_libeui.cc \
        tests/stub_store_stats.cc \
        time.cc \
        tools.h \
@@ -2192,10 +2257,10 @@ nodist_tests_testEventLoop_SOURCES = \
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
 tests_testEventLoop_LDADD = \
+       http/libsquid-http.la \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -2240,6 +2305,7 @@ tests_test_http_range_SOURCES = \
        AuthReg.h \
        YesNoNone.h \
        YesNoNone.cc \
+       RefreshPattern.h \
        cache_cf.cc \
        cache_manager.cc \
        CacheDigest.h \
@@ -2276,21 +2342,26 @@ tests_test_http_range_SOURCES = \
        external_acl.cc \
        ExternalACLEntry.cc \
        FadingCounter.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        fd.h \
        fd.cc \
        fde.cc \
        FileMap.h \
        filemap.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
        HelperChildConfig.h \
        HelperChildConfig.cc \
+       HelperReply.cc \
+       HelperReply.h \
        hier_code.h \
        $(HTCPSOURCE) \
        http.cc \
@@ -2313,9 +2384,10 @@ tests_test_http_range_SOURCES = \
        HttpParser.cc \
        HttpParser.h \
        HttpReply.cc \
+       RequestFlags.h \
+       RequestFlags.cc \
        HttpRequest.cc \
        HttpRequestMethod.cc \
-       HttpStatusLine.cc \
        icp_v2.cc \
        icp_v3.cc \
        int.h \
@@ -2326,6 +2398,9 @@ tests_test_http_range_SOURCES = \
        ipcache.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        Mem.h \
@@ -2339,6 +2414,8 @@ tests_test_http_range_SOURCES = \
        multicast.cc \
        neighbors.h \
        neighbors.cc \
+       Notes.cc \
+       Notes.h \
        Packer.cc \
        Parsing.cc \
        peer_digest.cc \
@@ -2359,6 +2436,7 @@ tests_test_http_range_SOURCES = \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
+       IoStats.h \
        stat.h \
        stat.cc \
        StatCounters.h \
@@ -2399,6 +2477,7 @@ tests_test_http_range_SOURCES = \
        SwapDir.cc \
        tests/test_http_range.cc \
        tests/stub_ipc_Forwarder.cc \
+       tests/stub_libeui.cc \
        tests/stub_main_cc.cc \
        tests/stub_MemStore.cc \
        tests/stub_store_stats.cc \
@@ -2422,10 +2501,10 @@ nodist_tests_test_http_range_SOURCES = \
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
 tests_test_http_range_LDADD = \
+       http/libsquid-http.la \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -2461,7 +2540,6 @@ tests_test_http_range_LDFLAGS = $(LIBADD_DL)
 tests_test_http_range_DEPENDENCIES = \
        $(SQUID_CPPUNIT_LA)
 
-
 tests_testHttpParser_SOURCES = \
        Debug.h \
        HttpParser.cc \
@@ -2471,7 +2549,6 @@ tests_testHttpParser_SOURCES = \
        Mem.h \
        mem.cc \
        String.cc \
-       structs.h \
        cache_cf.h \
        YesNoNone.h \
        tests/stub_cache_cf.cc \
@@ -2490,6 +2567,7 @@ tests_testHttpParser_SOURCES = \
 nodist_tests_testHttpParser_SOURCES = \
        $(TESTSOURCES)
 tests_testHttpParser_LDADD= \
+       http/libsquid-http.la \
        SquidConfig.o \
        base/libbase.la \
        ip/libip.la \
@@ -2507,6 +2585,8 @@ tests_testHttpRequest_SOURCES = \
        $(ACL_REGISTRATION_SOURCES) \
        HttpParser.cc \
        HttpParser.h \
+       RequestFlags.h \
+       RequestFlags.cc \
        HttpRequest.cc \
        HttpRequestMethod.cc \
        Mem.h \
@@ -2520,6 +2600,7 @@ tests_testHttpRequest_SOURCES = \
        tests/stub_DiskIOModule.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
+       tests/stub_libeui.cc \
        tests/stub_store_stats.cc \
        time.cc \
        BodyPipe.cc \
@@ -2528,6 +2609,7 @@ tests_testHttpRequest_SOURCES = \
        AuthReg.h \
        YesNoNone.h \
        YesNoNone.cc \
+       RefreshPattern.h \
        cache_cf.cc \
        debug.cc \
        CacheDigest.h \
@@ -2560,19 +2642,24 @@ tests_testHttpRequest_SOURCES = \
        ETag.cc \
        external_acl.cc \
        ExternalACLEntry.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        fd.h \
        fd.cc \
        fde.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
        HelperChildConfig.h \
        HelperChildConfig.cc \
+       HelperReply.cc \
+       HelperReply.h \
        hier_code.h \
        $(HTCPSOURCE) \
        http.cc \
@@ -2593,7 +2680,6 @@ tests_testHttpRequest_SOURCES = \
        HttpHdrScTarget.cc \
        HttpMsg.cc \
        HttpReply.cc \
-       HttpStatusLine.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -2604,9 +2690,12 @@ tests_testHttpRequest_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        multicast.h \
        multicast.cc \
        mem_node.cc \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -2615,6 +2704,8 @@ tests_testHttpRequest_SOURCES = \
        mime_header.cc \
        neighbors.h \
        neighbors.cc \
+       Notes.cc \
+       Notes.h \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -2635,6 +2726,7 @@ tests_testHttpRequest_SOURCES = \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
+       IoStats.h \
        stat.h \
        stat.cc \
        StatCounters.h \
@@ -2695,7 +2787,6 @@ tests_testHttpRequest_LDADD = \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -2711,6 +2802,7 @@ tests_testHttpRequest_LDADD = \
        comm/libcomm.la \
        log/liblog.la \
        format/libformat.la \
+       http/libsquid-http.la \
        $(REPL_OBJS) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
@@ -2748,6 +2840,8 @@ tests_testStore_SOURCES= \
        ETag.cc \
        event.cc \
        EventLoop.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        FileMap.h \
        filemap.cc \
        HttpHeaderFieldStat.h \
@@ -2765,10 +2859,14 @@ tests_testStore_SOURCES= \
        HttpHeader.cc \
        HttpMsg.cc \
        HttpRequestMethod.cc \
+       RequestFlags.cc \
+       RequestFlags.h \
        int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        mem_node.cc \
@@ -2818,10 +2916,12 @@ tests_testStore_SOURCES= \
        tests/stub_DiskIOModule.cc \
        tests/stub_errorpage.cc \
        fd.h \
+       fde.h \
        tests/stub_fd.cc \
        tests/stub_helper.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_http.cc \
+       tests/stub_libeui.cc \
        tests/stub_libformat.cc \
        HttpBody.h \
        HttpBody.cc \
@@ -2866,10 +2966,10 @@ nodist_tests_testStore_SOURCES= \
        swap_log_op.cc
 
 tests_testStore_LDADD= \
+       http/libsquid-http.la \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -2940,7 +3040,6 @@ SWAP_TEST_DS =\
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -2962,6 +3061,7 @@ tests_testUfs_SOURCES = \
        tests/stub_HelperChildConfig.cc \
        tests/stub_icp.cc \
        tests/stub_ipc.cc \
+       tests/stub_libeui.cc \
        tests/stub_MemStore.cc \
        tests/stub_pconn.cc \
        tests/stub_Port.cc \
@@ -2972,8 +3072,12 @@ tests_testUfs_SOURCES = \
        store_rebuild.h \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        fd.h \
        fd.cc \
+       fde.h \
+       fde.cc \
        client_db.h \
        disk.h \
        disk.cc \
@@ -2982,11 +3086,14 @@ tests_testUfs_SOURCES = \
        HttpBody.h \
        HttpBody.cc \
        HttpReply.cc \
-       HttpStatusLine.cc \
        int.h \
        int.cc \
+       RequestFlags.h \
+       RequestFlags.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        MemObject.cc \
        StoreSwapLogData.cc \
        StoreIOState.cc \
@@ -3084,12 +3191,12 @@ nodist_tests_testUfs_SOURCES = \
        SquidMath.h \
        swap_log_op.cc
 tests_testUfs_LDADD = \
+       http/libsquid-http.la \
        CommCalls.o \
        DnsLookupDetails.o \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -3120,6 +3227,20 @@ tests_testUfs_LDFLAGS = $(LIBADD_DL)
 tests_testUfs_DEPENDENCIES = \
        $(SWAP_TEST_DS)
 
+check_PROGRAMS += testRefCount
+testRefCount_SOURCES= \
+       base/Lock.h \
+       base/RefCount.h \
+       tests/stub_cbdata.cc \
+       tests/stub_debug.cc \
+       tests/stub_MemBuf.cc \
+       tests/testRefCount.cc
+testRefCount_LDADD = \
+       base/libbase.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
+
 tests_testRock_SOURCES = \
        cbdata.cc \
        CacheDigest.h \
@@ -3131,8 +3252,12 @@ tests_testRock_SOURCES = \
        ETag.cc \
        EventLoop.cc \
        event.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        fd.h \
        fd.cc \
+       fde.h \
+       fde.cc \
        FileMap.h \
        filemap.cc \
        HttpHeaderFieldStat.h \
@@ -3151,11 +3276,12 @@ tests_testRock_SOURCES = \
        HttpMsg.cc \
        HttpReply.cc \
        HttpRequestMethod.cc \
-       HttpStatusLine.cc \
        int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        MemBuf.cc \
@@ -3164,6 +3290,8 @@ tests_testRock_SOURCES = \
        Packer.cc \
        Parsing.cc \
        RemovalPolicy.cc \
+       RequestFlags.cc \
+       RequestFlags.h \
        StatCounters.h \
        StatCounters.cc \
        StatHist.h \
@@ -3201,8 +3329,8 @@ tests_testRock_SOURCES = \
        cache_cf.h \
        YesNoNone.h \
        tests/stub_cache_cf.cc \
-       tests/stub_cache_manager.cc \
        client_db.h \
+       tests/stub_cache_manager.cc \
        tests/stub_client_db.cc \
        tests/stub_client_side_request.cc \
        tests/stub_debug.cc \
@@ -3213,8 +3341,10 @@ tests_testRock_SOURCES = \
        tests/stub_icp.cc \
        tests/stub_ipc.cc \
        tests/stub_ipcache.cc \
+       tests/stub_libeui.cc \
        tests/stub_libformat.cc \
        tests/stub_libicmp.cc \
+       tests/stub_libmgr.cc \
        tests/stub_MemStore.cc \
        mime.h \
        tests/stub_mime.cc \
@@ -3241,6 +3371,7 @@ nodist_tests_testRock_SOURCES = \
        SquidMath.h \
        $(TESTSOURCES)
 tests_testRock_LDADD = \
+       http/libsquid-http.la \
        libsquid.la \
        comm/libcomm.la \
        anyp/libanyp.la \
@@ -3254,9 +3385,7 @@ tests_testRock_LDADD = \
        acl/libacls.la \
        acl/libapi.la \
        acl/libstate.la \
-       eui/libeui.la \
        ipc/libipc.la \
-       mgr/libmgr.la \
        base/libbase.la \
        $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
@@ -3271,311 +3400,6 @@ tests_testRock_LDFLAGS = $(INCLUDES) $(LIBADD_DL)
 tests_testRock_DEPENDENCIES = \
        $(SWAP_TEST_DS)
 
-tests_testCoss_SOURCES = \
-       tests/testCoss.cc \
-       tests/testMain.cc \
-       tests/testCoss.h \
-       tests/stub_cache_manager.cc \
-       client_db.h \
-       tests/stub_client_db.cc \
-       tests/stub_debug.cc \
-       tests/stub_HelperChildConfig.cc \
-       internal.h \
-       tests/stub_internal.cc \
-       tests/stub_ipc.cc \
-       tests/stub_pconn.cc \
-       store_rebuild.h \
-       tests/stub_store_rebuild.cc \
-       tests/stub_store_stats.cc \
-       fd.h \
-       fd.cc \
-       disk.h \
-       disk.cc \
-       FileMap.h \
-       filemap.cc \
-       HttpBody.h \
-       HttpBody.cc \
-       HttpReply.cc \
-       HttpStatusLine.cc \
-       int.h \
-       int.cc \
-       SquidList.h \
-       SquidList.cc \
-       MemObject.cc \
-       StoreSwapLogData.cc \
-       StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
-       StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
-       StoreFileSystem.cc \
-       store_io.cc \
-       store_swapout.cc \
-       store_swapmeta.cc \
-       $(UNLINKDSOURCE) \
-       $(WIN32_SOURCE) \
-       event.cc \
-       $(DELAY_POOL_SOURCE) \
-       CacheDigest.h \
-       CacheDigest.cc \
-       ConfigParser.cc \
-       EventLoop.cc \
-       HttpMsg.cc \
-       RemovalPolicy.cc \
-       store_dir.cc \
-       repl_modules.h \
-       store.cc \
-       HttpRequestMethod.cc \
-       store_key_md5.h \
-       store_key_md5.cc \
-       Parsing.cc \
-       ConfigOption.cc \
-       SwapDir.cc \
-       tests/stub_acl.cc \
-       cache_cf.h \
-       YesNoNone.h \
-       tests/stub_cache_cf.cc \
-       tests/stub_helper.cc \
-       cbdata.cc \
-       String.cc \
-       tests/stub_client_side_request.cc \
-       tests/stub_http.cc \
-       mem_node.cc \
-       stmem.cc \
-       mime.h \
-       tests/stub_mime.cc \
-       HttpHeaderFieldInfo.h \
-       HttpHeaderTools.h \
-       HttpHeaderTools.cc \
-       HttpHeader.h \
-       HttpHeader.cc \
-       Mem.h \
-       mem.cc \
-       ClientInfo.h \
-       MemBuf.cc \
-       HttpHdrContRange.cc \
-       Packer.cc \
-       HttpHeaderFieldStat.h \
-       HttpHdrCc.h \
-       HttpHdrCc.cc \
-       HttpHdrCc.cci \
-       HttpHdrSc.cc \
-       HttpHdrScTarget.cc \
-       url.cc \
-       StatCounters.h \
-       StatCounters.cc \
-       StatHist.h \
-       tests/stub_StatHist.cc \
-       tests/stub_errorpage.cc \
-       tests/stub_HttpRequest.cc \
-       log/access_log.h \
-       tests/stub_access_log.cc \
-       refresh.h \
-       refresh.cc \
-       tests/stub_MemStore.cc \
-       tests/stub_Port.cc \
-       tests/stub_store_client.cc \
-       tests/stub_store_stats.cc \
-       tools.h \
-       tests/stub_tools.cc \
-       tests/stub_UdsOp.cc \
-       tests/testStoreSupport.cc \
-       tests/testStoreSupport.h \
-       time.cc \
-       URLScheme.cc \
-       wordlist.h \
-       wordlist.cc \
-       $(DISKIO_SOURCE)
-
-nodist_tests_testCoss_SOURCES = \
-       swap_log_op.cc \
-       SquidMath.cc \
-       SquidMath.h \
-       $(TESTSOURCES) \
-       $(DISKIO_GEN_SOURCE)
-tests_testCoss_LDADD = \
-       anyp/libanyp.la \
-       libsquid.la \
-       $(REGEXLIB) \
-       $(AUTH_ACL_LIBS) \
-       ident/libident.la \
-       acl/libacls.la \
-       eui/libeui.la \
-       acl/libstate.la \
-       $(AUTH_LIBS) \
-       acl/libapi.la \
-       libsquid.la \
-       comm/libcomm.la \
-       ip/libip.la \
-       fs/libfs.la \
-       mgr/libmgr.la \
-       $(REPL_OBJS) \
-       $(DISK_LIBS) \
-       $(DISK_OS_LIBS) \
-       $(COMMON_LIBS) \
-       $(SSL_LIBS) \
-       acl/libapi.la \
-       ipc/libipc.la \
-       base/libbase.la \
-       $(top_builddir)/lib/libmisccontainers.la \
-       $(top_builddir)/lib/libmiscencoding.la \
-       $(top_builddir)/lib/libmiscutil.la \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(REGEXLIB) \
-       $(SSLLIB) \
-       $(COMPAT_LIB) \
-       $(XTRA_LIBS)
-tests_testCoss_LDFLAGS = $(LIBADD_DL)
-tests_testCoss_DEPENDENCIES = \
-       $(SWAP_TEST_DS)
-
-tests_testNull_SOURCES = \
-       tests/testNull.cc \
-       tests/testMain.cc \
-       tests/testNull.h \
-       internal.h \
-       tests/stub_internal.cc \
-       store_rebuild.h \
-       tests/stub_store_rebuild.cc \
-       tests/stub_store_stats.cc \
-       fd.h \
-       fd.cc \
-       disk.h \
-       disk.cc \
-       FileMap.h \
-       filemap.cc \
-       HttpBody.h \
-       HttpBody.cc \
-       HttpReply.cc \
-       HttpStatusLine.cc \
-       int.h \
-       int.cc \
-       SquidList.h \
-       SquidList.cc \
-       MemObject.cc \
-       StoreSwapLogData.cc \
-       StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
-       StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
-       StoreFileSystem.cc \
-       store_io.cc \
-       store_swapout.cc \
-       store_swapmeta.cc \
-       $(UNLINKDSOURCE) \
-       $(WIN32_SOURCE) \
-       event.cc \
-       $(DELAY_POOL_SOURCE) \
-       CacheDigest.h \
-       CacheDigest.cc \
-       ConfigParser.cc \
-       EventLoop.cc \
-       HttpMsg.cc \
-       RemovalPolicy.cc \
-       store_dir.cc \
-       repl_modules.h \
-       store.cc \
-       HttpRequestMethod.cc \
-       store_key_md5.h \
-       store_key_md5.cc \
-       Parsing.cc \
-       ConfigOption.cc \
-       SwapDir.cc \
-       tests/stub_acl.cc \
-       cache_cf.h \
-       YesNoNone.h \
-       tests/stub_cache_cf.cc \
-       tests/stub_helper.cc \
-       cbdata.cc \
-       String.cc \
-       tests/stub_comm.cc \
-       tests/stub_debug.cc \
-       tests/stub_client_side_request.cc \
-       tests/stub_http.cc \
-       mem_node.cc \
-       stmem.cc \
-       mime.h \
-       tests/stub_mime.cc \
-       HttpHeaderFieldInfo.h \
-       HttpHeaderTools.h \
-       HttpHeaderTools.cc \
-       HttpHeader.h \
-       HttpHeader.cc \
-       Mem.h \
-       mem.cc \
-       ClientInfo.h \
-       MemBuf.cc \
-       HttpHdrContRange.cc \
-       Packer.cc \
-       HttpHeaderFieldStat.h \
-       HttpHdrCc.h \
-       HttpHdrCc.cc \
-       HttpHdrCc.cci \
-       HttpHdrSc.cc \
-       HttpHdrScTarget.cc \
-       url.cc \
-       StatCounters.h \
-       StatCounters.cc \
-       StatHist.h \
-       tests/stub_StatHist.cc \
-       tests/stub_errorpage.cc \
-       tests/stub_HttpRequest.cc \
-       log/access_log.h \
-       tests/stub_access_log.cc \
-       refresh.h \
-       refresh.cc \
-       tests/stub_store_client.cc \
-       tests/stub_store_stats.cc \
-       tools.h \
-       tests/stub_tools.cc \
-       tests/testStoreSupport.cc \
-       tests/testStoreSupport.h \
-       time.cc \
-       URLScheme.cc \
-       wordlist.h \
-       wordlist.cc \
-       $(DISKIO_SOURCE)
-
-nodist_tests_testNull_SOURCES = \
-       $(TESTSOURCES) \
-       $(DISKIO_GEN_SOURCE)
-tests_testNull_LDADD = \
-       $(REGEXLIB) \
-       $(AUTH_ACL_LIBS) \
-       ident/libident.la \
-       acl/libacls.la \
-       eui/libeui.la \
-       acl/libstate.la \
-       $(AUTH_LIBS) \
-       acl/libapi.la \
-       base/libbase.la \
-       libsquid.la \
-       ip/libip.la \
-       fs/libfs.la \
-       ipc/libipc.la \
-       mgr/libmgr.la \
-       $(REPL_OBJS) \
-       $(DISK_LIBS) \
-       $(DISK_OS_LIBS) \
-       acl/libapi.la \
-       $(top_builddir)/lib/libmisccontainers.la \
-       $(top_builddir)/lib/libmiscencoding.la \
-       $(top_builddir)/lib/libmiscutil.la \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SSLLIB) \
-       $(COMPAT_LIB) \
-       $(XTRA_LIBS)
-tests_testNull_LDFLAGS = $(LIBADD_DL)
-tests_testNull_DEPENDENCIES = \
-       $(SWAP_TEST_DS)
-
 ## Tests of the URL module.
 ## TODO: Trim this down once the insanity is over.
 tests_testURL_SOURCES = \
@@ -3586,6 +3410,7 @@ tests_testURL_SOURCES = \
        AuthReg.h \
        YesNoNone.h \
        YesNoNone.cc \
+       RefreshPattern.h \
        cache_cf.cc \
        cache_manager.cc \
        CacheDigest.h \
@@ -3621,21 +3446,26 @@ tests_testURL_SOURCES = \
        event.cc \
        external_acl.cc \
        ExternalACLEntry.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        fd.h \
        fd.cc \
        fde.cc \
        FileMap.h \
        filemap.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
        HelperChildConfig.h \
        HelperChildConfig.cc \
+       HelperReply.cc \
+       HelperReply.h \
        hier_code.h \
        $(HTCPSOURCE) \
        http.cc \
@@ -3658,9 +3488,10 @@ tests_testURL_SOURCES = \
        HttpParser.cc \
        HttpParser.h \
        HttpReply.cc \
+       RequestFlags.h \
+       RequestFlags.cc \
        HttpRequest.cc \
        HttpRequestMethod.cc \
-       HttpStatusLine.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -3671,11 +3502,14 @@ tests_testURL_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        multicast.h \
        multicast.cc \
        Mem.h \
        mem.cc \
        mem_node.cc \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -3684,6 +3518,8 @@ tests_testURL_SOURCES = \
        mime_header.cc \
        neighbors.h \
        neighbors.cc \
+       Notes.cc \
+       Notes.h \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -3704,6 +3540,7 @@ tests_testURL_SOURCES = \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
+       IoStats.h \
        stat.h \
        stat.cc \
        StatCounters.h \
@@ -3739,8 +3576,8 @@ tests_testURL_SOURCES = \
        StoreMetaVary.cc \
        StoreSwapLogData.cc \
        String.cc \
-    StrList.h \
-    StrList.cc \
+       StrList.h \
+       StrList.cc \
        SwapDir.cc \
        MemStore.cc \
        tests/stub_debug.cc \
@@ -3772,6 +3609,7 @@ tests_testURL_SOURCES = \
 nodist_tests_testURL_SOURCES = \
        $(BUILT_SOURCES)
 tests_testURL_LDADD = \
+       http/libsquid-http.la \
        anyp/libanyp.la \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
@@ -3812,6 +3650,42 @@ tests_testURL_DEPENDENCIES = \
        $(REPL_OBJS) \
        $(SQUID_CPPUNIT_LA)
 
+tests_testSBuf_SOURCES= \
+       tests/testSBuf.h \
+       tests/testSBuf.cc \
+       tests/testMain.cc \
+       tests/SBufFindTest.h \
+       tests/SBufFindTest.cc \
+       $(SBUF_SOURCE) \
+       SBufStream.h \
+       time.cc \
+       mem.cc \
+       tests/stub_debug.cc \
+       tests/stub_fatal.cc \
+       tests/stub_HelperChildConfig.cc \
+       tests/stub_cache_cf.cc \
+       tests/stub_cache_manager.cc \
+       tests/stub_store.cc \
+       tests/stub_store_stats.cc \
+       tests/stub_tools.cc \
+       SquidString.h \
+       String.cc \
+       wordlist.cc \
+       MemBuf.cc
+nodist_tests_testSBuf_SOURCES=$(TESTSOURCES)
+tests_testSBuf_LDFLAGS = $(LIBADD_DL)
+tests_testSBuf_LDADD=\
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(COMPAT_LIB) \
+       libsquid.la \
+       ip/libip.la \
+       mgr/libmgr.la \
+       base/libbase.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMMON_LIBS)
+tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
+
 tests_testConfigParser_SOURCES = \
        ClientInfo.h \
        Mem.h \
@@ -3819,6 +3693,8 @@ tests_testConfigParser_SOURCES = \
        MemBuf.cc \
        String.cc \
        ConfigParser.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        tests/testMain.cc \
        tests/testConfigParser.cc \
        tests/testConfigParser.h \
@@ -3851,6 +3727,8 @@ tests_testConfigParser_DEPENDENCIES = \
        
 tests_testStatHist_SOURCES = \
        cbdata.cc \
+       fatal.h \
+       tests/stub_fatal.cc \
        MemBuf.cc \
        StatHist.cc \
        StatHist.h \
@@ -3882,11 +3760,27 @@ tests_testStatHist_LDFLAGS = $(LIBADD_DL)
 tests_testStatHist_LDADD = \
        base/libbase.la \
        $(top_builddir)/lib/libmiscutil.la \
+       $(top_builddir)/lib/libmisccontainers.la \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
        $(COMPAT_LIB)
 tests_testStatHist_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
 
+tests_testVector_SOURCES = \
+       tests/testVector.cc \
+       tests/testMain.cc \
+       tests/testVector.h \
+       time.cc
+nodist_tests_testVector_SOURCES = \
+       $(TESTSOURCES)
+tests_testVector_LDADD= \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
+tests_testVector_LDFLAGS = $(LIBADD_DL)
+tests_testVector_DEPENDENCIES = \
+       $(SQUID_CPPUNIT_LA)
+
 
 TESTS += testHeaders
 
Mirror of https://github.com/squid-cache/squid.git