]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Workaround to kyua bug
authorPetr Mensik <pemensik@redhat.com>
Thu, 14 Mar 2019 20:05:34 +0000 (21:05 +0100)
committerEvan Hunt <each@isc.org>
Thu, 14 Mar 2019 21:19:45 +0000 (14:19 -0700)
Kyua 0.13 is not able to correctly handle whole test skipping.
Make workaround to it, include skipping message.

lib/isc/tests/timer_test.c

index f69f2b32e4303f59f32778df6507ddd156a0191e..5e780b771caf6ef95d39bc9730ca6a937a22c89a 100644 (file)
@@ -573,14 +573,13 @@ purge(void **state) {
 
 int
 main(int argc, char **argv) {
-       const struct CMUnitTest tests[] = {
 #ifdef ISC_PLATFORM_USETHREADS
+       const struct CMUnitTest tests[] = {
                cmocka_unit_test_setup_teardown(ticker, _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(reset, _setup, _teardown),
                cmocka_unit_test_setup_teardown(purge, _setup, _teardown),
-#endif
        };
        int c;
 
@@ -595,6 +594,14 @@ main(int argc, char **argv) {
        }
 
        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 */