Commit c73e3175 authored by Evan Hunt's avatar Evan Hunt
Browse files

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

parent 4ac4806d
Pipeline #10253 passed with stages
in 19 minutes and 15 seconds
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
#include "isctest.h" #include "isctest.h"
/* Set to true (or use -v option) for verbose output */
static bool verbose = false;
/* /*
* This entire test requires threads. * This entire test requires threads.
*/ */
#ifdef ISC_PLATFORM_USETHREADS #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_SECONDS 0 /* in absence of clock_getres() */
#define FUDGE_NANOSECONDS 500000000 /* in absence of clock_getres() */ #define FUDGE_NANOSECONDS 500000000 /* in absence of clock_getres() */
...@@ -569,6 +569,7 @@ purge(void **state) { ...@@ -569,6 +569,7 @@ purge(void **state) {
isc_task_destroy(&task2); isc_task_destroy(&task2);
DESTROYLOCK(&mx); DESTROYLOCK(&mx);
} }
#endif
int int
main(int argc, char **argv) { main(int argc, char **argv) {
...@@ -595,7 +596,6 @@ main(int argc, char **argv) { ...@@ -595,7 +596,6 @@ main(int argc, char **argv) {
return (cmocka_run_group_tests(tests, NULL, NULL)); return (cmocka_run_group_tests(tests, NULL, NULL));
} }
#endif
#else /* HAVE_CMOCKA */ #else /* HAVE_CMOCKA */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment