From 613be8706eca81fee97434e25fda4e9118cfe511 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Wed, 27 Jan 2021 18:06:33 +0100
Subject: [PATCH] Drop AddressSanitizer constraint from libns unit tests

The AddressSanitizer constraint in some libns unit tests does not seem
to be necessary anymore, these tests run fine under AddressSanitizer.
---
 lib/ns/tests/listenlist_test.c | 15 ++++-----------
 lib/ns/tests/notify_test.c     | 15 ++++-----------
 lib/ns/tests/query_test.c      | 15 ++++-----------
 3 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/lib/ns/tests/listenlist_test.c b/lib/ns/tests/listenlist_test.c
index 984328519c..7e48e4c6fd 100644
--- a/lib/ns/tests/listenlist_test.c
+++ b/lib/ns/tests/listenlist_test.c
@@ -11,7 +11,7 @@
 
 #include <isc/util.h>
 
-#if HAVE_CMOCKA && !__SANITIZE_ADDRESS__
+#if HAVE_CMOCKA
 
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
@@ -124,22 +124,15 @@ main(void) {
 	return (cmocka_run_group_tests(tests, NULL, NULL));
 }
 
-#else /* HAVE_CMOCKA && !__SANITIZE_ADDRESS__ */
+#else /* HAVE_CMOCKA */
 
 #include <stdio.h>
 
 int
 main(void) {
-#if __SANITIZE_ADDRESS__
-	/*
-	 * We disable this test when the address sanitizer is in
-	 * the use, as libuv will trigger errors.
-	 */
-	printf("1..0 # Skip ASAN is in use\n");
-#else  /* ADDRESS_SANIZITER */
 	printf("1..0 # Skip cmocka not available\n");
-#endif /* __SANITIZE_ADDRESS__ */
+
 	return (0);
 }
 
-#endif /* HAVE_CMOCKA && !__SANITIZE_ADDRESS__ */
+#endif /* HAVE_CMOCKA */
diff --git a/lib/ns/tests/notify_test.c b/lib/ns/tests/notify_test.c
index b013dc209c..61d4a251eb 100644
--- a/lib/ns/tests/notify_test.c
+++ b/lib/ns/tests/notify_test.c
@@ -11,7 +11,7 @@
 
 #include <isc/util.h>
 
-#if HAVE_CMOCKA && !__SANITIZE_ADDRESS__
+#if HAVE_CMOCKA
 
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
@@ -150,22 +150,15 @@ main(void) {
 
 	return (cmocka_run_group_tests(tests, NULL, NULL));
 }
-#else /* HAVE_CMOCKA && !__SANITIZE_ADDRESS__ */
+#else /* HAVE_CMOCKA */
 
 #include <stdio.h>
 
 int
 main(void) {
-#if __SANITIZE_ADDRESS__
-	/*
-	 * We disable this test when the address sanitizer is in
-	 * the use, as libuv will trigger errors.
-	 */
-	printf("1..0 # Skip ASAN is in use\n");
-#else  /* __SANITIZE_ADDRESS__ */
 	printf("1..0 # Skip cmocka not available\n");
-#endif /* __SANITIZE_ADDRESS__ */
+
 	return (0);
 }
 
-#endif /* HAVE_CMOCKA && !__SANITIZE_ADDRESS__ */
+#endif /* HAVE_CMOCKA */
diff --git a/lib/ns/tests/query_test.c b/lib/ns/tests/query_test.c
index 972a2c2cb4..cb7c4b82f7 100644
--- a/lib/ns/tests/query_test.c
+++ b/lib/ns/tests/query_test.c
@@ -11,7 +11,7 @@
 
 #include <isc/util.h>
 
-#if HAVE_CMOCKA && !__SANITIZE_ADDRESS__
+#if HAVE_CMOCKA
 
 #include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
@@ -1516,22 +1516,15 @@ main(void) {
 	return (cmocka_run_group_tests(tests, NULL, NULL));
 }
 
-#else /* HAVE_CMOCKA && !__SANITIZE_ADDRESS__ */
+#else /* HAVE_CMOCKA */
 
 #include <stdio.h>
 
 int
 main(void) {
-#if __SANITIZE_ADDRESS__
-	/*
-	 * We disable this test when the address sanitizer is in
-	 * the use, as libuv will trigger errors.
-	 */
-	printf("1..0 # Skip ASAN is in use\n");
-#else  /* ADDRESS_SANIZITER */
 	printf("1..0 # Skip cmocka not available\n");
-#endif /* __SANITIZE_ADDRESS__ */
+
 	return (0);
 }
 
-#endif /* HAVE_CMOCKA && !__SANITIZE_ADDRESS__ */
+#endif /* HAVE_CMOCKA */