From: Evan Hunt <each@isc.org>
Date: Wed, 20 Feb 2019 21:31:45 +0000 (-0800)
Subject: timer_test failed to compile if cmocka was enabled but threads were not
X-Git-Tag: v9.12.4rc1~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c73e3175c737fd51a8e398286e14e93a3b5d124f;p=thirdparty%2Fbind9.git

timer_test failed to compile if cmocka was enabled but threads were not
---

diff --git a/lib/isc/tests/timer_test.c b/lib/isc/tests/timer_test.c
index 891dce557f7..f69f2b32e43 100644
--- a/lib/isc/tests/timer_test.c
+++ b/lib/isc/tests/timer_test.c
@@ -36,14 +36,14 @@
 
 #include "isctest.h"
 
+/* Set to true (or use -v option) for verbose output */
+static bool verbose = false;
+
 /*
  * This entire test requires threads.
  */
 #ifdef ISC_PLATFORM_USETHREADS
 
-/* Set to true (or use -v option) for verbose output */
-static bool verbose = false;
-
 #define	FUDGE_SECONDS	0	     /* in absence of clock_getres() */
 #define	FUDGE_NANOSECONDS	500000000    /* in absence of clock_getres() */
 
@@ -569,6 +569,7 @@ purge(void **state) {
 	isc_task_destroy(&task2);
 	DESTROYLOCK(&mx);
 }
+#endif
 
 int
 main(int argc, char **argv) {
@@ -595,7 +596,6 @@ main(int argc, char **argv) {
 
 	return (cmocka_run_group_tests(tests, NULL, NULL));
 }
-#endif
 
 #else /* HAVE_CMOCKA */