From: Mark Andrews <marka@isc.org>
Date: Wed, 13 Nov 2019 23:00:36 +0000 (+1100)
Subject: conditionally test based on USE_LIBTOOL or LD_WRAP
X-Git-Tag: v9.15.6~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00605058b40dd9ba882d1a6029ca48051944ab03;p=thirdparty%2Fbind9.git

conditionally test based on USE_LIBTOOL or LD_WRAP
---

diff --git a/lib/ns/tests/notify_test.c b/lib/ns/tests/notify_test.c
index bc94fcc01b7..926bf246a0a 100644
--- a/lib/ns/tests/notify_test.c
+++ b/lib/ns/tests/notify_test.c
@@ -39,6 +39,7 @@
 
 #include "nstest.h"
 
+#if defined(USE_LIBTOOL) || LD_WRAP
 static int
 _setup(void **state) {
 	isc_result_t result;
@@ -139,15 +140,20 @@ notify_start(void **state) {
 	ns_test_cleanup_zone();
 	isc_nmhandle_unref(client->handle);
 }
+#endif
 
 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
+	print_message("1..0 # Skip notify_test requires libtool or LD_WRAP\n");
+#endif
 }
 #else /* HAVE_CMOCKA && !__SANITIZE_ADDRESS__ */
 
diff --git a/lib/ns/tests/query_test.c b/lib/ns/tests/query_test.c
index 3094ced2b8a..d0b5bbf9058 100644
--- a/lib/ns/tests/query_test.c
+++ b/lib/ns/tests/query_test.c
@@ -35,6 +35,7 @@
 
 #include "nstest.h"
 
+#if defined(USE_LIBTOOL) || LD_WRAP
 static int
 _setup(void **state) {
 	isc_result_t result;
@@ -588,9 +589,11 @@ ns__query_start_test(void **state) {
 		run_start_test(&tests[i]);
 	}
 }
+#endif
 
 int
 main(void) {
+#if defined(USE_LIBTOOL) || LD_WRAP
 	const struct CMUnitTest tests[] = {
 		cmocka_unit_test_setup_teardown(ns__query_sfcache_test,
 						_setup, _teardown),
@@ -599,6 +602,9 @@ main(void) {
 	};
 
 	return (cmocka_run_group_tests(tests, NULL, NULL));
+#else
+	print_message("1..0 # Skip query_test requires libtool or LD_WRAP\n");
+#endif
 }
 
 #else /* HAVE_CMOCKA && !__SANITIZE_ADDRESS__ */