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

[thirdparty/squid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 4fe441d58399b720f794502bd1d46d3a3ae5fc1c..400f3153d52f6e9771343a0dc29d7a56e6905aee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ DNSSOURCE = \
        DnsLookupDetails.cc
 
 SBUF_SOURCE= \
+       base/CharacterSet.h \
        base/InstanceId.h \
        MemBlob.h \
        MemBlob.cc \
@@ -24,6 +25,21 @@ SBUF_SOURCE= \
        SBufExceptions.h \
        SBufExceptions.cc
 
+STOREMETA_SOURCE = \
+       StoreMeta.cc \
+       StoreMeta.h \
+       StoreMetaMD5.cc \
+       StoreMetaMD5.h \
+       StoreMetaSTD.cc \
+       StoreMetaSTD.h \
+       StoreMetaSTDLFS.cc \
+       StoreMetaSTDLFS.h \
+       StoreMetaObjSize.h \
+       StoreMetaURL.cc \
+       StoreMetaURL.h \
+       StoreMetaVary.cc \
+       StoreMetaVary.h
+
 LOADABLE_MODULES_SOURCES = \
        LoadableModule.h \
        LoadableModule.cc \
@@ -297,6 +313,8 @@ squid_SOURCES = \
        ClientRequestContext.h \
        clientStream.cc \
        clientStream.h \
+       CollapsedForwarding.cc \
+       CollapsedForwarding.h \
        CompletionDispatcher.cc \
        CompletionDispatcher.h \
        CommRead.h \
@@ -427,6 +445,7 @@ squid_SOURCES = \
        MemBuf.cc \
        MemObject.cc \
        MemObject.h \
+       MessageSizes.h \
        mime.h \
        mime.cc \
        mime_header.h \
@@ -435,8 +454,8 @@ squid_SOURCES = \
        multicast.cc \
        neighbors.h \
        neighbors.cc \
-       Notes.cc \
        Notes.h \
+       Notes.cc \
        Packer.cc \
        Packer.h \
        Parsing.cc \
@@ -465,6 +484,8 @@ squid_SOURCES = \
        send-announce.h \
        send-announce.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       SBufDetailedStats.cc \
        SBufStatsAction.h \
        SBufStatsAction.cc \
        $(SNMP_SOURCE) \
@@ -508,21 +529,9 @@ squid_SOURCES = \
        store_swapin.cc \
        store_swapmeta.cc \
        store_swapout.cc \
-       StoreMeta.cc \
-       StoreMeta.h \
-       StoreMetaMD5.cc \
-       StoreMetaMD5.h \
-       StoreMetaSTD.cc \
-       StoreMetaSTD.h \
-       StoreMetaSTDLFS.cc \
-       StoreMetaSTDLFS.h \
-       StoreMetaObjSize.h \
        StoreMetaUnpacker.cc \
        StoreMetaUnpacker.h \
-       StoreMetaURL.cc \
-       StoreMetaURL.h \
-       StoreMetaVary.cc \
-       StoreMetaVary.h \
+       $(STOREMETA_SOURCE) \
        StoreSearch.h \
        StoreStats.cc \
        StoreStats.h \
@@ -533,6 +542,8 @@ squid_SOURCES = \
        swap_log_op.h \
        SwapDir.cc \
        SwapDir.h \
+       Transients.cc \
+       Transients.h \
        MemStore.cc \
        MemStore.h \
        time.cc \
@@ -544,8 +555,6 @@ squid_SOURCES = \
        $(UNLINKDSOURCE) \
        url.cc \
        URL.h \
-       URLScheme.cc \
-       URLScheme.h \
        urn.h \
        urn.cc \
        wccp.h \
@@ -580,7 +589,6 @@ noinst_HEADERS = \
        client_side_request.cci \
        MemBuf.cci \
        MemBuf.h \
-       Store.cci \
        StoreEntryStream.h \
        String.cci \
        SquidString.h \
@@ -617,6 +625,7 @@ squid_LDADD = \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        mgr/libmgr.la \
        anyp/libanyp.la \
@@ -634,7 +643,6 @@ squid_LDADD = \
        $(REGEXLIB) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
-       $(SSL_LIBS) \
        $(SNMP_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
@@ -723,16 +731,11 @@ ufsdump_SOURCES = \
        Parsing.h \
        store_key_md5.h \
        store_key_md5.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
+       tests/stub_StoreMeta.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
        String.cc \
        SquidNew.cc \
-       time.cc \
+       tests/stub_time.cc \
        ufsdump.cc \
        dlink.h \
        dlink.cc \
@@ -744,7 +747,6 @@ ufsdump_SOURCES = \
        fd.h \
        tests/stub_fd.cc
 ufsdump_LDADD = \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        eui/libeui.la \
@@ -766,7 +768,6 @@ ufsdump_LDADD = \
        $(MINGW_LIBS) \
        $(XTRA_LIBS)
 ufsdump_DEPENDENCIES = \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        eui/libeui.la \
@@ -923,7 +924,7 @@ DEFAULT_ERROR_DIR   = $(datadir)/errors
 # Make location configure settings available to the code
 DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
 
-snmp_core.o snmp_agent.o: ../lib/snmplib/libsnmplib.a $(top_srcdir)/include/cache_snmp.h
+snmp_core.o snmp_agent.o: ../lib/snmplib/libsnmplib.la $(top_srcdir)/include/cache_snmp.h
 
 globals.cc: globals.h mk-globals-c.awk
        $(AWK) -f $(srcdir)/mk-globals-c.awk < $(srcdir)/globals.h > $@ || ($(RM) -f $@ && exit 1)
@@ -1074,6 +1075,7 @@ check_PROGRAMS+=\
        tests/testString \
        tests/testURL \
        tests/testSBuf \
+       tests/testSBufList \
        tests/testConfigParser \
        tests/testStatHist \
        tests/testVector
@@ -1116,7 +1118,7 @@ tests_testHttpReply_SOURCES=\
        cbdata.cc \
        cbdata.h \
        ConfigParser.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        fatal.h \
        tests/stub_fatal.cc \
        HttpBody.h \
@@ -1144,17 +1146,22 @@ tests_testHttpReply_SOURCES=\
        HttpReply.cc \
        HttpReply.h \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        RegexList.h \
        RegexList.cc \
        MemBuf.cc \
        MemBuf.h \
        mime_header.h \
        mime_header.cc \
+       Notes.h \
+       Notes.cc \
        Packer.cc \
        Packer.h \
        SquidString.h \
        SquidTime.h \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        StrList.h \
        StrList.cc \
@@ -1182,9 +1189,8 @@ tests_testHttpReply_SOURCES=\
        tests/testHttpReply.cc \
        tests/testHttpReply.h \
        tests/testMain.cc \
-       time.cc \
+       tests/stub_time.cc \
        url.cc \
-       URLScheme.cc \
        wordlist.h \
        wordlist.cc
 nodist_tests_testHttpReply_SOURCES=\
@@ -1212,11 +1218,12 @@ tests_testHttpReply_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 tests_testACLMaxUserIP_SOURCES= \
        cbdata.cc \
        ClientInfo.h \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        DiskIO/ReadRequest.cc \
        DiskIO/WriteRequest.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        event.cc \
        fatal.h \
        tests/stub_fatal.cc \
@@ -1244,6 +1251,8 @@ tests_testACLMaxUserIP_SOURCES= \
        int.cc \
        MasterXaction.cc \
        MasterXaction.h \
+       Notes.cc \
+       Notes.h \
        SquidList.h \
        SquidList.cc \
        mem_node.cc \
@@ -1257,23 +1266,22 @@ tests_testACLMaxUserIP_SOURCES= \
        StrList.cc \
        tests/stub_StatHist.cc \
        stmem.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        store_dir.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
+       tests/stub_StoreMeta.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
        StoreSwapLogData.cc \
        store_key_md5.h \
        store_key_md5.cc \
        swap_log_op.cc \
        swap_log_op.h \
-       SwapDir.cc \
+       tests/stub_SwapDir.cc \
        SwapDir.h \
+       Transients.cc \
        log/access_log.h \
        tests/stub_access_log.cc \
        cache_cf.h \
@@ -1301,6 +1309,7 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_Port.cc \
        repl_modules.h \
        tests/stub_store.cc \
+       tests/stub_store_client.cc \
        store_rebuild.h \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
@@ -1312,13 +1321,11 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/testACLMaxUserIP.cc \
        tests/testACLMaxUserIP.h \
        tests/testMain.cc \
-       time.cc \
+       tests/stub_time.cc \
        url.cc \
        URL.h \
-       URLScheme.cc \
-       URLScheme.h \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        MemBuf.cc \
        wordlist.h \
        wordlist.cc
@@ -1357,7 +1364,7 @@ tests_testBoilerplate_SOURCES = \
        tests/testBoilerplate.cc \
        tests/testMain.cc \
        tests/testBoilerplate.h \
-       time.cc
+       tests/stub_time.cc
 nodist_tests_testBoilerplate_SOURCES = \
        $(TESTSOURCES)
 tests_testBoilerplate_LDADD= \
@@ -1380,7 +1387,7 @@ tests_testCacheManager_SOURCES = \
        HttpRequest.cc \
        HttpRequestMethod.cc \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        String.cc \
        tests/testCacheManager.cc \
        tests/testCacheManager.h \
@@ -1388,6 +1395,7 @@ tests_testCacheManager_SOURCES = \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_store_stats.cc \
+       tests/stub_EventLoop.cc \
        time.cc \
        BodyPipe.cc \
        cache_manager.cc \
@@ -1398,9 +1406,9 @@ tests_testCacheManager_SOURCES = \
        RefreshPattern.h \
        cache_cf.cc \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        carp.h \
-       carp.cc \
+       tests/stub_carp.cc \
        cbdata.cc \
        ChunkedCodingParser.cc \
        client_db.h \
@@ -1411,6 +1419,7 @@ tests_testCacheManager_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -1425,7 +1434,7 @@ tests_testCacheManager_SOURCES = \
        dlink.cc \
        $(DNSSOURCE) \
        errorpage.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        event.cc \
        external_acl.cc \
        ExternalACLEntry.cc \
@@ -1485,7 +1494,6 @@ tests_testCacheManager_SOURCES = \
        multicast.h \
        multicast.cc \
        mem_node.cc \
-       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -1513,6 +1521,9 @@ tests_testCacheManager_SOURCES = \
        refresh.cc \
        RemovalPolicy.cc \
        Server.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -1524,6 +1535,7 @@ tests_testCacheManager_SOURCES = \
        StatHist.h \
        StrList.h \
        StrList.cc \
+       tests/stub_libauth_acls.cc \
        tests/stub_libauth.cc \
        tests/stub_StatHist.cc \
        stmem.cc \
@@ -1531,7 +1543,7 @@ tests_testCacheManager_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_io.cc \
        store_key_md5.h \
@@ -1546,28 +1558,23 @@ tests_testCacheManager_SOURCES = \
        store_swapout.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
+       tests/stub_StoreMeta.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
        StoreSwapLogData.cc \
        tools.h \
        tools.cc \
-       tunnel.cc \
-       SwapDir.cc \
+       Transients.cc \
+       tests/stub_tunnel.cc \
+       tests/stub_SwapDir.cc \
        MemStore.cc \
        $(UNLINKDSOURCE) \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
-       wccp2.cc \
+       tests/stub_wccp2.cc \
        whois.h \
-       whois.cc \
+       tests/stub_whois.cc \
        FadingCounter.cc \
        $(WIN32_SOURCE) \
        wordlist.h \
@@ -1578,7 +1585,6 @@ nodist_tests_testCacheManager_SOURCES = \
 # 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 \
        acl/libstate.la \
@@ -1619,17 +1625,18 @@ tests_testCacheManager_DEPENDENCIES = \
 
 tests_testDiskIO_SOURCES = \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        cbdata.cc \
        client_db.h \
        ClientInfo.h \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        $(DELAY_POOL_SOURCE) \
        $(DISKIO_SOURCE) \
        disk.h \
        disk.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        EventLoop.cc \
        event.cc \
        fatal.h \
@@ -1668,7 +1675,9 @@ tests_testDiskIO_SOURCES = \
        MemObject.cc \
        mem_node.cc \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
+       Notes.h \
+       Notes.cc \
        Packer.cc \
        Parsing.cc \
        refresh.h \
@@ -1681,15 +1690,13 @@ tests_testDiskIO_SOURCES = \
        StatHist.h \
        tests/stub_StatHist.cc \
        stmem.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
+       tests/stub_StoreMeta.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
        StoreSwapLogData.cc \
        store_dir.cc \
        store_io.cc \
@@ -1702,7 +1709,8 @@ tests_testDiskIO_SOURCES = \
        String.cc \
        StrList.h \
        StrList.cc \
-       SwapDir.cc \
+       tests/stub_SwapDir.cc \
+       Transients.cc \
        log/access_log.h \
        tests/stub_access_log.cc \
        tests/stub_acl.cc \
@@ -1724,6 +1732,7 @@ tests_testDiskIO_SOURCES = \
        tests/stub_internal.cc \
        tests/stub_ipc.cc \
        tests/stub_ipcache.cc \
+       tests/stub_libauth_acls.cc \
        tests/stub_libauth.cc \
        tests/stub_libeui.cc \
        tests/stub_libformat.cc \
@@ -1733,6 +1742,7 @@ tests_testDiskIO_SOURCES = \
        tests/stub_mime.cc \
        tests/stub_pconn.cc \
        tests/stub_Port.cc \
+       tests/stub_stat.cc \
        tests/stub_store_client.cc \
        tests/stub_store_stats.cc \
        store_rebuild.h \
@@ -1743,10 +1753,9 @@ tests_testDiskIO_SOURCES = \
        tests/testMain.cc \
        tests/testStoreSupport.cc \
        tests/testStoreSupport.h \
-       time.cc \
+       tests/stub_time.cc \
        $(UNLINKDSOURCE) \
        url.cc \
-       URLScheme.cc \
        $(WIN32_SOURCE) \
        wordlist.h \
        wordlist.cc \
@@ -1763,7 +1772,6 @@ tests_testDiskIO_LDADD = \
        SquidConfig.o \
        CommCalls.o \
        DnsLookupDetails.o \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
@@ -1778,9 +1786,9 @@ tests_testDiskIO_LDADD = \
        $(DISK_OS_LIBS) \
        acl/libapi.la \
        mgr/libmgr.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        base/libbase.la \
-       $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -1801,7 +1809,7 @@ tests_testEvent_SOURCES = \
        AccessLogEntry.cc \
        BodyPipe.cc \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        cache_cf.h \
        AuthReg.h \
        YesNoNone.h \
@@ -1810,7 +1818,7 @@ tests_testEvent_SOURCES = \
        cache_cf.cc \
        cache_manager.cc \
        carp.h \
-       carp.cc \
+       tests/stub_carp.cc \
        cbdata.cc \
        ChunkedCodingParser.cc \
        client_db.h \
@@ -1821,6 +1829,7 @@ tests_testEvent_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -1836,7 +1845,7 @@ tests_testEvent_SOURCES = \
        dlink.cc \
        $(DNSSOURCE) \
        errorpage.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        event.cc \
        EventLoop.h \
        EventLoop.cc \
@@ -1902,9 +1911,8 @@ tests_testEvent_SOURCES = \
        MasterXaction.cc \
        MasterXaction.h \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        mem_node.cc \
-       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -1936,6 +1944,9 @@ tests_testEvent_SOURCES = \
        Server.cc \
        StrList.h \
        StrList.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.cc \
        SquidMath.h \
@@ -1951,7 +1962,7 @@ tests_testEvent_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_io.cc \
        store_key_md5.h \
@@ -1966,39 +1977,35 @@ tests_testEvent_SOURCES = \
        store_swapout.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
+       tests/stub_StoreMeta.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
        StoreSwapLogData.cc \
        String.cc \
-       SwapDir.cc \
+       tests/stub_SwapDir.cc \
        tests/CapturingStoreEntry.h \
        tests/testEvent.cc \
        tests/testEvent.h \
        tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
+       tests/stub_libauth_acls.cc \
        tests/stub_libauth.cc \
        tests/stub_libeui.cc \
        tests/stub_store_stats.cc \
        time.cc \
        tools.h \
        tools.cc \
-       tunnel.cc \
+       Transients.cc \
+       tests/stub_tunnel.cc \
        MemStore.cc \
        $(UNLINKDSOURCE) \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
-       wccp2.cc \
+       tests/stub_wccp2.cc \
        whois.h \
-       whois.cc \
+       tests/stub_whois.cc \
        $(WIN32_SOURCE) \
        wordlist.h \
        wordlist.cc
@@ -2007,7 +2014,6 @@ nodist_tests_testEvent_SOURCES = \
        $(DISKIO_GEN_SOURCE)
 tests_testEvent_LDADD = \
        http/libsquid-http.la \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
@@ -2050,7 +2056,7 @@ tests_testEventLoop_SOURCES = \
        AccessLogEntry.cc \
        BodyPipe.cc \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        cache_manager.cc \
        cache_cf.h \
        AuthReg.h \
@@ -2059,7 +2065,7 @@ tests_testEventLoop_SOURCES = \
        RefreshPattern.h \
        cache_cf.cc \
        carp.h \
-       carp.cc \
+       tests/stub_carp.cc \
        cbdata.cc \
        ChunkedCodingParser.cc \
        client_db.h \
@@ -2070,6 +2076,7 @@ tests_testEventLoop_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -2085,7 +2092,7 @@ tests_testEventLoop_SOURCES = \
        dlink.cc \
        $(DNSSOURCE) \
        errorpage.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        EventLoop.h \
        EventLoop.cc \
        event.cc \
@@ -2150,11 +2157,10 @@ tests_testEventLoop_SOURCES = \
        SquidList.cc \
        MasterXaction.cc \
        MasterXaction.h \
-       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        mem_node.cc \
        mime.h \
        mime.cc \
@@ -2183,6 +2189,9 @@ tests_testEventLoop_SOURCES = \
        refresh.h \
        refresh.cc \
        Server.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -2199,7 +2208,7 @@ tests_testEventLoop_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_io.cc \
        store_key_md5.h \
@@ -2214,40 +2223,36 @@ tests_testEventLoop_SOURCES = \
        store_swapout.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
+       tests/stub_StoreMeta.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
        StoreSwapLogData.cc \
        String.cc \
        StrList.h \
        StrList.cc \
-       SwapDir.cc \
+       tests/stub_SwapDir.cc \
        tests/testEventLoop.cc \
        tests/testEventLoop.h \
        tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
+       tests/stub_libauth_acls.cc \
        tests/stub_libauth.cc \
        tests/stub_libeui.cc \
        tests/stub_store_stats.cc \
        time.cc \
        tools.h \
        tools.cc \
-       tunnel.cc \
+       Transients.cc \
+       tests/stub_tunnel.cc \
        MemStore.cc \
        $(UNLINKDSOURCE) \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
-       wccp2.cc \
+       tests/stub_wccp2.cc \
        whois.h \
-       whois.cc \
+       tests/stub_whois.cc \
        $(WIN32_SOURCE) \
        wordlist.h \
        wordlist.cc
@@ -2256,7 +2261,6 @@ nodist_tests_testEventLoop_SOURCES = \
        $(DISKIO_GEN_SOURCE)
 tests_testEventLoop_LDADD = \
        http/libsquid-http.la \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
@@ -2305,9 +2309,9 @@ tests_test_http_range_SOURCES = \
        cache_cf.cc \
        cache_manager.cc \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        carp.h \
-       carp.cc \
+       tests/stub_carp.cc \
        cbdata.cc \
        ChunkedCodingParser.cc \
        client_db.h \
@@ -2318,6 +2322,7 @@ tests_test_http_range_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -2333,7 +2338,7 @@ tests_test_http_range_SOURCES = \
        dlink.cc \
        $(DNSSOURCE) \
        errorpage.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        event.cc \
        FadingCounter.cc \
        fatal.h \
@@ -2395,11 +2400,10 @@ tests_test_http_range_SOURCES = \
        SquidList.cc \
        MasterXaction.cc \
        MasterXaction.h \
-       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        mem_node.cc \
        mime.h \
        mime.cc \
@@ -2428,6 +2432,9 @@ tests_test_http_range_SOURCES = \
        refresh.cc \
        RemovalPolicy.cc \
        Server.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -2443,7 +2450,7 @@ tests_test_http_range_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_key_md5.h \
        store_key_md5.cc \
@@ -2458,18 +2465,14 @@ tests_test_http_range_SOURCES = \
        store_swapout.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
+       tests/stub_StoreMeta.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
        StoreSwapLogData.cc \
        String.cc \
        StrList.h \
        StrList.cc \
-       SwapDir.cc \
+       tests/stub_SwapDir.cc \
+       Transients.cc \
        tests/test_http_range.cc \
        tests/stub_external_acl.cc \
        tests/stub_ipc_Forwarder.cc \
@@ -2477,19 +2480,19 @@ tests_test_http_range_SOURCES = \
        tests/stub_main_cc.cc \
        tests/stub_MemStore.cc \
        tests/stub_store_stats.cc \
+       tests/stub_EventLoop.cc \
        time.cc \
        tools.h \
        tools.cc \
-       tunnel.cc \
+       tests/stub_tunnel.cc \
        $(UNLINKDSOURCE) \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
-       wccp2.cc \
+       tests/stub_wccp2.cc \
        whois.h \
-       whois.cc \
+       tests/stub_whois.cc \
        $(WIN32_SOURCE) \
        wordlist.h \
        wordlist.cc
@@ -2501,7 +2504,6 @@ tests_test_http_range_LDADD = \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        libsquid.la \
        ip/libip.la \
@@ -2541,22 +2543,30 @@ tests_testHttpParser_SOURCES = \
        HttpParser.h \
        MemBuf.cc \
        MemBuf.h \
+       tests/stub_MemObject.cc \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        String.cc \
        cache_cf.h \
        YesNoNone.h \
+       $(SBUF_SOURCE) \
+       tests/stub_SBufDetailedStats.cc \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_comm.cc \
+       tests/stub_cbdata.cc \
        tests/stub_debug.cc \
        tests/stub_event.cc \
        tests/stub_HelperChildConfig.cc \
+       tests/stub_stmem.cc \
+       tests/stub_store.cc \
+       tests/stub_store_stats.cc \
        tools.h \
        tests/stub_tools.cc \
        tests/testHttpParser.cc \
        tests/testHttpParser.h \
        tests/testMain.cc \
-       time.cc \
+       tests/stub_time.cc \
        wordlist.h \
        wordlist.cc
 nodist_tests_testHttpParser_SOURCES = \
@@ -2577,7 +2587,6 @@ tests_testHttpParser_DEPENDENCIES = \
 ## Tests of the HttpRequest module.
 tests_testHttpRequest_SOURCES = \
        AccessLogEntry.cc \
-       $(ACL_REGISTRATION_SOURCES) \
        HttpParser.cc \
        HttpParser.h \
        RequestFlags.h \
@@ -2585,7 +2594,7 @@ tests_testHttpRequest_SOURCES = \
        HttpRequest.cc \
        HttpRequestMethod.cc \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        String.cc \
        tests/testHttpRequest.h \
        tests/testHttpRequest.cc \
@@ -2593,10 +2602,12 @@ tests_testHttpRequest_SOURCES = \
        tests/testHttpRequestMethod.cc \
        tests/testMain.cc \
        tests/stub_DiskIOModule.cc \
+       tests/stub_libauth.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_libeui.cc \
        tests/stub_store_stats.cc \
+       tests/stub_EventLoop.cc \
        time.cc \
        BodyPipe.cc \
        cache_manager.cc \
@@ -2608,9 +2619,9 @@ tests_testHttpRequest_SOURCES = \
        cache_cf.cc \
        debug.cc \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        carp.h \
-       carp.cc \
+       tests/stub_carp.cc \
        cbdata.cc \
        ChunkedCodingParser.cc \
        client_db.h \
@@ -2621,6 +2632,7 @@ tests_testHttpRequest_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -2634,7 +2646,7 @@ tests_testHttpRequest_SOURCES = \
        dlink.cc \
        $(DNSSOURCE) \
        errorpage.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        external_acl.cc \
        ExternalACLEntry.cc \
        fatal.h \
@@ -2690,7 +2702,6 @@ tests_testHttpRequest_SOURCES = \
        multicast.h \
        multicast.cc \
        mem_node.cc \
-       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -2713,11 +2724,15 @@ tests_testHttpRequest_SOURCES = \
        peer_userhash.h \
        peer_userhash.cc \
        redirect.h \
+       tests/stub_libauth_acls.cc \
        tests/stub_redirect.cc \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
        Server.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -2733,7 +2748,7 @@ tests_testHttpRequest_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_io.cc \
        store_key_md5.h \
@@ -2748,30 +2763,25 @@ tests_testHttpRequest_SOURCES = \
        store_swapout.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
+       tests/stub_StoreMeta.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
        StoreSwapLogData.cc \
        StrList.h \
        StrList.cc \
        event.cc \
        tools.h \
        tools.cc \
-       tunnel.cc \
-       SwapDir.cc \
+       Transients.cc \
+       tests/stub_tunnel.cc \
+       tests/stub_SwapDir.cc \
        MemStore.cc \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
-       wccp2.cc \
+       tests/stub_wccp2.cc \
        whois.h \
-       whois.cc \
+       tests/stub_whois.cc \
        FadingCounter.cc \
        $(WIN32_SOURCE) \
        wordlist.h \
@@ -2779,15 +2789,14 @@ tests_testHttpRequest_SOURCES = \
 nodist_tests_testHttpRequest_SOURCES = \
        $(BUILT_SOURCES)
 tests_testHttpRequest_LDADD = \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        base/libbase.la \
        mgr/libmgr.la \
@@ -2801,7 +2810,6 @@ tests_testHttpRequest_LDADD = \
        $(REPL_OBJS) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
-       $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -2822,9 +2830,10 @@ tests_testHttpRequest_DEPENDENCIES = \
 ## first line - what we are testing.
 tests_testStore_SOURCES= \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        cbdata.cc \
        ClientInfo.h \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        $(DELAY_POOL_SOURCE) \
@@ -2863,10 +2872,12 @@ tests_testStore_SOURCES= \
        MasterXaction.cc \
        MasterXaction.h \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        mem_node.cc \
        MemBuf.cc \
        MemObject.cc \
+       Notes.h \
+       Notes.cc \
        Packer.cc \
        Parsing.cc \
        RemovalPolicy.cc \
@@ -2883,16 +2894,14 @@ tests_testStore_SOURCES= \
        store_io.cc \
        store_swapout.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
+       tests/stub_StoreMeta.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
        StoreSwapLogData.cc \
        store_key_md5.h \
        store_key_md5.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        StrList.h \
        StrList.cc \
@@ -2916,6 +2925,7 @@ tests_testStore_SOURCES= \
        tests/stub_helper.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_http.cc \
+       tests/stub_libauth.cc \
        tests/stub_libeui.cc \
        tests/stub_libformat.cc \
        HttpBody.h \
@@ -2927,12 +2937,14 @@ tests_testStore_SOURCES= \
        mime.h \
        tests/stub_mime.cc \
        tests/stub_Port.cc \
+       tests/stub_stat.cc \
        tests/stub_store_client.cc \
        tests/stub_store_stats.cc \
        store_rebuild.h \
        tests/stub_store_rebuild.cc \
        tests/stub_store_swapout.cc \
        tools.h \
+       Transients.cc \
        tests/stub_tools.cc \
        tests/stub_UdsOp.cc \
        tests/testMain.cc \
@@ -2948,9 +2960,8 @@ tests_testStore_SOURCES= \
        tests/testStoreSupport.h \
        tests/TestSwapDir.cc \
        tests/TestSwapDir.h \
-       time.cc \
+       tests/stub_time.cc \
        url.cc \
-       URLScheme.cc \
        wordlist.h \
        wordlist.cc
 
@@ -2962,20 +2973,18 @@ nodist_tests_testStore_SOURCES= \
 
 tests_testStore_LDADD= \
        http/libsquid-http.la \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        mgr/libmgr.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        anyp/libanyp.la \
-       $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -2996,9 +3005,12 @@ tests_testStore_DEPENDENCIES = \
 tests_testString_SOURCES = \
        ClientInfo.h \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        MemBuf.cc \
        String.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        tests/testMain.cc \
        tests/testString.cc \
        tests/testString.h \
@@ -3010,7 +3022,7 @@ tests_testString_SOURCES = \
        tests/stub_HelperChildConfig.cc \
        tools.h \
        tests/stub_tools.cc \
-       time.cc \
+       tests/stub_time.cc \
        wordlist.h \
        wordlist.cc
 nodist_tests_testString_SOURCES = \
@@ -3032,11 +3044,9 @@ tests_testString_DEPENDENCIES = \
 SWAP_TEST_DS =\
        repl_modules.o \
        $(DISK_LIBS) \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -3053,10 +3063,13 @@ tests_testUfs_SOURCES = \
        tests/testUfs.h \
        tests/stub_cache_manager.cc \
        tests/stub_client_db.cc \
+       tests/stub_CollapsedForwarding.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_icp.cc \
        tests/stub_ipc.cc \
+       tests/stub_ipcache.cc \
        tests/stub_libeui.cc \
+       tests/stub_libicmp.cc \
        tests/stub_MemStore.cc \
        tests/stub_pconn.cc \
        tests/stub_Port.cc \
@@ -3064,6 +3077,7 @@ tests_testUfs_SOURCES = \
        internal.h \
        tests/stub_internal.cc \
        tests/stub_libformat.cc \
+       tests/stub_stat.cc \
        store_rebuild.h \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
@@ -3087,18 +3101,16 @@ tests_testUfs_SOURCES = \
        RequestFlags.cc \
        SquidList.h \
        SquidList.cc \
+       Transients.cc \
        MasterXaction.cc \
        MasterXaction.h \
        MemObject.cc \
+       Notes.h \
+       Notes.cc \
        StoreSwapLogData.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
+       $(STOREMETA_SOURCE) \
        StoreFileSystem.cc \
        store_io.cc \
        store_swapout.cc \
@@ -3108,7 +3120,7 @@ tests_testUfs_SOURCES = \
        event.cc \
        $(DELAY_POOL_SOURCE) \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        ConfigParser.cc \
        EventLoop.cc \
        HttpMsg.cc \
@@ -3128,10 +3140,14 @@ tests_testUfs_SOURCES = \
        tests/stub_cache_cf.cc \
        tests/stub_helper.cc \
        cbdata.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        tests/stub_debug.cc \
        tests/stub_client_side_request.cc \
        tests/stub_http.cc \
+       tests/stub_libauth.cc \
        mem_node.cc \
        stmem.cc \
        mime.h \
@@ -3174,7 +3190,6 @@ tests_testUfs_SOURCES = \
        tests/testStoreSupport.cc \
        tests/testStoreSupport.h \
        time.cc \
-       URLScheme.cc \
        wordlist.h \
        wordlist.cc \
        $(DISKIO_SOURCE)
@@ -3189,11 +3204,9 @@ tests_testUfs_LDADD = \
        http/libsquid-http.la \
        CommCalls.o \
        DnsLookupDetails.o \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        libsquid.la \
        ip/libip.la \
@@ -3204,8 +3217,8 @@ tests_testUfs_LDADD = \
        $(DISK_LIBS) \
        $(DISK_OS_LIBS) \
        acl/libapi.la \
-       ipc/libipc.la \
        $(SSL_LIBS) \
+       ipc/libipc.la \
        comm/libcomm.la \
        anyp/libanyp.la \
        base/libbase.la \
@@ -3239,7 +3252,9 @@ testRefCount_LDADD = \
 tests_testRock_SOURCES = \
        cbdata.cc \
        CacheDigest.h \
-       CacheDigest.cc \
+       CollapsedForwarding.h \
+       CollapsedForwarding.cc \
+       tests/stub_CacheDigest.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        disk.h \
@@ -3248,7 +3263,7 @@ tests_testRock_SOURCES = \
        EventLoop.cc \
        event.cc \
        fatal.h \
-       tests/stub_fatal.cc \
+       fatal.cc \
        fd.h \
        fd.cc \
        fde.h \
@@ -3282,6 +3297,8 @@ tests_testRock_SOURCES = \
        MemBuf.cc \
        MemObject.cc \
        mem_node.cc \
+       Notes.h \
+       Notes.cc \
        Packer.cc \
        Parsing.cc \
        RemovalPolicy.cc \
@@ -3293,16 +3310,12 @@ tests_testRock_SOURCES = \
        tests/stub_StatHist.cc \
        stmem.cc \
        repl_modules.h \
+       tests/stub_stat.cc \
        store.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
-       StoreMetaURL.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaVary.cc \
+       $(STOREMETA_SOURCE) \
        StoreSwapLogData.cc \
        store_dir.cc \
        store_io.cc \
@@ -3310,10 +3323,15 @@ tests_testRock_SOURCES = \
        store_key_md5.cc \
        store_swapmeta.cc \
        store_swapout.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        StrList.h \
        StrList.cc \
        SwapDir.cc \
+       Transients.h \
+       Transients.cc \
        tests/testRock.cc \
        tests/testMain.cc \
        tests/testRock.h \
@@ -3333,6 +3351,7 @@ tests_testRock_SOURCES = \
        tests/stub_HelperChildConfig.cc \
        tests/stub_http.cc \
        tests/stub_HttpRequest.cc \
+       tests/stub_libauth.cc \
        tests/stub_icp.cc \
        tests/stub_ipc.cc \
        tests/stub_ipcache.cc \
@@ -3353,7 +3372,6 @@ tests_testRock_SOURCES = \
        tests/stub_tools.cc \
        time.cc \
        url.cc \
-       URLScheme.cc \
        wordlist.h \
        wordlist.cc \
        $(DELAY_POOL_SOURCE) \
@@ -3372,7 +3390,6 @@ tests_testRock_LDADD = \
        anyp/libanyp.la \
        ip/libip.la \
        fs/libfs.la \
-       $(AUTH_LIBS) \
        $(COMMON_LIBS) \
        $(REPL_OBJS) \
        $(DISK_LIBS) \
@@ -3380,9 +3397,10 @@ tests_testRock_LDADD = \
        acl/libacls.la \
        acl/libapi.la \
        acl/libstate.la \
+       eui/libeui.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        base/libbase.la \
-       $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -3399,7 +3417,6 @@ tests_testRock_DEPENDENCIES = \
 ## TODO: Trim this down once the insanity is over.
 tests_testURL_SOURCES = \
        AccessLogEntry.cc \
-       $(ACL_REGISTRATION_SOURCES) \
        BodyPipe.cc \
        cache_cf.h \
        AuthReg.h \
@@ -3407,11 +3424,11 @@ tests_testURL_SOURCES = \
        YesNoNone.cc \
        RefreshPattern.h \
        cache_cf.cc \
-       cache_manager.cc \
+       tests/stub_cache_manager.cc \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        carp.h \
-       carp.cc \
+       tests/stub_carp.cc \
        cbdata.cc \
        ChunkedCodingParser.cc \
        client_db.h \
@@ -3422,6 +3439,7 @@ tests_testURL_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -3502,9 +3520,8 @@ tests_testURL_SOURCES = \
        multicast.h \
        multicast.cc \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        mem_node.cc \
-       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -3513,8 +3530,8 @@ tests_testURL_SOURCES = \
        mime_header.cc \
        neighbors.h \
        neighbors.cc \
-       Notes.cc \
        Notes.h \
+       Notes.cc \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -3532,6 +3549,9 @@ tests_testURL_SOURCES = \
        refresh.cc \
        RemovalPolicy.cc \
        Server.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -3547,7 +3567,7 @@ tests_testURL_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_io.cc \
        store_key_md5.h \
@@ -3562,41 +3582,39 @@ tests_testURL_SOURCES = \
        store_swapout.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
+       tests/stub_StoreMeta.cc \
        StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
        StoreSwapLogData.cc \
        String.cc \
        StrList.h \
        StrList.cc \
-       SwapDir.cc \
+       Transients.cc \
+       tests/stub_SwapDir.cc \
        MemStore.cc \
        tests/stub_debug.cc \
        tests/stub_DiskIOModule.cc \
+       tests/stub_libauth_acls.cc \
+       tests/stub_libauth.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_store_stats.cc \
        tests/testURL.cc \
        tests/testURL.h \
-       tests/testURLScheme.cc \
-       tests/testURLScheme.h \
+       tests/testUriScheme.cc \
+       tests/testUriScheme.h \
        tests/testMain.cc \
-       time.cc \
+       tests/stub_time.cc \
+       tests/stub_EventLoop.cc \
        tools.h \
        tools.cc \
-       tunnel.cc \
+       tests/stub_tunnel.cc \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
-       wccp2.cc \
+       tests/stub_wccp2.cc \
        whois.h \
-       whois.cc \
+       tests/stub_whois.cc \
        FadingCounter.cc \
        $(WIN32_SOURCE) \
        wordlist.h \
@@ -3606,17 +3624,16 @@ nodist_tests_testURL_SOURCES = \
 tests_testURL_LDADD = \
        http/libsquid-http.la \
        anyp/libanyp.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 \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        mgr/libmgr.la \
        $(SNMP_LIBS) \
@@ -3629,7 +3646,6 @@ tests_testURL_LDADD = \
        $(REPL_OBJS) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
-       $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -3652,8 +3668,10 @@ tests_testSBuf_SOURCES= \
        tests/SBufFindTest.h \
        tests/SBufFindTest.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        SBufStream.h \
-       time.cc \
+       tests/stub_time.cc \
        mem.cc \
        tests/stub_debug.cc \
        tests/stub_fatal.cc \
@@ -3665,27 +3683,76 @@ tests_testSBuf_SOURCES= \
        tests/stub_tools.cc \
        SquidString.h \
        String.cc \
-       wordlist.cc \
-       MemBuf.cc
+       tests/stub_wordlist.cc \
+       tests/stub_MemBuf.cc
 nodist_tests_testSBuf_SOURCES=$(TESTSOURCES)
 tests_testSBuf_LDFLAGS = $(LIBADD_DL)
 tests_testSBuf_LDADD=\
+       base/libbase.la \
+       libsquid.la \
+       ip/libip.la \
+       mgr/libmgr.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(COMPAT_LIB) \
+       $(XTRA_LIBS)
+tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
+
+tests_testSBufList_SOURCES= \
+       tests/testSBufList.h \
+       tests/testSBufList.cc \
+       tests/testMain.cc \
+       $(SBUF_SOURCE) \
+       SBufList.h \
+       SBufList.cc \
+       SBufAlgos.h \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
+       SBufStream.h \
+       tests/stub_time.cc \
+       mem.cc \
+       tests/stub_MemObject.cc \
+       tests/stub_cbdata.cc \
+       tests/stub_comm.cc \
+       tests/stub_debug.cc \
+       tests/stub_event.cc \
+       tests/stub_fatal.cc \
+       tests/stub_fd.cc \
+       tests/stub_HelperChildConfig.cc \
+       tests/stub_cache_cf.cc \
+       tests/stub_cache_manager.cc \
+       tests/stub_store.cc \
+       tests/stub_stmem.cc \
+       tests/stub_store_stats.cc \
+       tests/stub_tools.cc \
+       SquidString.h \
+       StatCounters.cc \
+       String.cc \
+       tests/stub_wordlist.cc \
+       tests/stub_MemBuf.cc
+nodist_tests_testSBufList_SOURCES=$(TESTSOURCES)
+tests_testSBufList_LDFLAGS = $(LIBADD_DL)
+tests_testSBufList_LDADD=\
+       base/libbase.la \
        libsquid.la \
        ip/libip.la \
        mgr/libmgr.la \
-       base/libbase.la \
        $(top_builddir)/lib/libmiscutil.la \
-       $(COMMON_LIBS)
-tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
+       $(SQUID_CPPUNIT_LIBS) \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
+tests_testSBufList_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 
 tests_testConfigParser_SOURCES = \
        ClientInfo.h \
        Mem.h \
-       mem.cc \
-       MemBuf.cc \
+       tests/stub_mem.cc \
+       tests/stub_MemBuf.cc \
+       tests/stub_time.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        ConfigParser.cc \
        fatal.h \
@@ -3701,7 +3768,6 @@ tests_testConfigParser_SOURCES = \
        tests/stub_HelperChildConfig.cc \
        tools.h \
        tests/stub_tools.cc \
-       time.cc \
        wordlist.h \
        wordlist.cc
 nodist_tests_testConfigParser_SOURCES = \
@@ -3721,10 +3787,10 @@ tests_testConfigParser_DEPENDENCIES = \
        $(SQUID_CPPUNIT_LA)
        
 tests_testStatHist_SOURCES = \
-       cbdata.cc \
+       tests/stub_cbdata.cc \
        fatal.h \
        tests/stub_fatal.cc \
-       MemBuf.cc \
+       tests/stub_MemBuf.cc \
        StatHist.cc \
        StatHist.h \
        String.cc \
@@ -3747,8 +3813,7 @@ tests_testStatHist_SOURCES = \
        tests/stub_tools.cc \
        tests/testMain.cc \
        tests/testStatHist.cc \
-       tests/testStatHist.h \
-       time.cc
+       tests/testStatHist.h
 nodist_tests_testStatHist_SOURCES = \
        $(TESTSOURCES)
 tests_testStatHist_LDFLAGS = $(LIBADD_DL)
@@ -3764,8 +3829,7 @@ tests_testStatHist_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
 tests_testVector_SOURCES = \
        tests/testVector.cc \
        tests/testMain.cc \
-       tests/testVector.h \
-       time.cc
+       tests/testVector.h
 nodist_tests_testVector_SOURCES = \
        $(TESTSOURCES)
 tests_testVector_LDADD= \