diff options
Diffstat (limited to 'src/test/test-barrier.c')
-rw-r--r-- | src/test/test-barrier.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c index d2afd92f63..6ae84cd6fc 100644 --- a/src/test/test-barrier.c +++ b/src/test/test-barrier.c @@ -16,6 +16,7 @@ #include "barrier.h" #include "util.h" +#include "tests.h" /* 20ms to test deadlocks; All timings use multiples of this constant as * alarm/sleep timers. If this timeout is too small for slow machines to perform @@ -419,18 +420,10 @@ TEST_BARRIER(test_barrier_pending_exit, TEST_BARRIER_WAIT_SUCCESS(pid2)); int main(int argc, char *argv[]) { - /* - * This test uses real-time alarms and sleeps to test for CPU races - * explicitly. This is highly fragile if your system is under load. We - * already increased the BASE_TIME value to make the tests more robust, - * but that just makes the test take significantly longer. Hence, - * disable the test by default, so it will not break CI. - */ - if (argc < 2) - return EXIT_TEST_SKIP; + test_setup_logging(LOG_INFO); - log_parse_environment(); - log_open(); + if (!slow_tests_enabled()) + return log_tests_skipped("slow tests are disabled"); test_barrier_sync(); test_barrier_wait_next(); |