=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-02-03 10:59:09 +0000
+++ src/Makefile.am	2011-02-04 15:58:44 +0000
@@ -174,10 +174,7 @@
 	base/libbase.la \
 	libsquid.la \
 	ip/libip.la \
-	fs/libfs.la \
-	ipc/libipc.la \
-	mgr/libmgr.la \
-	$(SNMP_LIBS)
+	fs/libfs.la
 
 EXTRA_PROGRAMS = \
 	DiskIO/DiskDaemon/diskd \
@@ -539,6 +536,9 @@
 
 squid_LDADD = \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	comm/libcomm.la \
 	eui/libeui.la \
 	icmp/libicmp.la icmp/libicmp-core.la \
@@ -571,7 +571,10 @@
 	${ADAPTATION_LIBS} \
 	$(ESI_LOCAL_LIBS) \
 	$(SSL_LIBS) \
-	$(COMMON_LIBS)
+	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS)
 
 if USE_LOADABLE_MODULES
 squid_SOURCES += $(LOADABLE_MODULES_SOURCES)
@@ -1269,6 +1272,9 @@
 # comm.cc only requires comm/libcomm.la until fdc_table is dead.
 tests_testCacheManager_LDADD = \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	comm/libcomm.la \
 	icmp/libicmp.la icmp/libicmp-core.la \
 	log/liblog.la \
@@ -1294,14 +1300,17 @@
 
 tests_testDiskIO_SOURCES = \
 	$(SWAP_TEST_SOURCES) \
+	BodyPipe.cc \
+	cache_manager.cc \
 	tests/testDiskIO.cc \
 	tests/testDiskIO.h \
 	tests/testMain.cc \
-	tests/stub_cache_manager.cc \
 	tests/stub_HelperChildConfig.cc \
-	tests/stub_Port.cc \
-	tests/stub_TypedMsgHdr.cc \
-	tests/stub_UdsOp.cc
+	tests/stub_ipc_Forwarder.cc \
+	tests/stub_ipcache.cc \
+	tests/stub_net_db.cc \
+	tests/stub_main_cc.cc \
+	tests/stub_snmp_core.cc
 nodist_tests_testDiskIO_SOURCES= \
 	$(SWAP_TEST_GEN_SOURCES) \
 	SquidMath.cc \
@@ -1312,6 +1321,9 @@
 	CommCalls.o \
 	DnsLookupDetails.o \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	$(REPL_OBJS) \
 	$(DISK_LIBS) \
 	$(DISK_OS_LIBS) \
@@ -1321,6 +1333,7 @@
 	$(top_builddir)/lib/libmiscutil.la \
 	$(REGEXLIB) \
 	$(SQUID_CPPUNIT_LIBS) \
+	$(SNMPLIB) \
 	$(SSLLIB) \
 	$(COMPAT_LIB) \
 	$(XTRA_LIBS)
@@ -1470,6 +1483,9 @@
 	$(BUILT_SOURCES)
 tests_testEvent_LDADD = \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	icmp/libicmp.la icmp/libicmp-core.la \
 	comm/libcomm.la \
 	log/liblog.la \
@@ -1631,6 +1647,9 @@
 	$(BUILT_SOURCES)
 tests_testEventLoop_LDADD = \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	icmp/libicmp.la icmp/libicmp-core.la \
 	comm/libcomm.la \
 	log/liblog.la \
@@ -1787,6 +1806,9 @@
 	$(BUILT_SOURCES)
 tests_test_http_range_LDADD = \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	icmp/libicmp.la icmp/libicmp-core.la \
 	comm/libcomm.la \
 	log/liblog.la \
@@ -1948,6 +1970,9 @@
 	$(BUILT_SOURCES)
 tests_testHttpRequest_LDADD = \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	icmp/libicmp.la icmp/libicmp-core.la \
 	comm/libcomm.la \
 	log/liblog.la \
@@ -2046,6 +2071,9 @@
 
 tests_testStore_LDADD= \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	$(top_builddir)/lib/libmisccontainers.la \
 	$(top_builddir)/lib/libmiscencoding.la \
 	$(top_builddir)/lib/libmiscutil.la \
@@ -2149,6 +2177,9 @@
 	CommCalls.o \
 	DnsLookupDetails.o \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	$(REPL_OBJS) \
 	$(DISK_LIBS) \
 	$(DISK_OS_LIBS) \
@@ -2182,6 +2213,9 @@
 	libsquid.la \
 	$(REGEXLIB) \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+        mgr/libmgr.la \
+        $(SNMP_LIBS) \
 	$(REPL_OBJS) \
 	$(DISK_LIBS) \
 	$(DISK_OS_LIBS) \
@@ -2207,6 +2241,9 @@
 tests_testNull_LDADD = \
 	$(REGEXLIB) \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	$(REPL_OBJS) \
 	$(DISK_LIBS) \
 	$(DISK_OS_LIBS) \
@@ -2361,6 +2398,9 @@
 	$(BUILT_SOURCES)
 tests_testURL_LDADD = \
 	$(COMMON_LIBS) \
+	ipc/libipc.la \
+	mgr/libmgr.la \
+	$(SNMP_LIBS) \
 	icmp/libicmp.la icmp/libicmp-core.la \
 	comm/libcomm.la \
 	log/liblog.la \

=== modified file 'src/tests/stub_DelayId.cc'
--- src/tests/stub_DelayId.cc	2010-11-27 06:44:33 +0000
+++ src/tests/stub_DelayId.cc	2011-02-04 16:14:55 +0000
@@ -46,4 +46,15 @@
 
 DelayId::~DelayId() {}
 
+int DelayId::bytesWanted(int, int) const
+{
+    fatal ("Not implemented");
+    return -1;
+}
+
+void DelayId::setNoDelay(bool)
+{
+    fatal ("Not Implemented");
+}
+
 #endif /* USE_DELAY_POOLS */

=== added file 'src/tests/stub_client_db.cc'
--- src/tests/stub_client_db.cc	1970-01-01 00:00:00 +0000
+++ src/tests/stub_client_db.cc	2011-02-03 21:48:46 +0000
@@ -0,0 +1,9 @@
+#include "squid.h"
+#include "ip/Address.h"
+
+int
+clientdbEstablished(const Ip::Address &addr, int delta)
+{
+    fatal ("Not Implemented");
+    return -1;
+}

=== modified file 'src/tests/stub_comm.cc'
--- src/tests/stub_comm.cc	2011-01-10 09:43:43 +0000
+++ src/tests/stub_comm.cc	2011-02-04 12:55:21 +0000
@@ -36,6 +36,7 @@
 #include "comm.h"
 #include "comm/Loops.h"
 #include "CommRead.h"
+#include "comm/Write.h"
 #include "fde.h"
 
 DeferredReadManager::~DeferredReadManager()
@@ -181,3 +182,69 @@
 {
     fatal ("Not implemented");
 }
+
+void
+comm_remove_close_handler(int fd, PF * handler, void *data)
+{
+    fatal ("Not implemented");
+}
+
+void
+comm_add_close_handler(int fd, AsyncCall::Pointer &call)
+{
+     fatal ("Not implemented");
+}
+
+void
+comm_add_close_handler(int fd, PF * handler, void *data)
+{
+    fatal ("Not implemented");
+}
+
+void
+comm_remove_close_handler(int fd, AsyncCall::Pointer &call)
+{
+     fatal("Not implemented");
+}
+
+void
+comm_import_opened(int fd,
+                   Ip::Address &addr,
+                   int flags,
+                   const char *note,
+                   struct addrinfo *AI)
+{
+     fatal("Not implemented");
+}
+
+int
+comm_open_listener(int sock_type,
+                   int proto,
+                   Ip::Address &addr,
+                   int flags,
+                   const char *note)
+{
+     fatal("Not implemented");
+     return -1;
+}
+
+void Comm::Write(int, MemBuf*, RefCount<AsyncCall>&)
+{
+    fatal("Not implemented");
+}
+
+void Comm::Write(int fd, const char *buf, int size, AsyncCall::Pointer &callback, FREE *free_func)
+{
+    fatal("Not implemented");
+}
+
+
+int
+comm_udp_sendto(int fd,
+                const Ip::Address &to_addr,
+                const void *buf,
+                int len)
+{
+    fatal("Not implemented");
+    return -1;
+}

=== modified file 'src/tests/stub_errorpage.cc'
--- src/tests/stub_errorpage.cc	2010-11-20 11:31:38 +0000
+++ src/tests/stub_errorpage.cc	2011-02-04 12:41:18 +0000
@@ -48,6 +48,25 @@
     fatal("Not implemented");
 }
 
+ErrorState *
+errorCon(err_type type, http_status status, HttpRequest * request)
+{
+    fatal("Not implemented");
+    return NULL;
+}
+
+HttpReply *
+ErrorState::BuildHttpReply()
+{
+    fatal("Not implemented");
+    return NULL;
+}
+
+void
+errorStateFree(ErrorState * err)
+{
+    fatal("Not implemented");
+}
 /*
  * DO NOT MODIFY:
  * arch-tag: e4c72cfd-0b31-4497-90e6-0e3cda3b92b4

=== modified file 'src/tests/stub_fd.cc'
--- src/tests/stub_fd.cc	2009-12-31 02:35:01 +0000
+++ src/tests/stub_fd.cc	2011-02-03 21:44:49 +0000
@@ -65,3 +65,16 @@
 {
     fatal ("Not Implemented");
 }
+
+void
+fdAdjustReserved(void)
+{
+    fatal ("Not Implemented");
+}
+
+int
+fdUsageHigh(void)
+{
+    fatal ("Not Implemented");
+    return -1;
+}

=== modified file 'src/tests/stub_ipc_Forwarder.cc'
--- src/tests/stub_ipc_Forwarder.cc	2011-02-03 10:59:09 +0000
+++ src/tests/stub_ipc_Forwarder.cc	2011-02-04 09:43:31 +0000
@@ -1,7 +1,13 @@
 #include "ipc/Forwarder.h"
+#include "ipc/Coordinator.h"
 
 //Avoid linker errors about Ipc::Forwarder
 void foo_stub_ipc_forwarder()
 {
     Ipc::Forwarder foo(NULL,1.0);
 }
+
+void foo_stup_coordi()
+{
+    Ipc::Coordinator cord;
+}

=== added file 'src/tests/stub_ipcache.cc'
--- src/tests/stub_ipcache.cc	1970-01-01 00:00:00 +0000
+++ src/tests/stub_ipcache.cc	2011-02-03 21:38:52 +0000
@@ -0,0 +1,32 @@
+#include "squid.h"
+#include "ip/Address.h"
+
+void
+ipcacheMarkGoodAddr(const char *name, const Ip::Address &addr)
+{
+     fatal ("Not implemented");
+}
+
+void
+ipcacheMarkBadAddr(const char *name, const Ip::Address &addr)
+{
+     fatal ("Not implemented");
+}
+
+void
+ipcacheMarkAllGood(const char *name)
+{
+     fatal ("Not implemented");
+}
+
+void
+ipcacheCycleAddr(const char *name, ipcache_addrs * ia)
+{
+     fatal ("Not implemented");
+}
+
+void
+ipcache_nbgethostbyname(const char *name, IPH * handler, void *handlerData)
+{
+     fatal ("Not implemented");
+}

=== added file 'src/tests/stub_net_db.cc'
--- src/tests/stub_net_db.cc	1970-01-01 00:00:00 +0000
+++ src/tests/stub_net_db.cc	2011-02-03 21:59:38 +0000
@@ -0,0 +1,9 @@
+#include "squid.h"
+#include "ip/Address.h"
+#include "icmp/net_db.h"
+
+void
+netdbDeleteAddrNetwork(Ip::Address &addr)
+{
+    fatal ("Not implemented");
+}

=== added file 'src/tests/stub_snmp_core.cc'
--- src/tests/stub_snmp_core.cc	1970-01-01 00:00:00 +0000
+++ src/tests/stub_snmp_core.cc	2011-02-04 12:52:35 +0000
@@ -0,0 +1,9 @@
+#include "squid.h"
+#include "snmp_core.h"
+
+AggrType
+snmpAggrType(oid* Current, snint CurrentLen)
+{
+    fatal("Not implemented");
+    return atNone;
+}

=== modified file 'src/tests/stub_store_client.cc'
--- src/tests/stub_store_client.cc	2009-01-21 03:47:47 +0000
+++ src/tests/stub_store_client.cc	2011-02-04 12:05:13 +0000
@@ -106,3 +106,26 @@
     return type;
 }
 
+store_client *
+storeClientListAdd(StoreEntry * e, void *data)
+{
+    fatal ("Not implemented");
+    return NULL;
+}
+
+int
+storeUnregister(store_client * sc, StoreEntry * e, void *data)
+{
+    fatal ("Not implemented");
+    return -1;
+}
+
+void
+storeClientCopy(store_client * sc,
+                StoreEntry * e,
+                StoreIOBuffer copyInto,
+                STCB * callback,
+                void *data)
+{
+    fatal ("Not implemented");
+}

=== modified file 'src/tests/stub_tools.cc'
--- src/tests/stub_tools.cc	2010-10-28 18:52:59 +0000
+++ src/tests/stub_tools.cc	2011-02-04 12:45:51 +0000
@@ -54,3 +54,36 @@
     assert(dst);
     return memset(dst, val, sz);
 }
+
+bool
+UsingSmp()
+{
+    fatal ("Not implemented");
+    return false;
+}
+
+bool
+IamPrimaryProcess()
+{
+    fatal ("Not implemented");
+    return false;
+}
+
+bool
+IamWorkerProcess()
+{
+    fatal ("Not implemented");
+    return false;
+}
+
+void
+enter_suid(void)
+{
+    fatal ("Not implemented");
+}
+
+void
+leave_suid(void)
+{
+    fatal ("Not implemented");
+}