From 6bb765a362074979f889f1b50b56e3a04d3bbb81 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Wed, 15 Jul 2020 16:29:07 +0200 Subject: [PATCH] tests/xtimer_now_irq: don't fail for 32bit timers --- tests/xtimer_now_irq/main.c | 35 ++++++++++++++++------------ tests/xtimer_now_irq/tests/01-run.py | 7 ++++-- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/tests/xtimer_now_irq/main.c b/tests/xtimer_now_irq/main.c index 24d4772daa..788d699dee 100644 --- a/tests/xtimer_now_irq/main.c +++ b/tests/xtimer_now_irq/main.c @@ -26,22 +26,27 @@ int main(void) { - puts("xtimer_now_irq test application.\n"); - - uint8_t count = TEST_COUNT; - while (count) { - unsigned int state = irq_disable(); - uint32_t t1 = xtimer_now_usec(); - xtimer_spin(xtimer_ticks((uint32_t)(~XTIMER_MASK) / 2)); - uint32_t t2 = xtimer_now_usec(); - irq_restore(state); - if (t2 < t1) { - puts("ERROR: wrong time with interrupts disabled"); - return -1; - } - puts("OK"); - count --; + if (XTIMER_WIDTH == 32) { + puts("Nothing to do for 32 bit timers.\n"); } + else { + puts("xtimer_now_irq test application.\n"); + uint8_t count = TEST_COUNT; + while (count) { + unsigned int state = irq_disable(); + uint32_t t1 = xtimer_now_usec(); + xtimer_spin(xtimer_ticks((uint32_t)(~XTIMER_MASK) / 2)); + uint32_t t2 = xtimer_now_usec(); + irq_restore(state); + if (t2 < t1) { + puts("ERROR: wrong time with interrupts disabled"); + return -1; + } + puts("OK"); + count --; + } + } + puts("SUCCESS"); return 0; } diff --git a/tests/xtimer_now_irq/tests/01-run.py b/tests/xtimer_now_irq/tests/01-run.py index 4a4d78aa3e..57cceb8a66 100755 --- a/tests/xtimer_now_irq/tests/01-run.py +++ b/tests/xtimer_now_irq/tests/01-run.py @@ -15,8 +15,11 @@ TIMEOUT = 20 def testfunc(child): - for _ in range(4): - child.expect_exact("OK", timeout=TIMEOUT) + res = child.expect(['Nothing to do for 32 bit timers.\r\n', + 'xtimer_now_irq test application.\r\n']) + if res == 1: + for _ in range(4): + child.expect_exact("OK", timeout=TIMEOUT) child.expect_exact("SUCCESS")