From: Razvan Becheriu <razvan@isc.org>
Date: Fri, 9 Aug 2019 06:59:16 +0000 (+0300)
Subject: [#810, !471] reverted changes added by mistake
X-Git-Tag: Kea-1.6.0~41^2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=581948124b07bed6244bf773c1e3eb7525d28749;p=thirdparty%2Fkea.git

[#810, !471] reverted changes added by mistake
---

diff --git a/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc
index b37ac81760..c1fd8bc980 100644
--- a/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc
@@ -277,7 +277,7 @@ TEST(MySqlConnection, checkTimeConversion) {
 }
 
 // This test verifies that database backend can operate in Read-Only mode.
-TEST_F(MySqlHostDataSourceTest, DISABLED_testReadOnlyDatabase) {
+TEST_F(MySqlHostDataSourceTest, testReadOnlyDatabase) {
     testReadOnlyDatabase(MYSQL_VALID_TYPE);
 }
 
diff --git a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
index 69231977d7..1925d7eedc 100644
--- a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
@@ -263,7 +263,7 @@ TEST(PgSqlHostDataSource, NoCallbackOnOpenFail) {
 }
 
 // This test verifies that database backend can operate in Read-Only mode.
-TEST_F(PgSqlHostDataSourceTest, DISABLED_testReadOnlyDatabase) {
+TEST_F(PgSqlHostDataSourceTest, testReadOnlyDatabase) {
     testReadOnlyDatabase(PGSQL_VALID_TYPE);
 }
 
diff --git a/tools/sysrepo_config b/tools/sysrepo_config
index ba15afe5a8..fd28a86a46 100755
--- a/tools/sysrepo_config
+++ b/tools/sysrepo_config
@@ -78,8 +78,10 @@ if [ "$1" = "--libs" ]; then
 fi
 
 if [ "$1" = "--modversion" ]; then
-    VERSION=$(sysrepoctl -v | tr -s " " | cut -d " " -f 7)
-    echo "${VERSION}"
+    MAJOR="1"
+    MINOR="0"
+    PATCH="0"
+    echo "${MAJOR}.${MINOR}.${PATCH}"
     exit 0
 fi