Skip to content

Commit a990059

Browse files
author
Razvan Becheriu
committed
[#3536] addressed review comments
1 parent 74eafca commit a990059

File tree

15 files changed

+46
-35
lines changed

15 files changed

+46
-35
lines changed

configure.ac

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,24 +1582,24 @@ AC_CONFIG_FILES([src/hooks/dhcp/high_availability/tests/Makefile])
15821582
AC_CONFIG_FILES([src/hooks/dhcp/lease_cmds/Makefile])
15831583
AC_CONFIG_FILES([src/hooks/dhcp/lease_cmds/libloadtests/Makefile])
15841584
AC_CONFIG_FILES([src/hooks/dhcp/lease_cmds/tests/Makefile])
1585-
AC_CONFIG_FILES([src/hooks/dhcp/mysql_lb/Makefile])
1586-
AC_CONFIG_FILES([src/hooks/dhcp/mysql_lb/libloadtests/Makefile])
1587-
AC_CONFIG_FILES([src/hooks/dhcp/mysql_lb/tests/Makefile])
1588-
AC_CONFIG_FILES([src/hooks/dhcp/mysql_hb/Makefile])
1589-
AC_CONFIG_FILES([src/hooks/dhcp/mysql_hb/libloadtests/Makefile])
1590-
AC_CONFIG_FILES([src/hooks/dhcp/mysql_hb/tests/Makefile])
15911585
AC_CONFIG_FILES([src/hooks/dhcp/mysql_cb/Makefile])
15921586
AC_CONFIG_FILES([src/hooks/dhcp/mysql_cb/libloadtests/Makefile])
15931587
AC_CONFIG_FILES([src/hooks/dhcp/mysql_cb/tests/Makefile])
1594-
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_lb/Makefile])
1595-
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_lb/libloadtests/Makefile])
1596-
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_lb/tests/Makefile])
1597-
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_hb/Makefile])
1598-
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_hb/libloadtests/Makefile])
1599-
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_hb/tests/Makefile])
1588+
AC_CONFIG_FILES([src/hooks/dhcp/mysql_hb/Makefile])
1589+
AC_CONFIG_FILES([src/hooks/dhcp/mysql_hb/libloadtests/Makefile])
1590+
AC_CONFIG_FILES([src/hooks/dhcp/mysql_hb/tests/Makefile])
1591+
AC_CONFIG_FILES([src/hooks/dhcp/mysql_lb/Makefile])
1592+
AC_CONFIG_FILES([src/hooks/dhcp/mysql_lb/libloadtests/Makefile])
1593+
AC_CONFIG_FILES([src/hooks/dhcp/mysql_lb/tests/Makefile])
16001594
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_cb/Makefile])
16011595
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_cb/libloadtests/Makefile])
16021596
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_cb/tests/Makefile])
1597+
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_hb/Makefile])
1598+
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_hb/libloadtests/Makefile])
1599+
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_hb/tests/Makefile])
1600+
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_lb/Makefile])
1601+
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_lb/libloadtests/Makefile])
1602+
AC_CONFIG_FILES([src/hooks/dhcp/pgsql_lb/tests/Makefile])
16031603
AC_CONFIG_FILES([src/hooks/dhcp/run_script/Makefile])
16041604
AC_CONFIG_FILES([src/hooks/dhcp/run_script/libloadtests/Makefile])
16051605
AC_CONFIG_FILES([src/hooks/dhcp/run_script/tests/Makefile])

src/bin/dhcp4/tests/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ PROGRAM_TESTS = dhcp4_unittests
7878

7979
# This list is ordered alphabetically. When adding new files, please maintain
8080
# this order.
81-
dhcp4_unittests_SOURCES = classify_unittest.cc
81+
dhcp4_unittests_SOURCES =
82+
dhcp4_unittests_SOURCES += classify_unittest.cc
8283
dhcp4_unittests_SOURCES += client_handler_unittest.cc
8384
dhcp4_unittests_SOURCES += config_parser_unittest.cc
8485
dhcp4_unittests_SOURCES += config_backend_unittest.cc

src/bin/dhcp6/tests/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ PROGRAM_TESTS = dhcp6_unittests
7878

7979
# This list is ordered alphabetically. When adding new files, please maintain
8080
# this order.
81-
dhcp6_unittests_SOURCES = classify_unittests.cc
81+
dhcp6_unittests_SOURCES =
82+
dhcp6_unittests_SOURCES += classify_unittests.cc
8283
dhcp6_unittests_SOURCES += client_handler_unittest.cc
8384
dhcp6_unittests_SOURCES += config_parser_unittest.cc
8485
dhcp6_unittests_SOURCES += config_backend_unittest.cc

src/hooks/dhcp/Makefile.am

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
SUBDIRS = bootp flex_option high_availability lease_cmds perfmon
22

33
if HAVE_MYSQL
4-
SUBDIRS += mysql_lb
5-
SUBDIRS += mysql_hb
6-
SUBDIRS += mysql_cb
4+
SUBDIRS += mysql_lb mysql_hb mysql_cb
75
endif
86

97
if HAVE_PGSQL
10-
SUBDIRS += pgsql_lb
11-
SUBDIRS += pgsql_hb
12-
SUBDIRS += pgsql_cb
8+
SUBDIRS += pgsql_lb pgsql_hb pgsql_cb
139
endif
1410

1511
SUBDIRS += run_script stat_cmds user_chk

src/hooks/dhcp/mysql_hb/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,5 @@ else
7070
messages mysql_hb_messages.h mysql_hb_messages.cc:
7171
@echo Messages generation disabled. Configure with --enable-generate-messages to enable it.
7272

73-
endif
73+
endif
74+

src/hooks/dhcp/mysql_hb/tests/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,5 @@ mysql_hb_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions
5454
mysql_hb_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
5555
endif
5656

57-
noinst_PROGRAMS = $(TESTS)
57+
noinst_PROGRAMS = $(TESTS)
58+

src/hooks/dhcp/mysql_hb/tests/mysql_host_data_source_unittest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1875,7 +1875,7 @@ class CfgMySqlDbAccessTest : public ::testing::Test {
18751875
Initializer<MySqlHostDataSourceInit> init_;
18761876
};
18771877

1878-
// Tests that MySQL lease manager and host data source can be created from a
1878+
// Tests that memfile lease manager and MySQL host data source can be created from a
18791879
// specified configuration.
18801880
TEST_F(CfgMySqlDbAccessTest, createManagers) {
18811881
CfgDbAccess cfg;

src/hooks/dhcp/mysql_lb/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,5 @@ else
7070
messages mysql_lb_messages.h mysql_lb_messages.cc:
7171
@echo Messages generation disabled. Configure with --enable-generate-messages to enable it.
7272

73-
endif
73+
endif
74+

src/hooks/dhcp/mysql_lb/tests/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,5 @@ mysql_lb_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions
5656
mysql_lb_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
5757
endif
5858

59-
noinst_PROGRAMS = $(TESTS)
59+
noinst_PROGRAMS = $(TESTS)
60+

src/hooks/dhcp/pgsql_hb/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,5 @@ else
7070
messages pgsql_hb_messages.h pgsql_hb_messages.cc:
7171
@echo Messages generation disabled. Configure with --enable-generate-messages to enable it.
7272

73-
endif
73+
endif
74+

0 commit comments

Comments
 (0)