]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac3902' (extended unit-tests for command channel)
authorTomek Mrugalski <tomasz@isc.org>
Tue, 25 Aug 2015 15:02:41 +0000 (17:02 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Tue, 25 Aug 2015 15:02:41 +0000 (17:02 +0200)
1  2 
src/bin/dhcp4/tests/Makefile.am
src/bin/dhcp6/tests/Makefile.am
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc

index cc7d534da68fc2a4942115600192adb4e016d32f,8f30b08982c70160f4e92fe0d73e6e059303a32a..f4a025c687a348bfbbe87fec80f2ea2a60eb40de
@@@ -109,8 -109,9 +109,9 @@@ dhcp4_unittests_LDADD += $(top_builddir
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/io/libkea-util-io.la
 -dhcp4_unittests_LDADD += $(top_builddir)/src/bin/cfgrpt/libcfgrpt.la
 +dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+ dhcp4_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
  endif
  
  noinst_EXTRA_DIST = configs-list.txt
index f00c7520dd7c19a32a8f6712baf359284bd1cf2b,6d5bb393744d43f4603051af08aa11a5c6415ab9..335fd075aee1d7c4891daa19f3343a750f47bac2
@@@ -111,8 -111,9 +111,9 @@@ dhcp6_unittests_LDADD += $(top_builddir
  dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
  dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
  dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/io/libkea-util-io.la
 -dhcp6_unittests_LDADD += $(top_builddir)/src/bin/cfgrpt/libcfgrpt.la
 +dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
  dhcp6_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
  
  endif