upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 18:49:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4696-fix-netmgr-test-when-building-without-doh' into 'bind-9.18'

Browse source 
Fix building netmgr_test with DoH disabled

See merge request isc-projects/bind9!8984
This commit is contained in:
Artem Boldariev 2024-04-29 15:41:18 +00:00
commit 15b4d2c11f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/isc/netmgr_test.c
View file

@ -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