From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 25 Aug 2015 15:02:41 +0000 (+0200)
Subject: [master] Merge branch 'trac3902' (extended unit-tests for command channel)
X-Git-Tag: trac4003_base~2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a50d64cc41efa6131d45f9d2d6b49dac84fe2d4b;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3902' (extended unit-tests for command channel)
---

a50d64cc41efa6131d45f9d2d6b49dac84fe2d4b
diff --cc src/bin/dhcp4/tests/Makefile.am
index cc7d534da6,8f30b08982..f4a025c687
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@@ -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
diff --cc src/bin/dhcp6/tests/Makefile.am
index f00c7520dd,6d5bb39374..335fd075ae
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@@ -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