------------------------------------------------------------ revno: 13513 revision-id: squid3@treenet.co.nz-20140726132627-7vlvbd6y4qyflljw parent: squid3@treenet.co.nz-20140725120142-cunk1lyx6zrvbrt2 committer: Amos Jeffries branch nick: trunk timestamp: Sun 2014-07-27 01:26:27 +1200 message: BSD: Fix unit test link errors ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140726132627-7vlvbd6y4qyflljw # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 529a8376ef793ced85dfc77536a4f454177acff0 # timestamp: 2014-07-26 13:27:50 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140725120142-\ # cunk1lyx6zrvbrt2 # # Begin patch === modified file 'src/Makefile.am' --- src/Makefile.am 2014-07-23 12:51:55 +0000 +++ src/Makefile.am 2014-07-26 13:26:27 +0000 @@ -1381,6 +1381,8 @@ tests/stub_debug.cc \ tests/stub_time.cc nodist_tests_testBoilerplate_SOURCES = \ + tests/stub_cbdata.cc \ + tests/stub_MemBuf.cc \ $(TESTSOURCES) tests_testBoilerplate_LDADD= \ $(SQUID_CPPUNIT_LIBS) \ === modified file 'test-suite/Makefile.am' --- test-suite/Makefile.am 2014-07-24 06:31:02 +0000 +++ test-suite/Makefile.am 2014-07-26 13:26:27 +0000 @@ -52,13 +52,19 @@ tcp_banger2_LDADD = $(top_builddir)/lib/libmiscutil.la -STUBS = stub_debug.cc stub_SBuf.cc stub_tools.cc stub_fatal.cc +STUBS = stub_cbdata.cc stub_debug.cc stub_MemBuf.cc stub_SBuf.cc stub_tools.cc stub_fatal.cc DEBUG_SOURCE = test_tools.cc $(STUBS) CLEANFILES += $(STUBS) +stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc + cp $(top_srcdir)/src/tests/stub_cbdata.cc . + stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc cp $(top_srcdir)/src/tests/stub_debug.cc . +stub_MemBuf.cc: $(top_srcdir)/src/tests/stub_MemBuf.cc + cp $(top_srcdir)/src/tests/stub_MemBuf.cc . + stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc cp $(top_srcdir)/src/tests/stub_SBuf.cc .