From: Francis Dupont Date: Wed, 8 Feb 2017 15:41:46 +0000 (+0100) Subject: [5076] Renamed *_unittests.cc into *_unittest.cc X-Git-Tag: trac3590_base~3^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e339343d86a714ce43d1531025d7c2e381d2ffeb;p=thirdparty%2Fkea.git [5076] Renamed *_unittests.cc into *_unittest.cc --- diff --git a/src/bin/agent/tests/Makefile.am b/src/bin/agent/tests/Makefile.am index 34767312a5..64695e4d0f 100644 --- a/src/bin/agent/tests/Makefile.am +++ b/src/bin/agent/tests/Makefile.am @@ -40,39 +40,39 @@ TESTS_ENVIRONMENT = \ TESTS = if HAVE_GTEST -TESTS += ctrl_agent_unittests - -ctrl_agent_unittests_SOURCES = ctrl_agent_cfg_mgr_unittests.cc -ctrl_agent_unittests_SOURCES += ctrl_agent_controller_unittests.cc -ctrl_agent_unittests_SOURCES += parser_unittests.cc -ctrl_agent_unittests_SOURCES += ctrl_agent_process_unittests.cc -ctrl_agent_unittests_SOURCES += ctrl_agent_unittests.cc - -ctrl_agent_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) -ctrl_agent_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS) - -ctrl_agent_unittests_LDADD = $(top_builddir)/src/bin/agent/libagent.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/process/testutils/libprocesstest.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la -ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -ctrl_agent_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) -ctrl_agent_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD) +TESTS += ctrl_agent_unittest + +ctrl_agent_unittest_SOURCES = ctrl_agent_cfg_mgr_unittest.cc +ctrl_agent_unittest_SOURCES += ctrl_agent_controller_unittest.cc +ctrl_agent_unittest_SOURCES += parser_unittest.cc +ctrl_agent_unittest_SOURCES += ctrl_agent_process_unittest.cc +ctrl_agent_unittest_SOURCES += ctrl_agent_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/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) endif diff --git a/src/bin/agent/tests/ctrl_agent_cfg_mgr_unittests.cc b/src/bin/agent/tests/ctrl_agent_cfg_mgr_unittest.cc similarity index 100% rename from src/bin/agent/tests/ctrl_agent_cfg_mgr_unittests.cc rename to src/bin/agent/tests/ctrl_agent_cfg_mgr_unittest.cc diff --git a/src/bin/agent/tests/ctrl_agent_controller_unittests.cc b/src/bin/agent/tests/ctrl_agent_controller_unittest.cc similarity index 100% rename from src/bin/agent/tests/ctrl_agent_controller_unittests.cc rename to src/bin/agent/tests/ctrl_agent_controller_unittest.cc diff --git a/src/bin/agent/tests/ctrl_agent_process_unittests.cc b/src/bin/agent/tests/ctrl_agent_process_unittest.cc similarity index 100% rename from src/bin/agent/tests/ctrl_agent_process_unittests.cc rename to src/bin/agent/tests/ctrl_agent_process_unittest.cc diff --git a/src/bin/agent/tests/ctrl_agent_unittests.cc b/src/bin/agent/tests/ctrl_agent_unittest.cc similarity index 100% rename from src/bin/agent/tests/ctrl_agent_unittests.cc rename to src/bin/agent/tests/ctrl_agent_unittest.cc diff --git a/src/bin/agent/tests/parser_unittests.cc b/src/bin/agent/tests/parser_unittest.cc similarity index 100% rename from src/bin/agent/tests/parser_unittests.cc rename to src/bin/agent/tests/parser_unittest.cc