Merge from trunk

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 8f8d5284709e7d35cb200538baa342732500b1d5..b0e3b0ef0c9621bb8a391ee912edbd8247edef6c 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,14 +25,29 @@ 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 \
        LoadableModules.h \
        LoadableModules.cc
 
-SUBDIRS        = base anyp comm eui acl format fs repl
-DIST_SUBDIRS = base anyp comm eui acl format fs repl
+SUBDIRS        = base anyp parser comm eui acl format fs repl
+DIST_SUBDIRS = base anyp parser comm eui acl format fs repl
 
 if ENABLE_AUTH
 SUBDIRS += auth
@@ -297,6 +313,8 @@ squid_SOURCES = \
        ClientRequestContext.h \
        clientStream.cc \
        clientStream.h \
+       CollapsedForwarding.cc \
+       CollapsedForwarding.h \
        CompletionDispatcher.cc \
        CompletionDispatcher.h \
        CommRead.h \
@@ -390,16 +408,12 @@ squid_SOURCES = \
        HttpControlMsg.h \
        HttpMsg.cc \
        HttpMsg.h \
-       HttpParser.cc \
-       HttpParser.h \
        HttpReply.cc \
        HttpReply.h \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
        HttpRequest.h \
-       HttpRequestMethod.cc \
-       HttpRequestMethod.h \
        ICP.h \
        icp_opcode.h \
        icp_v2.cc \
@@ -427,7 +441,7 @@ squid_SOURCES = \
        MemBuf.cc \
        MemObject.cc \
        MemObject.h \
-       MessageCounters.h \
+       MessageSizes.h \
        mime.h \
        mime.cc \
        mime_header.h \
@@ -436,8 +450,8 @@ squid_SOURCES = \
        multicast.cc \
        neighbors.h \
        neighbors.cc \
-       Notes.cc \
        Notes.h \
+       Notes.cc \
        Packer.cc \
        Packer.h \
        Parsing.cc \
@@ -466,6 +480,8 @@ squid_SOURCES = \
        send-announce.h \
        send-announce.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       SBufDetailedStats.cc \
        SBufStatsAction.h \
        SBufStatsAction.cc \
        $(SNMP_SOURCE) \
@@ -509,21 +525,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 \
@@ -534,6 +538,8 @@ squid_SOURCES = \
        swap_log_op.h \
        SwapDir.cc \
        SwapDir.h \
+       Transients.cc \
+       Transients.h \
        MemStore.cc \
        MemStore.h \
        time.cc \
@@ -545,8 +551,6 @@ squid_SOURCES = \
        $(UNLINKDSOURCE) \
        url.cc \
        URL.h \
-       URLScheme.cc \
-       URLScheme.h \
        urn.h \
        urn.cc \
        wccp.h \
@@ -581,7 +585,6 @@ noinst_HEADERS = \
        client_side_request.cci \
        MemBuf.cci \
        MemBuf.h \
-       Store.cci \
        StoreEntryStream.h \
        String.cci \
        SquidString.h \
@@ -618,6 +621,7 @@ squid_LDADD = \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        mgr/libmgr.la \
        anyp/libanyp.la \
@@ -635,8 +639,8 @@ squid_LDADD = \
        $(REGEXLIB) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
-       $(SSL_LIBS) \
        $(SNMP_LIBS) \
+       parser/libsquid-parser.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -724,28 +728,22 @@ 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 \
        HelperChildConfig.h \
        tests/stub_HelperChildConfig.cc \
-       HttpRequestMethod.cc \
+       http/RequestMethod.cc \
        RemovalPolicy.cc \
        $(WIN32_SOURCE) \
        fd.h \
        tests/stub_fd.cc
 ufsdump_LDADD = \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        eui/libeui.la \
@@ -767,12 +765,10 @@ ufsdump_LDADD = \
        $(MINGW_LIBS) \
        $(XTRA_LIBS)
 ufsdump_DEPENDENCIES = \
-       $(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 \
@@ -925,7 +921,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)
@@ -1069,16 +1065,16 @@ check_PROGRAMS+=\
        tests/testEvent \
        tests/testEventLoop \
        tests/test_http_range \
-       tests/testHttpParser \
+       tests/testHttp1Parser \
        tests/testHttpReply \
        tests/testHttpRequest \
        tests/testStore \
        tests/testString \
        tests/testURL \
        tests/testSBuf \
+       tests/testSBufList \
        tests/testConfigParser \
-       tests/testStatHist \
-       tests/testVector
+       tests/testStatHist
 
 if HAVE_FS_ROCK
 check_PROGRAMS += tests/testRock
@@ -1118,7 +1114,7 @@ tests_testHttpReply_SOURCES=\
        cbdata.cc \
        cbdata.h \
        ConfigParser.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        fatal.h \
        tests/stub_fatal.cc \
        HttpBody.h \
@@ -1146,17 +1142,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 \
@@ -1170,6 +1171,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 \
@@ -1183,9 +1185,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=\
@@ -1196,7 +1197,6 @@ tests_testHttpReply_LDADD=\
        acl/libacls.la \
        acl/libapi.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        anyp/libanyp.la \
        ip/libip.la \
        base/libbase.la \
@@ -1214,11 +1214,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 \
@@ -1241,7 +1242,6 @@ tests_testACLMaxUserIP_SOURCES= \
        HttpHdrSc.cc \
        HttpHdrScTarget.cc \
        HttpMsg.cc \
-       HttpRequestMethod.cc \
        int.h \
        int.cc \
        MasterXaction.cc \
@@ -1261,23 +1261,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 \
@@ -1293,6 +1292,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 \
@@ -1304,6 +1304,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 \
@@ -1315,13 +1316,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
@@ -1334,7 +1333,6 @@ tests_testACLMaxUserIP_LDADD= \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        anyp/libanyp.la \
        base/libbase.la \
@@ -1361,7 +1359,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= \
@@ -1376,16 +1374,12 @@ tests_testBoilerplate_DEPENDENCIES = \
 ## Tests of the CacheManager module.
 tests_testCacheManager_SOURCES = \
        AccessLogEntry.cc \
-       $(ACL_REGISTRATION_SOURCES) \
        debug.cc \
-       HttpParser.cc \
-       HttpParser.h \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        String.cc \
        tests/testCacheManager.cc \
        tests/testCacheManager.h \
@@ -1393,6 +1387,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 \
@@ -1403,9 +1398,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 \
@@ -1416,6 +1411,7 @@ tests_testCacheManager_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -1430,7 +1426,7 @@ tests_testCacheManager_SOURCES = \
        dlink.cc \
        $(DNSSOURCE) \
        errorpage.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        event.cc \
        external_acl.cc \
        ExternalACLEntry.cc \
@@ -1490,7 +1486,6 @@ tests_testCacheManager_SOURCES = \
        multicast.h \
        multicast.cc \
        mem_node.cc \
-       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -1518,6 +1513,9 @@ tests_testCacheManager_SOURCES = \
        refresh.cc \
        RemovalPolicy.cc \
        Server.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -1529,13 +1527,15 @@ tests_testCacheManager_SOURCES = \
        StatHist.h \
        StrList.h \
        StrList.cc \
+       tests/stub_libauth_acls.cc \
+       tests/stub_libauth.cc \
        tests/stub_StatHist.cc \
        stmem.cc \
        repl_modules.h \
        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 \
@@ -1550,28 +1550,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 \
@@ -1582,11 +1577,9 @@ 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 \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -1624,17 +1617,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 \
@@ -1662,7 +1656,6 @@ tests_testDiskIO_SOURCES = \
        HttpHeader.cc \
        HttpMsg.cc \
        HttpReply.cc \
-       HttpRequestMethod.cc \
        int.h \
        int.cc \
        SquidList.h \
@@ -1673,7 +1666,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 \
@@ -1686,15 +1681,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 \
@@ -1707,7 +1700,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 \
@@ -1729,6 +1723,8 @@ 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 \
        tests/stub_libicmp.cc \
@@ -1737,6 +1733,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 \
@@ -1747,10 +1744,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 \
@@ -1767,11 +1763,9 @@ tests_testDiskIO_LDADD = \
        SquidConfig.o \
        CommCalls.o \
        DnsLookupDetails.o \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        libsquid.la \
        comm/libcomm.la \
        anyp/libanyp.la \
@@ -1783,9 +1777,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 \
@@ -1804,10 +1798,9 @@ tests_testDiskIO_DEPENDENCIES = \
 ## Tests of the Even module.
 tests_testEvent_SOURCES = \
        AccessLogEntry.cc \
-       $(ACL_REGISTRATION_SOURCES) \
        BodyPipe.cc \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        cache_cf.h \
        AuthReg.h \
        YesNoNone.h \
@@ -1816,7 +1809,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 \
@@ -1827,6 +1820,7 @@ tests_testEvent_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -1842,7 +1836,7 @@ tests_testEvent_SOURCES = \
        dlink.cc \
        $(DNSSOURCE) \
        errorpage.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        event.cc \
        EventLoop.h \
        EventLoop.cc \
@@ -1888,13 +1882,10 @@ tests_testEvent_SOURCES = \
        HttpHdrSc.cc \
        HttpHdrScTarget.cc \
        HttpMsg.cc \
-       HttpParser.cc \
-       HttpParser.h \
        HttpReply.cc \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -1908,9 +1899,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 \
@@ -1942,6 +1932,9 @@ tests_testEvent_SOURCES = \
        Server.cc \
        StrList.h \
        StrList.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.cc \
        SquidMath.h \
@@ -1957,7 +1950,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 \
@@ -1972,38 +1965,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
@@ -2012,11 +2002,9 @@ 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 \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -2054,10 +2042,9 @@ tests_testEvent_DEPENDENCIES = \
 ## Tests of the EventLoop module.
 tests_testEventLoop_SOURCES = \
        AccessLogEntry.cc \
-       $(ACL_REGISTRATION_SOURCES) \
        BodyPipe.cc \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        cache_manager.cc \
        cache_cf.h \
        AuthReg.h \
@@ -2066,7 +2053,7 @@ tests_testEventLoop_SOURCES = \
        RefreshPattern.h \
        cache_cf.cc \
        carp.h \
-       carp.cc \
+       tests/stub_carp.cc \
        cbdata.cc \
        ChunkedCodingParser.cc \
        client_db.h \
@@ -2077,6 +2064,7 @@ tests_testEventLoop_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -2092,7 +2080,7 @@ tests_testEventLoop_SOURCES = \
        dlink.cc \
        $(DNSSOURCE) \
        errorpage.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        EventLoop.h \
        EventLoop.cc \
        event.cc \
@@ -2138,13 +2126,10 @@ tests_testEventLoop_SOURCES = \
        HttpHdrSc.cc \
        HttpHdrScTarget.cc \
        HttpMsg.cc \
-       HttpParser.cc \
-       HttpParser.h \
        HttpReply.cc \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -2157,11 +2142,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 \
@@ -2190,6 +2174,9 @@ tests_testEventLoop_SOURCES = \
        refresh.h \
        refresh.cc \
        Server.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -2206,7 +2193,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 \
@@ -2221,39 +2208,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
@@ -2262,11 +2246,9 @@ 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 \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -2303,7 +2285,6 @@ tests_testEventLoop_DEPENDENCIES = \
 
 tests_test_http_range_SOURCES = \
        AccessLogEntry.cc \
-       $(ACL_REGISTRATION_SOURCES) \
        BodyPipe.cc \
        cache_cf.h \
        AuthReg.h \
@@ -2313,9 +2294,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 \
@@ -2326,6 +2307,7 @@ tests_test_http_range_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -2341,12 +2323,11 @@ tests_test_http_range_SOURCES = \
        dlink.cc \
        $(DNSSOURCE) \
        errorpage.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        event.cc \
-       external_acl.cc \
-       ExternalACLEntry.cc \
        FadingCounter.cc \
        fatal.h \
+       tests/stub_libauth.cc \
        tests/stub_fatal.cc \
        fd.h \
        fd.cc \
@@ -2385,13 +2366,10 @@ tests_test_http_range_SOURCES = \
        HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpMsg.cc \
-       HttpParser.cc \
-       HttpParser.h \
        HttpReply.cc \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
        icp_v2.cc \
        icp_v3.cc \
        int.h \
@@ -2404,11 +2382,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 \
@@ -2437,6 +2414,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 \
@@ -2452,7 +2432,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 \
@@ -2467,37 +2447,34 @@ 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 \
        tests/stub_libeui.cc \
        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
@@ -2506,11 +2483,9 @@ nodist_tests_test_http_range_SOURCES = \
        $(DISKIO_GEN_SOURCE)
 tests_test_http_range_LDADD = \
        http/libsquid-http.la \
-       $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        libsquid.la \
        ip/libip.la \
@@ -2544,34 +2519,43 @@ tests_test_http_range_LDFLAGS = $(LIBADD_DL)
 tests_test_http_range_DEPENDENCIES = \
        $(SQUID_CPPUNIT_LA)
 
-tests_testHttpParser_SOURCES = \
+tests_testHttp1Parser_SOURCES = \
        Debug.h \
-       HttpParser.cc \
-       HttpParser.h \
        MemBuf.cc \
        MemBuf.h \
+       tests/stub_MemObject.cc \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
+       mime_header.cc \
+       mime_header.h \
        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/testHttp1Parser.cc \
+       tests/testHttp1Parser.h \
        tests/testMain.cc \
-       time.cc \
+       tests/stub_time.cc \
        wordlist.h \
        wordlist.cc
-nodist_tests_testHttpParser_SOURCES = \
+nodist_tests_testHttp1Parser_SOURCES = \
        $(TESTSOURCES)
-tests_testHttpParser_LDADD= \
+tests_testHttp1Parser_LDADD= \
        http/libsquid-http.la \
+       anyp/libanyp.la \
        SquidConfig.o \
        base/libbase.la \
        ip/libip.la \
@@ -2579,22 +2563,18 @@ tests_testHttpParser_LDADD= \
        $(SQUID_CPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
-tests_testHttpParser_LDFLAGS = $(LIBADD_DL)
-tests_testHttpParser_DEPENDENCIES = \
+tests_testHttp1Parser_LDFLAGS = $(LIBADD_DL)
+tests_testHttp1Parser_DEPENDENCIES = \
        $(SQUID_CPPUNIT_LA)
 
 ## Tests of the HttpRequest module.
 tests_testHttpRequest_SOURCES = \
        AccessLogEntry.cc \
-       $(ACL_REGISTRATION_SOURCES) \
-       HttpParser.cc \
-       HttpParser.h \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
        Mem.h \
-       mem.cc \
+       tests/stub_mem.cc \
        String.cc \
        tests/testHttpRequest.h \
        tests/testHttpRequest.cc \
@@ -2602,10 +2582,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 \
@@ -2617,9 +2599,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 \
@@ -2630,6 +2612,7 @@ tests_testHttpRequest_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -2643,7 +2626,7 @@ tests_testHttpRequest_SOURCES = \
        dlink.cc \
        $(DNSSOURCE) \
        errorpage.cc \
-       ETag.cc \
+       tests/stub_ETag.cc \
        external_acl.cc \
        ExternalACLEntry.cc \
        fatal.h \
@@ -2699,7 +2682,6 @@ tests_testHttpRequest_SOURCES = \
        multicast.h \
        multicast.cc \
        mem_node.cc \
-       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -2722,11 +2704,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 \
@@ -2742,7 +2728,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 \
@@ -2757,30 +2743,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 \
@@ -2788,15 +2769,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 \
@@ -2810,7 +2790,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 \
@@ -2831,9 +2810,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) \
@@ -2862,7 +2842,6 @@ tests_testStore_SOURCES= \
        HttpHeader.h \
        HttpHeader.cc \
        HttpMsg.cc \
-       HttpRequestMethod.cc \
        RequestFlags.cc \
        RequestFlags.h \
        int.h \
@@ -2872,10 +2851,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 \
@@ -2892,16 +2873,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 \
@@ -2925,6 +2904,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 \
@@ -2936,12 +2916,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 \
@@ -2957,9 +2939,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
 
@@ -2971,20 +2952,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 \
@@ -3005,9 +2984,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 \
@@ -3019,7 +3001,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 = \
@@ -3041,11 +3023,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 \
@@ -3062,10 +3042,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 \
@@ -3073,6 +3056,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 \
@@ -3096,18 +3080,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 \
@@ -3117,7 +3099,7 @@ tests_testUfs_SOURCES = \
        event.cc \
        $(DELAY_POOL_SOURCE) \
        CacheDigest.h \
-       CacheDigest.cc \
+       tests/stub_CacheDigest.cc \
        ConfigParser.cc \
        EventLoop.cc \
        HttpMsg.cc \
@@ -3125,7 +3107,6 @@ tests_testUfs_SOURCES = \
        store_dir.cc \
        repl_modules.h \
        store.cc \
-       HttpRequestMethod.cc \
        store_key_md5.h \
        store_key_md5.cc \
        Parsing.cc \
@@ -3137,10 +3118,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 \
@@ -3183,7 +3168,6 @@ tests_testUfs_SOURCES = \
        tests/testStoreSupport.cc \
        tests/testStoreSupport.h \
        time.cc \
-       URLScheme.cc \
        wordlist.h \
        wordlist.cc \
        $(DISKIO_SOURCE)
@@ -3198,11 +3182,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 \
@@ -3213,8 +3195,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 \
@@ -3248,7 +3230,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 \
@@ -3257,7 +3241,7 @@ tests_testRock_SOURCES = \
        EventLoop.cc \
        event.cc \
        fatal.h \
-       tests/stub_fatal.cc \
+       fatal.cc \
        fd.h \
        fd.cc \
        fde.h \
@@ -3279,7 +3263,6 @@ tests_testRock_SOURCES = \
        HttpHeaderTools.cc \
        HttpMsg.cc \
        HttpReply.cc \
-       HttpRequestMethod.cc \
        int.h \
        int.cc \
        SquidList.h \
@@ -3291,6 +3274,8 @@ tests_testRock_SOURCES = \
        MemBuf.cc \
        MemObject.cc \
        mem_node.cc \
+       Notes.h \
+       Notes.cc \
        Packer.cc \
        Parsing.cc \
        RemovalPolicy.cc \
@@ -3302,16 +3287,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 \
@@ -3319,10 +3300,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 \
@@ -3342,6 +3328,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 \
@@ -3362,7 +3349,6 @@ tests_testRock_SOURCES = \
        tests/stub_tools.cc \
        time.cc \
        url.cc \
-       URLScheme.cc \
        wordlist.h \
        wordlist.cc \
        $(DELAY_POOL_SOURCE) \
@@ -3381,7 +3367,6 @@ tests_testRock_LDADD = \
        anyp/libanyp.la \
        ip/libip.la \
        fs/libfs.la \
-       $(AUTH_LIBS) \
        $(COMMON_LIBS) \
        $(REPL_OBJS) \
        $(DISK_LIBS) \
@@ -3389,9 +3374,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 \
@@ -3408,7 +3394,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 \
@@ -3416,11 +3401,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 \
@@ -3431,6 +3416,7 @@ tests_testURL_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -3489,13 +3475,10 @@ tests_testURL_SOURCES = \
        HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpMsg.cc \
-       HttpParser.cc \
-       HttpParser.h \
        HttpReply.cc \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -3511,9 +3494,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 \
@@ -3522,8 +3504,8 @@ tests_testURL_SOURCES = \
        mime_header.cc \
        neighbors.h \
        neighbors.cc \
-       Notes.cc \
        Notes.h \
+       Notes.cc \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -3541,6 +3523,9 @@ tests_testURL_SOURCES = \
        refresh.cc \
        RemovalPolicy.cc \
        Server.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -3556,7 +3541,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 \
@@ -3571,41 +3556,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 \
@@ -3615,17 +3598,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) \
@@ -3638,7 +3620,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 \
@@ -3661,8 +3642,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 \
@@ -3674,27 +3657,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 \
@@ -3710,7 +3742,6 @@ tests_testConfigParser_SOURCES = \
        tests/stub_HelperChildConfig.cc \
        tools.h \
        tests/stub_tools.cc \
-       time.cc \
        wordlist.h \
        wordlist.cc
 nodist_tests_testConfigParser_SOURCES = \
@@ -3730,10 +3761,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 \
@@ -3756,8 +3787,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)
@@ -3770,22 +3800,6 @@ tests_testStatHist_LDADD = \
        $(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
 
 ## Special Universal .h dependency test script