mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-05 00:55:24 +00:00
Code Issues Releases Wiki Activity

Remove configure option to compile without libtool

Browse Source 
libtool is a requirement to use automake (see GL #4), so this commit
removes the ability to compile BIND 9 without libtool.
This commit is contained in:
Ondřej Surý
2020-03-10 13:46:42 +01:00
parent c463808992
commit 1628f5865a
9 changed files with 59 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ns/tests/notify_test.c
View File

@@ -38,7 +38,6 @@
#include "nstest.h"
#if defined(USE_LIBTOOL) || LD_WRAP
static int
_setup(void **state) {
isc_result_t result;
@@ -139,20 +138,15 @@ notify_start(void **state) {
ns_test_cleanup_zone();
isc_nmhandle_unref(client->handle);
}
#endif /* if defined(USE_LIBTOOL) || LD_WRAP */
int
main(void) {
#if defined(USE_LIBTOOL) || LD_WRAP
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(notify_start, _setup,
_teardown),
};
return (cmocka_run_group_tests(tests, NULL, NULL));
#else /* if defined(USE_LIBTOOL) || LD_WRAP */
print_message("1..0 # Skip notify_test requires libtool or LD_WRAP\n");
#endif /* if defined(USE_LIBTOOL) || LD_WRAP */
}
#else /* HAVE_CMOCKA && !__SANITIZE_ADDRESS__ */

6
lib/ns/tests/query_test.c
View File

@@ -34,7 +34,6 @@
#include "nstest.h"
#if defined(USE_LIBTOOL) || LD_WRAP
static int
_setup(void **state) {
isc_result_t result;
@@ -600,11 +599,9 @@ ns__query_start_test(void **state) {
run_start_test(&tests[i]);
}
}
#endif /* if defined(USE_LIBTOOL) || LD_WRAP */
int
main(void) {
#if defined(USE_LIBTOOL) || LD_WRAP
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(ns__query_sfcache_test, _setup,
_teardown),
@@ -613,9 +610,6 @@ main(void) {
};
return (cmocka_run_group_tests(tests, NULL, NULL));
#else /* if defined(USE_LIBTOOL) || LD_WRAP */
print_message("1..0 # Skip query_test requires libtool or LD_WRAP\n");
#endif /* if defined(USE_LIBTOOL) || LD_WRAP */
}
#else /* HAVE_CMOCKA && !__SANITIZE_ADDRESS__ */