From: Stephen Morris <stephen@isc.org>
Date: Thu, 15 Aug 2013 14:30:43 +0000 (+0100)
Subject: [master] Merge branch 'trac2981'
X-Git-Tag: bind10-1.2.0beta1-release~272
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aff6b06b2490fe4fa6568e7575a9a9105cfd7fae;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2981'
---

aff6b06b2490fe4fa6568e7575a9a9105cfd7fae
diff --cc src/bin/dhcp6/tests/Makefile.am
index 293173c49d,a08d9d122b..928598ec4a
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@@ -44,15 -45,23 +45,25 @@@ TESTS_ENVIRONMENT = 
  
  TESTS =
  if HAVE_GTEST
+ # Build shared libraries for testing.
+ lib_LTLIBRARIES = libco1.la libco2.la
  
- TESTS += dhcp6_unittests
+ libco1_la_SOURCES  = callout_library_1.cc callout_library_common.h
+ libco1_la_CXXFLAGS = $(AM_CXXFLAGS)
+ libco1_la_CPPFLAGS = $(AM_CPPFLAGS)
+ 
+ libco2_la_SOURCES  = callout_library_2.cc callout_library_common.h
+ libco2_la_CXXFLAGS = $(AM_CXXFLAGS)
+ libco2_la_CPPFLAGS = $(AM_CPPFLAGS)
  
+ TESTS += dhcp6_unittests
  dhcp6_unittests_SOURCES  = dhcp6_unittests.cc
  dhcp6_unittests_SOURCES += dhcp6_srv_unittest.cc
 +dhcp6_unittests_SOURCES += hooks_unittest.cc
 +dhcp6_unittests_SOURCES += dhcp6_test_utils.h
  dhcp6_unittests_SOURCES += ctrl_dhcp6_srv_unittest.cc
  dhcp6_unittests_SOURCES += config_parser_unittest.cc
+ dhcp6_unittests_SOURCES += marker_file.cc
  dhcp6_unittests_SOURCES += ../dhcp6_srv.h ../dhcp6_srv.cc
  dhcp6_unittests_SOURCES += ../dhcp6_log.h ../dhcp6_log.cc
  dhcp6_unittests_SOURCES += ../ctrl_dhcp6_srv.cc