Commit 49358c76 authored by Evan Hunt's avatar Evan Hunt
Browse files

Merge branch 'pmensik-skip-timer-test' into 'v9_11'

Workaround to kyua bug

See merge request !1697
parents dacfa097 5480d26d
Pipeline #12049 passed with stages
in 55 seconds
...@@ -573,14 +573,13 @@ purge(void **state) { ...@@ -573,14 +573,13 @@ purge(void **state) {
int int
main(int argc, char **argv) { main(int argc, char **argv) {
const struct CMUnitTest tests[] = {
#ifdef ISC_PLATFORM_USETHREADS #ifdef ISC_PLATFORM_USETHREADS
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(ticker, _setup, _teardown), cmocka_unit_test_setup_teardown(ticker, _setup, _teardown),
cmocka_unit_test_setup_teardown(once_life, _setup, _teardown), cmocka_unit_test_setup_teardown(once_life, _setup, _teardown),
cmocka_unit_test_setup_teardown(once_idle, _setup, _teardown), cmocka_unit_test_setup_teardown(once_idle, _setup, _teardown),
cmocka_unit_test_setup_teardown(reset, _setup, _teardown), cmocka_unit_test_setup_teardown(reset, _setup, _teardown),
cmocka_unit_test_setup_teardown(purge, _setup, _teardown), cmocka_unit_test_setup_teardown(purge, _setup, _teardown),
#endif
}; };
int c; int c;
...@@ -595,6 +594,14 @@ main(int argc, char **argv) { ...@@ -595,6 +594,14 @@ main(int argc, char **argv) {
} }
return (cmocka_run_group_tests(tests, NULL, NULL)); return (cmocka_run_group_tests(tests, NULL, NULL));
#else
UNUSED(argc);
UNUSED(argv);
UNUSED(verbose);
printf("1..0 # Skipped: timer test requires threads\n");
return (0);
#endif
} }
#else /* HAVE_CMOCKA */ #else /* HAVE_CMOCKA */
......
Markdown is supported
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