From: Witold Kręcicki <wpk@culm.net>
Date: Fri, 15 Nov 2019 12:30:04 +0000 (+0100)
Subject: fix a problem with the mem_test unit test
X-Git-Tag: v9.15.6~1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70f80a3ec72b8e6726487d79c350c61cab10aa47;p=thirdparty%2Fbind9.git

fix a problem with the mem_test unit test

isc_mem_traceflag_test messes with stdout/stderr, which can cause
problems with subsequent tests (no output, libuv problems).  Moving that
test case to the end ensures there are no side effects.
---

diff --git a/lib/isc/tests/mem_test.c b/lib/isc/tests/mem_test.c
index c1c63be6109..c237ef23cd3 100644
--- a/lib/isc/tests/mem_test.c
+++ b/lib/isc/tests/mem_test.c
@@ -511,20 +511,25 @@ main(void) {
 		cmocka_unit_test_setup_teardown(isc_mem_inuse_test,
 				_setup, _teardown),
 
+#if !defined(__SANITIZE_THREAD__)
+		cmocka_unit_test_setup_teardown(isc_mem_benchmark,
+						_setup, _teardown),
+		cmocka_unit_test_setup_teardown(isc_mempool_benchmark,
+						_setup, _teardown),
+#endif /* __SANITIZE_THREAD__ */
 #if ISC_MEM_TRACKLINES
 		cmocka_unit_test_setup_teardown(isc_mem_noflags_test,
 				_setup, _teardown),
 		cmocka_unit_test_setup_teardown(isc_mem_recordflag_test,
 				_setup, _teardown),
+		/*
+		 * traceflag_test closes stderr, which causes weird
+		 * side effects for any next test trying to use libuv.
+		 * This test has to be the last one to avoid problems.
+		 */
 		cmocka_unit_test_setup_teardown(isc_mem_traceflag_test,
 				_setup, _teardown),
 #endif
-#if !defined(__SANITIZE_THREAD__)
-		cmocka_unit_test_setup_teardown(isc_mem_benchmark,
-						_setup, _teardown),
-		cmocka_unit_test_setup_teardown(isc_mempool_benchmark,
-						_setup, _teardown),
-#endif /* __SANITIZE_THREAD__ */
 	};
 
 	return (cmocka_run_group_tests(tests, NULL, NULL));