From 58859405e5feb32a5c2efdabe6287e9dcabd3321 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Tue, 28 Feb 2017 17:01:43 +0100 Subject: [PATCH] [5107] Renamed ctrl_agent_* to ca_* and unittest to unittests. --- configure.ac | 2 +- src/bin/agent/.gitignore | 4 +- src/bin/agent/Makefile.am | 28 +++---- .../{ctrl_agent_cfg_mgr.cc => ca_cfg_mgr.cc} | 4 +- .../{ctrl_agent_cfg_mgr.h => ca_cfg_mgr.h} | 0 ...agent_command_mgr.cc => ca_command_mgr.cc} | 2 +- ...l_agent_command_mgr.h => ca_command_mgr.h} | 0 ...l_agent_controller.cc => ca_controller.cc} | 4 +- ...trl_agent_controller.h => ca_controller.h} | 0 .../agent/{ctrl_agent_log.cc => ca_log.cc} | 4 +- src/bin/agent/{ctrl_agent_log.h => ca_log.h} | 4 +- ...trl_agent_messages.mes => ca_messages.mes} | 0 .../{ctrl_agent_process.cc => ca_process.cc} | 6 +- .../{ctrl_agent_process.h => ca_process.h} | 4 +- ...onse_creator.cc => ca_response_creator.cc} | 4 +- ...sponse_creator.h => ca_response_creator.h} | 2 +- ...actory.h => ca_response_creator_factory.h} | 2 +- src/bin/agent/main.cc | 4 +- src/bin/agent/tests/.gitignore | 4 +- src/bin/agent/tests/Makefile.am | 82 +++++++++---------- ...gr_unittest.cc => ca_cfg_mgr_unittests.cc} | 4 +- ...nittest.cc => ca_command_mgr_unittests.cc} | 2 +- ...unittest.cc => ca_controller_unittests.cc} | 6 +- ...ess_tests.sh.in => ca_process_tests.sh.in} | 0 ...ss_unittest.cc => ca_process_unittests.cc} | 6 +- ... ca_response_creator_factory_unittests.cc} | 4 +- ...st.cc => ca_response_creator_unittests.cc} | 4 +- ...ctrl_agent_unittest.cc => ca_unittests.cc} | 0 ...parser_unittest.cc => parser_unittests.cc} | 0 29 files changed, 93 insertions(+), 93 deletions(-) rename src/bin/agent/{ctrl_agent_cfg_mgr.cc => ca_cfg_mgr.cc} (91%) rename src/bin/agent/{ctrl_agent_cfg_mgr.h => ca_cfg_mgr.h} (100%) rename src/bin/agent/{ctrl_agent_command_mgr.cc => ca_command_mgr.cc} (96%) rename src/bin/agent/{ctrl_agent_command_mgr.h => ca_command_mgr.h} (100%) rename src/bin/agent/{ctrl_agent_controller.cc => ca_controller.cc} (95%) rename src/bin/agent/{ctrl_agent_controller.h => ca_controller.h} (100%) rename src/bin/agent/{ctrl_agent_log.cc => ca_log.cc} (77%) rename src/bin/agent/{ctrl_agent_log.h => ca_log.h} (82%) rename src/bin/agent/{ctrl_agent_messages.mes => ca_messages.mes} (100%) rename src/bin/agent/{ctrl_agent_process.cc => ca_process.cc} (96%) rename src/bin/agent/{ctrl_agent_process.h => ca_process.h} (97%) rename src/bin/agent/{ctrl_agent_response_creator.cc => ca_response_creator.cc} (97%) rename src/bin/agent/{ctrl_agent_response_creator.h => ca_response_creator.h} (98%) rename src/bin/agent/{ctrl_agent_response_creator_factory.h => ca_response_creator_factory.h} (97%) rename src/bin/agent/tests/{ctrl_agent_cfg_mgr_unittest.cc => ca_cfg_mgr_unittests.cc} (90%) rename src/bin/agent/tests/{ctrl_agent_command_mgr_unittest.cc => ca_command_mgr_unittests.cc} (98%) rename src/bin/agent/tests/{ctrl_agent_controller_unittest.cc => ca_controller_unittests.cc} (97%) rename src/bin/agent/tests/{ctrl_agent_process_tests.sh.in => ca_process_tests.sh.in} (100%) rename src/bin/agent/tests/{ctrl_agent_process_unittest.cc => ca_process_unittests.cc} (95%) rename src/bin/agent/tests/{ctrl_agent_response_creator_factory_unittest.cc => ca_response_creator_factory_unittests.cc} (91%) rename src/bin/agent/tests/{ctrl_agent_response_creator_unittest.cc => ca_response_creator_unittests.cc} (98%) rename src/bin/agent/tests/{ctrl_agent_unittest.cc => ca_unittests.cc} (100%) rename src/bin/agent/tests/{parser_unittest.cc => parser_unittests.cc} (100%) diff --git a/configure.ac b/configure.ac index 4b8df8532e..34842bb8d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1601,7 +1601,7 @@ AC_CONFIG_FILES([compatcheck/Makefile src/bin/Makefile src/bin/agent/Makefile src/bin/agent/tests/Makefile - src/bin/agent/tests/ctrl_agent_process_tests.sh + src/bin/agent/tests/ca_process_tests.sh src/bin/d2/Makefile src/bin/d2/tests/Makefile src/bin/d2/tests/d2_process_tests.sh diff --git a/src/bin/agent/.gitignore b/src/bin/agent/.gitignore index 076c41267f..c24184cb91 100644 --- a/src/bin/agent/.gitignore +++ b/src/bin/agent/.gitignore @@ -1,6 +1,6 @@ /kea-ctrl-agent -/ctrl_agent_messages.cc -/ctrl_agent_messages.h +/ca_messages.cc +/ca_messages.h /s-messages /kea-ctrl-agent.8 diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am index 94f23b724a..8dabee6086 100644 --- a/src/bin/agent/Makefile.am +++ b/src/bin/agent/Makefile.am @@ -9,7 +9,7 @@ if USE_STATIC_LINK AM_LDFLAGS = -static endif -CLEANFILES = *.gcno *.gcda ctrl_agent_messages.h ctrl_agent_messages.cc s-messages +CLEANFILES = *.gcno *.gcda ca_messages.h ca_messages.cc s-messages man_MANS = kea-ctrl-agent.8 DISTCLEANFILES = $(man_MANS) @@ -29,13 +29,13 @@ $(man_MANS): endif -ctrl_agent_messages.h ctrl_agent_messages.cc: s-messages +ca_messages.h ca_messages.cc: s-messages -s-messages: ctrl_agent_messages.mes - $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/agent/ctrl_agent_messages.mes +s-messages: ca_messages.mes + $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/agent/ca_messages.mes touch $@ -BUILT_SOURCES = ctrl_agent_messages.h ctrl_agent_messages.cc +BUILT_SOURCES = ca_messages.h ca_messages.cc # convenience archive @@ -44,17 +44,17 @@ noinst_LTLIBRARIES = libagent.la libagent_la_SOURCES = agent_parser.cc agent_parser.h libagent_la_SOURCES += agent_lexer.cc -libagent_la_SOURCES += ctrl_agent_cfg_mgr.cc ctrl_agent_cfg_mgr.h -libagent_la_SOURCES += ctrl_agent_controller.cc ctrl_agent_controller.h -libagent_la_SOURCES += ctrl_agent_command_mgr.cc ctrl_agent_command_mgr.h -libagent_la_SOURCES += ctrl_agent_log.cc ctrl_agent_log.h -libagent_la_SOURCES += ctrl_agent_process.cc ctrl_agent_process.h -libagent_la_SOURCES += ctrl_agent_response_creator.cc ctrl_agent_response_creator.h -libagent_la_SOURCES += ctrl_agent_response_creator_factory.h +libagent_la_SOURCES += ca_cfg_mgr.cc ca_cfg_mgr.h +libagent_la_SOURCES += ca_controller.cc ca_controller.h +libagent_la_SOURCES += ca_command_mgr.cc ca_command_mgr.h +libagent_la_SOURCES += ca_log.cc ca_log.h +libagent_la_SOURCES += ca_process.cc ca_process.h +libagent_la_SOURCES += ca_response_creator.cc ca_response_creator.h +libagent_la_SOURCES += ca_response_creator_factory.h libagent_la_SOURCES += parser_context.cc parser_context.h parser_context_decl.h -nodist_libagent_la_SOURCES = ctrl_agent_messages.h ctrl_agent_messages.cc -EXTRA_DIST += ctrl_agent_messages.mes +nodist_libagent_la_SOURCES = ca_messages.h ca_messages.cc +EXTRA_DIST += ca_messages.mes EXTRA_DIST += agent_lexer.ll EXTRA_DIST += agent_parser.yy diff --git a/src/bin/agent/ctrl_agent_cfg_mgr.cc b/src/bin/agent/ca_cfg_mgr.cc similarity index 91% rename from src/bin/agent/ctrl_agent_cfg_mgr.cc rename to src/bin/agent/ca_cfg_mgr.cc index 87f9f0c87c..22db555ec6 100644 --- a/src/bin/agent/ctrl_agent_cfg_mgr.cc +++ b/src/bin/agent/ca_cfg_mgr.cc @@ -1,11 +1,11 @@ -// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. #include -#include +#include using namespace isc::dhcp; using namespace isc::process; diff --git a/src/bin/agent/ctrl_agent_cfg_mgr.h b/src/bin/agent/ca_cfg_mgr.h similarity index 100% rename from src/bin/agent/ctrl_agent_cfg_mgr.h rename to src/bin/agent/ca_cfg_mgr.h diff --git a/src/bin/agent/ctrl_agent_command_mgr.cc b/src/bin/agent/ca_command_mgr.cc similarity index 96% rename from src/bin/agent/ctrl_agent_command_mgr.cc rename to src/bin/agent/ca_command_mgr.cc index 8c89fccf02..5a36d8e954 100644 --- a/src/bin/agent/ctrl_agent_command_mgr.cc +++ b/src/bin/agent/ca_command_mgr.cc @@ -4,7 +4,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include +#include #include #include diff --git a/src/bin/agent/ctrl_agent_command_mgr.h b/src/bin/agent/ca_command_mgr.h similarity index 100% rename from src/bin/agent/ctrl_agent_command_mgr.h rename to src/bin/agent/ca_command_mgr.h diff --git a/src/bin/agent/ctrl_agent_controller.cc b/src/bin/agent/ca_controller.cc similarity index 95% rename from src/bin/agent/ctrl_agent_controller.cc rename to src/bin/agent/ca_controller.cc index 04845686a3..a5508abdb7 100644 --- a/src/bin/agent/ctrl_agent_controller.cc +++ b/src/bin/agent/ca_controller.cc @@ -6,8 +6,8 @@ #include -#include -#include +#include +#include using namespace isc::process; diff --git a/src/bin/agent/ctrl_agent_controller.h b/src/bin/agent/ca_controller.h similarity index 100% rename from src/bin/agent/ctrl_agent_controller.h rename to src/bin/agent/ca_controller.h diff --git a/src/bin/agent/ctrl_agent_log.cc b/src/bin/agent/ca_log.cc similarity index 77% rename from src/bin/agent/ctrl_agent_log.cc rename to src/bin/agent/ca_log.cc index ed2eef6156..7c9147c8b3 100644 --- a/src/bin/agent/ctrl_agent_log.cc +++ b/src/bin/agent/ca_log.cc @@ -1,10 +1,10 @@ -// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include +#include namespace isc { namespace agent { diff --git a/src/bin/agent/ctrl_agent_log.h b/src/bin/agent/ca_log.h similarity index 82% rename from src/bin/agent/ctrl_agent_log.h rename to src/bin/agent/ca_log.h index a62998c0c9..f9d77eb86a 100644 --- a/src/bin/agent/ctrl_agent_log.h +++ b/src/bin/agent/ca_log.h @@ -1,4 +1,4 @@ -// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -9,7 +9,7 @@ #include #include -#include +#include namespace isc { namespace agent { diff --git a/src/bin/agent/ctrl_agent_messages.mes b/src/bin/agent/ca_messages.mes similarity index 100% rename from src/bin/agent/ctrl_agent_messages.mes rename to src/bin/agent/ca_messages.mes diff --git a/src/bin/agent/ctrl_agent_process.cc b/src/bin/agent/ca_process.cc similarity index 96% rename from src/bin/agent/ctrl_agent_process.cc rename to src/bin/agent/ca_process.cc index 651e670151..9a632e3c18 100644 --- a/src/bin/agent/ctrl_agent_process.cc +++ b/src/bin/agent/ca_process.cc @@ -5,9 +5,9 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/bin/agent/ctrl_agent_process.h b/src/bin/agent/ca_process.h similarity index 97% rename from src/bin/agent/ctrl_agent_process.h rename to src/bin/agent/ca_process.h index 05f54c30c7..a8516315a6 100644 --- a/src/bin/agent/ctrl_agent_process.h +++ b/src/bin/agent/ca_process.h @@ -1,4 +1,4 @@ -// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -7,7 +7,7 @@ #ifndef CTRL_AGENT_PROCESS_H #define CTRL_AGENT_PROCESS_H -#include +#include #include namespace isc { diff --git a/src/bin/agent/ctrl_agent_response_creator.cc b/src/bin/agent/ca_response_creator.cc similarity index 97% rename from src/bin/agent/ctrl_agent_response_creator.cc rename to src/bin/agent/ca_response_creator.cc index 5b11e069b5..0f6d782b8f 100644 --- a/src/bin/agent/ctrl_agent_response_creator.cc +++ b/src/bin/agent/ca_response_creator.cc @@ -4,8 +4,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include -#include +#include +#include #include #include #include diff --git a/src/bin/agent/ctrl_agent_response_creator.h b/src/bin/agent/ca_response_creator.h similarity index 98% rename from src/bin/agent/ctrl_agent_response_creator.h rename to src/bin/agent/ca_response_creator.h index 610b3fc385..cde253ff79 100644 --- a/src/bin/agent/ctrl_agent_response_creator.h +++ b/src/bin/agent/ca_response_creator.h @@ -7,7 +7,7 @@ #ifndef CTRL_AGENT_RESPONSE_CREATOR_H #define CTRL_AGENT_RESPONSE_CREATOR_H -#include +#include #include #include diff --git a/src/bin/agent/ctrl_agent_response_creator_factory.h b/src/bin/agent/ca_response_creator_factory.h similarity index 97% rename from src/bin/agent/ctrl_agent_response_creator_factory.h rename to src/bin/agent/ca_response_creator_factory.h index d6f6ba0568..5949fae2fe 100644 --- a/src/bin/agent/ctrl_agent_response_creator_factory.h +++ b/src/bin/agent/ca_response_creator_factory.h @@ -7,7 +7,7 @@ #ifndef CTRL_AGENT_RESPONSE_CREATOR_FACTORY_H #define CTRL_AGENT_RESPONSE_CREATOR_FACTORY_H -#include +#include #include namespace isc { diff --git a/src/bin/agent/main.cc b/src/bin/agent/main.cc index 999a4d1537..c74329ba12 100644 --- a/src/bin/agent/main.cc +++ b/src/bin/agent/main.cc @@ -1,11 +1,11 @@ -// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. #include -#include +#include #include #include #include diff --git a/src/bin/agent/tests/.gitignore b/src/bin/agent/tests/.gitignore index b0a8f7b157..81d3cbd5ce 100644 --- a/src/bin/agent/tests/.gitignore +++ b/src/bin/agent/tests/.gitignore @@ -1,2 +1,2 @@ -/ctrl_agent_unittest -/ctrl_agent_process_tests.sh +/ca_unittests +/ca_process_tests.sh diff --git a/src/bin/agent/tests/Makefile.am b/src/bin/agent/tests/Makefile.am index b9ae35b9f1..34e9b005ba 100644 --- a/src/bin/agent/tests/Makefile.am +++ b/src/bin/agent/tests/Makefile.am @@ -1,11 +1,11 @@ SHTESTS = # The test of dynamic reconfiguration based on signals will work only # if we are using file based configuration approach. -SHTESTS += ctrl_agent_process_tests.sh +SHTESTS += ca_process_tests.sh -noinst_SCRIPTS = ctrl_agent_process_tests.sh +noinst_SCRIPTS = ca_process_tests.sh -EXTRA_DIST = ctrl_agent_process_tests.sh.in +EXTRA_DIST = ca_process_tests.sh.in # test using command-line arguments, so use check-local target instead of TESTS check-local: @@ -26,7 +26,7 @@ AM_CPPFLAGS += -DCFG_EXAMPLES=\"$(abs_top_srcdir)/doc/examples/agent\" CLEANFILES = $(builddir)/interfaces.txt $(builddir)/logger_lockfile -DISTCLEANFILES = ctrl_agent_process_tests.sh +DISTCLEANFILES = ca_process_tests.sh AM_CXXFLAGS = $(KEA_CXXFLAGS) @@ -40,43 +40,43 @@ TESTS_ENVIRONMENT = \ TESTS = if HAVE_GTEST -TESTS += ctrl_agent_unittest - -ctrl_agent_unittest_SOURCES = ctrl_agent_cfg_mgr_unittest.cc -ctrl_agent_unittest_SOURCES += ctrl_agent_command_mgr_unittest.cc -ctrl_agent_unittest_SOURCES += ctrl_agent_controller_unittest.cc -ctrl_agent_unittest_SOURCES += ctrl_agent_process_unittest.cc -ctrl_agent_unittest_SOURCES += ctrl_agent_response_creator_unittest.cc -ctrl_agent_unittest_SOURCES += ctrl_agent_response_creator_factory_unittest.cc -ctrl_agent_unittest_SOURCES += ctrl_agent_unittest.cc -ctrl_agent_unittest_SOURCES += parser_unittest.cc - -ctrl_agent_unittest_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) -ctrl_agent_unittest_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS) - -ctrl_agent_unittest_LDADD = $(top_builddir)/src/bin/agent/libagent.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/process/testutils/libprocesstest.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/process/libkea-process.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/http/libkea-http.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/util/libkea-util.la -ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -ctrl_agent_unittest_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) -ctrl_agent_unittest_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) +TESTS += ca_unittests + +ca_unittests_SOURCES = ca_cfg_mgr_unittests.cc +ca_unittests_SOURCES += ca_command_mgr_unittests.cc +ca_unittests_SOURCES += ca_controller_unittests.cc +ca_unittests_SOURCES += ca_process_unittests.cc +ca_unittests_SOURCES += ca_response_creator_unittests.cc +ca_unittests_SOURCES += ca_response_creator_factory_unittests.cc +ca_unittests_SOURCES += ca_unittests.cc +ca_unittests_SOURCES += parser_unittests.cc + +ca_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) +ca_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS) + +ca_unittests_LDADD = $(top_builddir)/src/bin/agent/libagent.la +ca_unittests_LDADD += $(top_builddir)/src/lib/process/testutils/libprocesstest.la +ca_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la +ca_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la +ca_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la +ca_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la +ca_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la +ca_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la +ca_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la +ca_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la +ca_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la +ca_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la +ca_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la +ca_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la +ca_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la +ca_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la +ca_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la +ca_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la +ca_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la +ca_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la +ca_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la +ca_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) +ca_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) endif diff --git a/src/bin/agent/tests/ctrl_agent_cfg_mgr_unittest.cc b/src/bin/agent/tests/ca_cfg_mgr_unittests.cc similarity index 90% rename from src/bin/agent/tests/ctrl_agent_cfg_mgr_unittest.cc rename to src/bin/agent/tests/ca_cfg_mgr_unittests.cc index 6e816d8eac..2d11d46ab3 100644 --- a/src/bin/agent/tests/ctrl_agent_cfg_mgr_unittest.cc +++ b/src/bin/agent/tests/ca_cfg_mgr_unittests.cc @@ -1,11 +1,11 @@ -// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. #include -#include +#include #include #include #include diff --git a/src/bin/agent/tests/ctrl_agent_command_mgr_unittest.cc b/src/bin/agent/tests/ca_command_mgr_unittests.cc similarity index 98% rename from src/bin/agent/tests/ctrl_agent_command_mgr_unittest.cc rename to src/bin/agent/tests/ca_command_mgr_unittests.cc index 136d69d44b..8061150adc 100644 --- a/src/bin/agent/tests/ctrl_agent_command_mgr_unittest.cc +++ b/src/bin/agent/tests/ca_command_mgr_unittests.cc @@ -5,7 +5,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. #include -#include +#include #include #include diff --git a/src/bin/agent/tests/ctrl_agent_controller_unittest.cc b/src/bin/agent/tests/ca_controller_unittests.cc similarity index 97% rename from src/bin/agent/tests/ctrl_agent_controller_unittest.cc rename to src/bin/agent/tests/ca_controller_unittests.cc index 7ad86ca727..c8bbc0f4e5 100644 --- a/src/bin/agent/tests/ctrl_agent_controller_unittest.cc +++ b/src/bin/agent/tests/ca_controller_unittests.cc @@ -1,12 +1,12 @@ -// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. #include -#include -#include +#include +#include #include #include diff --git a/src/bin/agent/tests/ctrl_agent_process_tests.sh.in b/src/bin/agent/tests/ca_process_tests.sh.in similarity index 100% rename from src/bin/agent/tests/ctrl_agent_process_tests.sh.in rename to src/bin/agent/tests/ca_process_tests.sh.in diff --git a/src/bin/agent/tests/ctrl_agent_process_unittest.cc b/src/bin/agent/tests/ca_process_unittests.cc similarity index 95% rename from src/bin/agent/tests/ctrl_agent_process_unittest.cc rename to src/bin/agent/tests/ca_process_unittests.cc index 58702bd5be..417d1e463f 100644 --- a/src/bin/agent/tests/ctrl_agent_process_unittest.cc +++ b/src/bin/agent/tests/ca_process_unittests.cc @@ -1,12 +1,12 @@ -// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. #include -#include -#include +#include +#include #include #include #include diff --git a/src/bin/agent/tests/ctrl_agent_response_creator_factory_unittest.cc b/src/bin/agent/tests/ca_response_creator_factory_unittests.cc similarity index 91% rename from src/bin/agent/tests/ctrl_agent_response_creator_factory_unittest.cc rename to src/bin/agent/tests/ca_response_creator_factory_unittests.cc index db975fe223..8cef6fe730 100644 --- a/src/bin/agent/tests/ctrl_agent_response_creator_factory_unittest.cc +++ b/src/bin/agent/tests/ca_response_creator_factory_unittests.cc @@ -5,8 +5,8 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. #include -#include -#include +#include +#include #include #include diff --git a/src/bin/agent/tests/ctrl_agent_response_creator_unittest.cc b/src/bin/agent/tests/ca_response_creator_unittests.cc similarity index 98% rename from src/bin/agent/tests/ctrl_agent_response_creator_unittest.cc rename to src/bin/agent/tests/ca_response_creator_unittests.cc index ca020feb43..d4911b3803 100644 --- a/src/bin/agent/tests/ctrl_agent_response_creator_unittest.cc +++ b/src/bin/agent/tests/ca_response_creator_unittests.cc @@ -5,8 +5,8 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. #include -#include -#include +#include +#include #include #include #include diff --git a/src/bin/agent/tests/ctrl_agent_unittest.cc b/src/bin/agent/tests/ca_unittests.cc similarity index 100% rename from src/bin/agent/tests/ctrl_agent_unittest.cc rename to src/bin/agent/tests/ca_unittests.cc diff --git a/src/bin/agent/tests/parser_unittest.cc b/src/bin/agent/tests/parser_unittests.cc similarity index 100% rename from src/bin/agent/tests/parser_unittest.cc rename to src/bin/agent/tests/parser_unittests.cc -- GitLab