Skip to content

tests: posix: semaphores: ensure test is not skipped #88769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 22, 2025
Merged

tests: posix: semaphores: ensure test is not skipped #88769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92b66e4
posix: semaphores: use a default minimal heap-add for semaphores
cfriedt Apr 19, 2025
d0de2ef
tests: posix: semaphores: reduce execution time by 5s
cfriedt Apr 19, 2025
20b8322
tests: posix: semaphores: coalesce string constants
cfriedt Apr 19, 2025
a6a106c
tests: posix: semaphores: ensure test is not skipped
cfriedt Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/posix/options/Kconfig.semaphore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,7 @@ config POSIX_SEM_NAMELEN_MAX
Maximum length of name for a named semaphore.
The max value of 255 corresponds to {NAME_MAX}.

config HEAP_MEM_POOL_ADD_SIZE_POSIX_SEMAPHORES
def_int 256

endif # POSIX_SEMAPHORES
4 changes: 4 additions & 0 deletions tests/posix/semaphores/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ CONFIG_ZTEST=y

CONFIG_POSIX_AEP_CHOICE_BASE=y
CONFIG_POSIX_SEMAPHORES=y

CONFIG_DYNAMIC_THREAD=y
CONFIG_DYNAMIC_THREAD_POOL_SIZE=2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as #88767, we can make it bulletproof by BUILD_ASSERTing CONFIG_DYNAMIC_THREAD_POOL_SIZE>=2

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

CONFIG_THREAD_STACK_INFO=y
29 changes: 11 additions & 18 deletions tests/posix/semaphores/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
#include <zephyr/sys/util.h>
#include <zephyr/ztest.h>

#define WAIT_TIME_MS 100
BUILD_ASSERT(WAIT_TIME_MS > 0, "WAIT_TIME_MS must be posistive");

/* based on the current structure of this unit test */
BUILD_ASSERT(CONFIG_DYNAMIC_THREAD_POOL_SIZE >= 2, "CONFIG_DYNAMIC_THREAD_POOL_SIZE must be >= 2");

static void *child_func(void *p1)
{
sem_t *sem = (sem_t *)p1;
Expand Down Expand Up @@ -51,11 +57,10 @@ static void semaphore_test(sem_t *sem)

zassert_equal(clock_gettime(CLOCK_REALTIME, &abstime), 0, "clock_gettime failed");

abstime.tv_sec += 5;
abstime.tv_sec += WAIT_TIME_MS / MSEC_PER_SEC;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be in the second commit?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, probably not.

I've actually been working on a timespec_util.h header as well that includes a few useful functions. That's been long overdue.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

abstime.tv_nsec += (WAIT_TIME_MS % MSEC_PER_SEC) * NSEC_PER_MSEC;

/* TESPOINT: Wait for 5 seconds and acquire sema given
* by thread1
*/
/* TESPOINT: Wait to acquire sem given by thread1 */
zassert_equal(sem_timedwait(sem, &abstime), 0);

/* TESTPOINT: Semaphore is already acquired, check if
Expand All @@ -71,9 +76,7 @@ static void semaphore_test(sem_t *sem)
zassert_equal(sem_getvalue(sem, &val), 0);
zassert_equal(val, 1);

zassert_equal(sem_destroy(sem), -1,
"acquired semaphore"
" is destroyed");
zassert_equal(sem_destroy(sem), -1, "acquired semaphore is destroyed");
zassert_equal(errno, EBUSY);

/* TESTPOINT: take semaphore which is initialized with 1 */
Expand Down Expand Up @@ -312,14 +315,4 @@ ZTEST(posix_semaphores, test_named_semaphore)
zassert_equal(nsem_get_list_len(), 0);
}

static void before(void *arg)
{
ARG_UNUSED(arg);

if (!IS_ENABLED(CONFIG_DYNAMIC_THREAD)) {
/* skip redundant testing if there is no thread pool / heap allocation */
ztest_test_skip();
}
}

ZTEST_SUITE(posix_semaphores, NULL, NULL, before, NULL, NULL);
ZTEST_SUITE(posix_semaphores, NULL, NULL, NULL, NULL, NULL);