From 28e47621a0757dd27d56abbde34365ba83f14ce9 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Tue, 4 Sep 2018 22:07:15 +0300 Subject: [PATCH 1/5] validation: time: fix c&p error Signed-off-by: Dmitry Eremin-Solenikov --- test/validation/api/time/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index e240122858..27ddc97fdc 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -413,7 +413,7 @@ static void time_test_wait_ns(void) if (odp_time_cmp(diff, upper_limit) > 0) { fprintf(stderr, "Exceed upper limit: " "diff is %" PRIu64 ", upper_limit %" PRIu64 "\n", - odp_time_to_ns(diff), odp_time_to_ns(lower_limit)); + odp_time_to_ns(diff), odp_time_to_ns(upper_limit)); CU_FAIL("Exceed upper limit\n"); } } From a48120c94dea1517a5c9402779cf38df12cd9459 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Tue, 4 Sep 2018 22:08:10 +0300 Subject: [PATCH 2/5] validation: scheduler: print debug diagnostics on test_wait failure Signed-off-by: Dmitry Eremin-Solenikov --- test/validation/api/scheduler/scheduler.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 2e44d3248d..069220393d 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -185,8 +185,19 @@ static void scheduler_test_wait_time(void) upper_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS + ODP_WAIT_TOLERANCE); - CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); - CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); + if (odp_time_cmp(diff, lower_limit) <= 0) { + fprintf(stderr, "Exceed lower limit: " + "diff is %" PRIu64 ", lower_limit %" PRIu64 "\n", + odp_time_to_ns(diff), odp_time_to_ns(lower_limit)); + CU_FAIL("Exceed lower limit\n"); + } + + if (odp_time_cmp(diff, upper_limit) >= 0) { + fprintf(stderr, "Exceed upper limit: " + "diff is %" PRIu64 ", upper_limit %" PRIu64 "\n", + odp_time_to_ns(diff), odp_time_to_ns(upper_limit)); + CU_FAIL("Exceed upper limit\n"); + } CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); } From 4e79558c2286c548305ec58130a3fb365da6488d Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Tue, 4 Sep 2018 22:07:31 +0300 Subject: [PATCH 3/5] validation: time: be more tolerant wrt delays Signed-off-by: Dmitry Eremin-Solenikov --- test/validation/api/time/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index 27ddc97fdc..38c0906baa 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -14,7 +14,7 @@ #define BUSY_LOOP_CNT_LONG 6000000000 /* used for t > 4 sec */ #define MIN_TIME_RATE 32000 #define MAX_TIME_RATE 15000000000 -#define DELAY_TOLERANCE 20000000 /* deviation for delay */ +#define DELAY_TOLERANCE 40000000 /* deviation for delay */ #define WAIT_SECONDS 3 static uint64_t local_res; From 5663ae0fb282d229798e74256b8c707976c6d650 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Tue, 4 Sep 2018 22:07:31 +0300 Subject: [PATCH 4/5] validation: timer: be more tolerant wrt delays Signed-off-by: Dmitry Eremin-Solenikov --- test/validation/api/timer/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index e0f0688231..b1b760dce3 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -334,8 +334,8 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) tim = odp_timeout_timer(tmo); tick = odp_timeout_tick(tmo); - CU_ASSERT(diff_period > (period_ns - (4 * res_ns))); - CU_ASSERT(diff_period < (period_ns + (4 * res_ns))); + CU_ASSERT(diff_period > (period_ns - (5 * res_ns))); + CU_ASSERT(diff_period < (period_ns + (5 * res_ns))); LOG_DBG("timeout tick %" PRIu64 ", " "timeout period %" PRIu64 "\n", From e9e60f0a5b60484c07c0901a81a874bec2a5f8ae Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Wed, 5 Sep 2018 13:19:43 +0300 Subject: [PATCH 5/5] validation: scheduler: increase wait tolerance timeout to 150 msec Signed-off-by: Dmitry Eremin-Solenikov --- test/validation/api/scheduler/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 069220393d..0e7e6c5782 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -47,7 +47,7 @@ #define CHAOS_PTR_TO_NDX(p) ((uint64_t)(uint32_t)(uintptr_t)p) #define CHAOS_NDX_TO_PTR(n) ((void *)(uintptr_t)n) -#define ODP_WAIT_TOLERANCE (60 * ODP_TIME_MSEC_IN_NS) +#define ODP_WAIT_TOLERANCE (150 * ODP_TIME_MSEC_IN_NS) /* Test global variables */ typedef struct {