From: Francis Dupont <fdupont@isc.org>
Date: Sat, 6 Oct 2018 10:28:16 +0000 (+0200)
Subject: [65-libyang-database_rebased] Rebased on master after pool merge
X-Git-Tag: 171-keactrl-tests-not-posix_base~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab925a9b8146c4d14aaa2c246c53398d87bbde76;p=thirdparty%2Fkea.git

[65-libyang-database_rebased] Rebased on master after pool merge
---

ab925a9b8146c4d14aaa2c246c53398d87bbde76
diff --cc src/lib/yang/Makefile.am
index bc7d227481,935839e327..9e6ae14ab7
--- a/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -12,9 -13,8 +13,10 @@@ libkea_yang_la_SOURCES += translator_op
  libkea_yang_la_SOURCES += translator_option_data.h
  libkea_yang_la_SOURCES += translator_option_def.cc
  libkea_yang_la_SOURCES += translator_option_def.h
 +libkea_yang_la_SOURCES += translator_pool.cc translator_pool.h
 +libkea_yang_la_SOURCES += yang_models.h
  
+ 
  libkea_yang_la_LIBADD =  $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
@@@ -31,9 -31,9 +33,10 @@@ libkea_yang_include_HEADERS = 
  	adaptor.h \
  	sysrepo_error.h \
  	translator.h \
+ 	translator_database.h \
  	translator_option_data.h \
 -	translator_option_def.h
 +	translator_option_def.h \
 +	translator_pool.h
  
  EXTRA_DIST = yang.dox
  # Distribute yang models.
diff --cc src/lib/yang/tests/Makefile.am
index 58018a599b,69206d5b72..1184bf5c48
--- a/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -20,9 -20,9 +20,10 @@@ TESTS += run_unittest
  run_unittests_SOURCES  = adaptor_unittests.cc
  run_unittests_SOURCES += sysrepo_setup.h
  run_unittests_SOURCES += translator_unittests.cc
+ run_unittests_SOURCES += translator_database_unittests.cc
  run_unittests_SOURCES += translator_option_data_unittests.cc
  run_unittests_SOURCES += translator_option_def_unittests.cc
 +run_unittests_SOURCES += translator_pool_unittests.cc
  run_unittests_SOURCES += run_unittests.cc
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)