From 345b9f7b78b45556bb5cfcc61169ec676887e273 Mon Sep 17 00:00:00 2001 From: Aleksander Kaminski Date: Thu, 5 Oct 2023 12:20:54 +0200 Subject: [PATCH] pthread: Fix pthread_condattr_setclock test JIRA: RTOS-639 --- libc/pthread/pthread_cond.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libc/pthread/pthread_cond.c b/libc/pthread/pthread_cond.c index 413d24828..57bb0c30f 100644 --- a/libc/pthread/pthread_cond.c +++ b/libc/pthread/pthread_cond.c @@ -41,20 +41,23 @@ TEST(test_pthread_cond, pthread_condattr_setclock) { pthread_condattr_t attr; TEST_ASSERT_EQUAL(0, pthread_condattr_init(&attr)); - TEST_ASSERT_EQUAL(0, pthread_condattr_setclock(&attr, CLOCK_MONOTONIC)); clockid_t clock; - /* Only 'CLOCK_MONOTONIC' supported Phoenix-RTOS */ + + TEST_ASSERT_EQUAL(0, pthread_condattr_setclock(&attr, CLOCK_MONOTONIC)); TEST_ASSERT_EQUAL(0, pthread_condattr_getclock(&attr, &clock)); TEST_ASSERT_EQUAL(CLOCK_MONOTONIC, clock); - TEST_ASSERT_EQUAL(EINVAL, pthread_condattr_setclock(&attr, CLOCK_MONOTONIC_RAW)); + + /* glibc don't want to use CLOCK_MONOTONIC_RAW */ #ifdef __phoenix__ - TEST_ASSERT_EQUAL(EINVAL, pthread_condattr_setclock(&attr, CLOCK_REALTIME)); -#else + TEST_ASSERT_EQUAL(0, pthread_condattr_setclock(&attr, CLOCK_MONOTONIC_RAW)); + TEST_ASSERT_EQUAL(0, pthread_condattr_getclock(&attr, &clock)); + TEST_ASSERT_EQUAL(CLOCK_MONOTONIC_RAW, clock); +#endif + TEST_ASSERT_EQUAL(0, pthread_condattr_setclock(&attr, CLOCK_REALTIME)); TEST_ASSERT_EQUAL(0, pthread_condattr_getclock(&attr, &clock)); TEST_ASSERT_EQUAL(CLOCK_REALTIME, clock); -#endif }