From: Artem Boldariev <artem@boldariev.com>
Date: Thu, 25 Apr 2024 14:27:22 +0000 (+0300)
Subject: Fix building netmgr_test with DoH disable
X-Git-Tag: v9.18.27~5^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=139caf1354bc3ca7d3e432337b68f6600cbae7c1;p=thirdparty%2Fbind9.git

Fix building netmgr_test with DoH disable

Some parts of the test rely on the functionality available only when
DoH is enabled, but they were not properly surrounded by #ifdef's.
This commit fixes that
---

diff --git a/tests/isc/netmgr_test.c b/tests/isc/netmgr_test.c
index 49e5e01722e..ffe488fd90b 100644
--- a/tests/isc/netmgr_test.c
+++ b/tests/isc/netmgr_test.c
@@ -2401,6 +2401,7 @@ ISC_RUN_TEST_IMPL(tlsdns_recv_one) {
 	atomic_assert_int_eq(ssends, 0);
 }
 
+#ifdef HAVE_LIBNGHTTP2
 static void
 tlsdns_many_listen_read_cb(isc_nmhandle_t *handle, isc_result_t eresult,
 			   isc_region_t *region, void *cbarg) {
@@ -2570,6 +2571,7 @@ ISC_RUN_TEST_IMPL(tlsdns_server_send_many_recv_one) {
 	atomic_assert_int_eq(sreads, 1);
 	atomic_assert_int_eq(ssends, 1);
 }
+#endif /* HAVE_LIBNGHTTP2 */
 
 ISC_RUN_TEST_IMPL(tlsdns_recv_two) {
 	isc_result_t result = ISC_R_SUCCESS;
@@ -3049,8 +3051,6 @@ ISC_TEST_ENTRY_CUSTOM(tls_half_recv_half_send_quota_sendback, setup_test,
 
 /* TLSDNS */
 ISC_TEST_ENTRY_CUSTOM(tlsdns_recv_one, setup_test, teardown_test)
-ISC_TEST_ENTRY_CUSTOM(tlsdns_server_send_many_recv_one, setup_test,
-		      teardown_test)
 ISC_TEST_ENTRY_CUSTOM(tlsdns_recv_two, setup_test, teardown_test)
 ISC_TEST_ENTRY_CUSTOM(tlsdns_noop, setup_test, teardown_test)
 ISC_TEST_ENTRY_CUSTOM(tlsdns_noresponse, setup_test, teardown_test)
@@ -3062,6 +3062,8 @@ ISC_TEST_ENTRY_CUSTOM(tlsdns_half_recv_half_send, setup_test, teardown_test)
 ISC_TEST_ENTRY_CUSTOM(tlsdns_connect_noalpn, setup_test, teardown_test)
 #ifdef HAVE_LIBNGHTTP2
 ISC_TEST_ENTRY_CUSTOM(tlsdns_listen_noalpn, setup_test, teardown_test)
+ISC_TEST_ENTRY_CUSTOM(tlsdns_server_send_many_recv_one, setup_test,
+		      teardown_test)
 #endif
 
 ISC_TEST_LIST_END