From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 22 Mar 2021 17:48:04 +0000 (-0400)
Subject: [#1730] Fixed lib order and cosmetic comment
X-Git-Tag: Kea-1.9.6~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e19a7f154c0155ce37e065f69a78bb3635d1d68b;p=thirdparty%2Fkea.git

[#1730] Fixed lib order and cosmetic comment

src/bin/dhcp6/tests/Makefile.am
src/hooks/dhcp/flex_option/Makefile.am
src/hooks/dhcp/flex_option/libloadtests/Makefile.am
src/hooks/dhcp/flex_option/tests/Makefile.am
    Fixed lib order.

src/lib/http/tests/connection_pool_unittests.cc
    cosmetic fix
---

diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 23dbf81c96..6ee78cdc31 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -134,9 +134,8 @@ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtes
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
diff --git a/src/hooks/dhcp/flex_option/Makefile.am b/src/hooks/dhcp/flex_option/Makefile.am
index 2ec77361b8..526baaed97 100644
--- a/src/hooks/dhcp/flex_option/Makefile.am
+++ b/src/hooks/dhcp/flex_option/Makefile.am
@@ -35,9 +35,9 @@ libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/http/libkea-http.la
-libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
diff --git a/src/hooks/dhcp/flex_option/libloadtests/Makefile.am b/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
index 4ca41bbfd6..9730bee9af 100644
--- a/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
@@ -39,9 +39,9 @@ flex_option_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
diff --git a/src/hooks/dhcp/flex_option/tests/Makefile.am b/src/hooks/dhcp/flex_option/tests/Makefile.am
index 7f92bf3faf..0cabc14855 100644
--- a/src/hooks/dhcp/flex_option/tests/Makefile.am
+++ b/src/hooks/dhcp/flex_option/tests/Makefile.am
@@ -39,9 +39,9 @@ flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
diff --git a/src/lib/http/tests/connection_pool_unittests.cc b/src/lib/http/tests/connection_pool_unittests.cc
index fdbd18f4e5..0635f2a9bd 100644
--- a/src/lib/http/tests/connection_pool_unittests.cc
+++ b/src/lib/http/tests/connection_pool_unittests.cc
@@ -194,6 +194,7 @@ public:
                                                    HttpAcceptorCallback(),
                                                    CONN_REQUEST_TIMEOUT,
                                                    CONN_IDLE_TIMEOUT));
+
         HttpConnectionPtr conn2(new HttpConnection(io_service_, acceptor_,
                                                    connection_pool_,
                                                    response_creator_,