------------------------------------------------------------ revno: 13504 revision-id: squid3@treenet.co.nz-20140721053957-gtw2je6tkooslo27 parent: squid3@treenet.co.nz-20140718115117-5qw7n93nakl9zq8q committer: Amos Jeffries branch nick: trunk timestamp: Sun 2014-07-20 22:39:57 -0700 message: Fix various trunk unit test build issues ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140721053957-gtw2je6tkooslo27 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 70d9d0f2beca21cf0ea2e31ffc69bcdc25b94035 # timestamp: 2014-07-21 05:53:49 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140718115117-\ # 5qw7n93nakl9zq8q # # Begin patch === modified file 'src/Makefile.am' --- src/Makefile.am 2014-07-14 09:48:47 +0000 +++ src/Makefile.am 2014-07-21 05:39:57 +0000 @@ -1370,12 +1370,14 @@ tests/testBoilerplate.cc \ tests/testMain.cc \ tests/testBoilerplate.h \ + tests/stub_debug.cc \ tests/stub_time.cc nodist_tests_testBoilerplate_SOURCES = \ $(TESTSOURCES) tests_testBoilerplate_LDADD= \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ + base/libbase.la \ $(COMPAT_LIB) \ $(XTRA_LIBS) tests_testBoilerplate_LDFLAGS = $(LIBADD_DL) === modified file 'src/comm/ModPoll.cc' --- src/comm/ModPoll.cc 2014-07-14 09:48:47 +0000 +++ src/comm/ModPoll.cc 2014-07-21 05:39:57 +0000 @@ -196,7 +196,7 @@ static int fdIsTcpListen(int fd) { - for (const AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { + for (AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { if (s->listenConn != NULL && s->listenConn->fd == fd) return 1; } === modified file 'src/comm/ModSelect.cc' --- src/comm/ModSelect.cc 2014-07-14 09:48:47 +0000 +++ src/comm/ModSelect.cc 2014-07-21 05:39:57 +0000 @@ -197,7 +197,7 @@ static int fdIsTcpListener(int fd) { - for (const AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { + for (AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { if (s->listenConn != NULL && s->listenConn->fd == fd) return 1; } @@ -320,7 +320,7 @@ // XXX: only poll sockets that won't be deferred. But how do we identify them? - for (const AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { + for (AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { if (Comm::IsConnOpen(s->listenConn)) { fds[nfds] = s->listenConn->fd; ++nfds; === modified file 'src/comm/ModSelectWin32.cc' --- src/comm/ModSelectWin32.cc 2014-07-14 09:48:47 +0000 +++ src/comm/ModSelectWin32.cc 2014-07-21 05:39:57 +0000 @@ -191,7 +191,7 @@ static int fdIsTcpListener(int fd) { - for (const AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { + for (AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { if (s->listenConn != NULL && s->listenConn->fd == fd) return 1; } @@ -317,7 +317,7 @@ // XXX: only poll sockets that won't be deferred. But how do we identify them? - for (const AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { + for (AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { if (Comm::IsConnOpen(s->listenConn)) { fds[nfds] = s->listenConn->fd; ++nfds; === modified file 'src/icmp/Makefile.am' --- src/icmp/Makefile.am 2013-12-15 11:47:07 +0000 +++ src/icmp/Makefile.am 2014-07-21 05:39:57 +0000 @@ -114,6 +114,7 @@ $(SQUID_CPPUNIT_LA) \ libicmp-core.la \ ../ip/libip.la \ + ../base/libbase.la \ $(COMPAT_LIB) \ $(XTRA_LIBS) testIcmp_DEPENDENCIES= $(SQUID_CPPUNIT_LA) === modified file 'src/ip/Makefile.am' --- src/ip/Makefile.am 2012-01-07 10:15:40 +0000 +++ src/ip/Makefile.am 2014-07-21 05:39:57 +0000 @@ -28,6 +28,7 @@ $(top_srcdir)/src/tests/testMain.cc testIpAddress_LDADD= \ libip.la \ + ../base/libbase.la \ $(XTRA_LIBS) \ $(COMPAT_LIB) \ $(SQUID_CPPUNIT_LA) \ === modified file 'src/ssl/support.cc' --- src/ssl/support.cc 2014-07-14 09:48:47 +0000 +++ src/ssl/support.cc 2014-07-21 05:39:57 +0000 @@ -1774,7 +1774,7 @@ static bool isSslServer() { - if (HttpsPortList.valid()) + if (HttpsPortList != NULL) return true; for (AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) { === modified file 'test-suite/Makefile.am' --- test-suite/Makefile.am 2014-07-18 11:02:16 +0000 +++ test-suite/Makefile.am 2014-07-21 05:39:57 +0000 @@ -6,6 +6,7 @@ INCLUDES += -I$(srcdir) LDADD = \ + $(top_builddir)/src/base/libbase.la \ $(top_builddir)/src/globals.o \ $(top_builddir)/src/time.o \ $(top_builddir)/lib/libmiscutil.la \ @@ -77,7 +78,7 @@ ESIExpressions_LDADD = $(top_builddir)/src/esi/Expression.o \ $(LDADD) -mem_node_test_SOURCES = mem_node_test.cc +mem_node_test_SOURCES = mem_node_test.cc $(DEBUG_SOURCE) mem_node_test_LDADD = $(top_builddir)/src/mem_node.o $(LDADD) mem_hdr_test_SOURCES = mem_hdr_test.cc $(DEBUG_SOURCE) @@ -86,9 +87,9 @@ $(top_builddir)/src/mem_node.o \ $(LDADD) -MemPoolTest_SOURCES = MemPoolTest.cc +MemPoolTest_SOURCES = MemPoolTest.cc $(DEBUG_SOURCE) -splay_SOURCES = splay.cc +splay_SOURCES = splay.cc $(DEBUG_SOURCE) syntheticoperators_SOURCES = syntheticoperators.cc $(DEBUG_SOURCE) === modified file 'test-suite/mem_node_test.cc' --- test-suite/mem_node_test.cc 2014-02-21 10:46:19 +0000 +++ test-suite/mem_node_test.cc 2014-07-21 05:39:57 +0000 @@ -36,6 +36,7 @@ #include +#if 0 /* TODO: put this in a libTest */ void xassert(const char *msg, const char *file, int line) @@ -43,6 +44,7 @@ std::cout << "Assertion failed: (" << msg << ") at " << file << ":" << line << std::endl; exit (1); } +#endif int main(int argc, char **argv)