From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Wed, 17 Aug 2011 23:59:03 +0000 (+0400)
Subject: Fix make check and make distcheck.
X-Git-Tag: take08~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba465675fd53ae19a87468ab5d28f4adc3e0d42a;p=thirdparty%2Fsquid.git

Fix make check and make distcheck.

Mostly Makefile changes.  Libcomm stub moved to tests/ directory
to allow using it on Makefile.am *_SOURCES instead of directly
#including it in test sources.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 8e10d9681d..d1f372911c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2083,7 +2083,9 @@ tests_testHttpParser_SOURCES = \
 	MemBuf.cc \
 	MemBuf.h \
 	mem.cc \
+	String.cc \
 	structs.h \
+	tests/stub_cache_cf.cc \
 	tests/stub_cache_manager.cc \
 	tests/stub_debug.cc \
 	tests/stub_event.cc \
@@ -2091,7 +2093,8 @@ tests_testHttpParser_SOURCES = \
 	tests/testHttpParser.cc \
 	tests/testHttpParser.h \
 	tests/testMain.cc \
-	time.cc
+	time.cc \
+	wordlist.cc
 nodist_tests_testHttpParser_SOURCES = \
 	$(TESTSOURCES)
 tests_testHttpParser_LDADD= \
@@ -2352,6 +2355,7 @@ tests_testStore_SOURCES= \
 	tests/stub_http.cc \
 	tests/stub_HttpReply.cc \
 	tests/stub_HttpRequest.cc \
+	tests/stub_libcomm.cc \
 	tests/stub_MemObject.cc \
 	tests/stub_MemStore.cc \
 	tests/stub_mime.cc \
@@ -2657,6 +2661,7 @@ tests_testRock_SOURCES = \
 	tests/stub_http.cc \
 	tests/stub_HttpReply.cc \
 	tests/stub_HttpRequest.cc \
+	tests/stub_libcomm.cc \
 	tests/stub_MemStore.cc \
 	tests/stub_mime.cc \
 	tests/stub_Port.cc \
@@ -2706,10 +2711,12 @@ tests_testCoss_SOURCES = \
 	tests/testMain.cc \
 	tests/testCoss.h \
 	tests/stub_cache_manager.cc \
+	tests/stub_client_db.cc \
 	tests/stub_debug.cc \
 	tests/stub_HelperChildConfig.cc \
 	tests/stub_internal.cc \
-	tests/stub_CommIO.cc \
+	tests/stub_ipc.cc \
+	tests/stub_pconn.cc \
 	tests/stub_store_rebuild.cc \
 	fd.cc \
 	disk.cc \
@@ -2754,7 +2761,6 @@ tests_testCoss_SOURCES = \
 	tests/stub_helper.cc \
 	cbdata.cc \
 	String.cc \
-	tests/stub_comm.cc \
 	tests/stub_client_side_request.cc \
 	tests/stub_http.cc \
 	mem_node.cc \
@@ -2808,6 +2814,7 @@ tests_testCoss_LDADD = \
 	$(AUTH_LIBS) \
 	acl/libapi.la \
 	libsquid.la \
+	comm/libcomm.la \
 	ip/libip.la \
 	fs/libfs.la \
 	mgr/libmgr.la \
@@ -2815,7 +2822,7 @@ tests_testCoss_LDADD = \
 	$(DISK_LIBS) \
 	$(DISK_OS_LIBS) \
 	$(COMMON_LIBS) \
-	libsquid.la \
+	$(SSL_LIBS) \
 	acl/libapi.la \
 	ipc/libipc.la \
 	base/libbase.la \
diff --git a/src/comm/Makefile.am b/src/comm/Makefile.am
index 2ed340dc9d..0ba83c14ad 100644
--- a/src/comm/Makefile.am
+++ b/src/comm/Makefile.am
@@ -27,5 +27,3 @@ libcomm_la_SOURCES= \
 	Write.h \
 	\
 	comm_internal.h
-
-EXTRA_DIST= stub_libcomm.cc
diff --git a/src/comm/stub_libcomm.cc b/src/tests/stub_libcomm.cc
similarity index 98%
rename from src/comm/stub_libcomm.cc
rename to src/tests/stub_libcomm.cc
index 3a85d92671..653947b430 100644
--- a/src/comm/stub_libcomm.cc
+++ b/src/tests/stub_libcomm.cc
@@ -5,7 +5,7 @@
 #define STUB_API "comm/libcomm.la"
 #include "tests/STUB.h"
 
-#include "AcceptLimiter.h"
+#include "comm/AcceptLimiter.h"
 Comm::AcceptLimiter dummy;
 Comm::AcceptLimiter & Comm::AcceptLimiter::Instance() STUB_RETVAL(dummy)
 void Comm::AcceptLimiter::defer(Comm::TcpAcceptor *afd) STUB
diff --git a/src/tests/testStore.cc b/src/tests/testStore.cc
index 2d0fc3d8f9..0382776fe6 100644
--- a/src/tests/testStore.cc
+++ b/src/tests/testStore.cc
@@ -6,9 +6,6 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testStore );
 
-// Stubs so this test will link cleanly
-#include "comm/stub_libcomm.cc"
-
 int
 TestStore::callback()
 {