From fc3ca95ba7c59f6e06bc32b512d55c330d37f071 Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Fri, 22 Feb 2019 11:45:23 -0800 Subject: [PATCH] tests: Mass SMP disablement on non-SMP-safe tests (Chunk 2 of 3 - this patch was split across pull requests to address CI build time limitations) Zephyr has always been a uniprocessor system, and its kernel tests are rife with assumptions and outright dependence on single-CPU operation (for example: "low priority threads will never run until this high priority thread blocks" -- not true if there's another processor to run it!) About 1/3 of our tests fail right now on x86_64 when dual processor operation is made default. Most of those can probably be recovered on a case-by-case basis with simple changes (and a few of them might represent real bugs in SMP!), but for now let's make sure the full test suite passes by turning the second CPU off. There's still plenty of SMP coverage in the remaining cases. Signed-off-by: Andy Ross --- tests/kernel/mbox/mbox_api/prj.conf | 1 + tests/kernel/mbox/mbox_usage/prj.conf | 2 ++ tests/kernel/mem_pool/mem_pool_concept/prj.conf | 2 ++ tests/kernel/mem_pool/mem_pool_threadsafe/prj.conf | 2 ++ tests/kernel/mem_protect/stack_random/prj.conf | 2 ++ tests/kernel/mem_slab/mslab/prj.conf | 2 ++ tests/kernel/mem_slab/mslab_api/prj.conf | 2 ++ tests/kernel/mem_slab/mslab_concept/prj.conf | 2 ++ tests/kernel/mem_slab/mslab_threadsafe/prj.conf | 2 ++ tests/kernel/msgq/msgq_api/prj.conf | 2 ++ tests/kernel/mutex/mutex/prj.conf | 2 ++ tests/kernel/mutex/mutex_api/prj.conf | 2 ++ tests/kernel/obj_tracing/prj.conf | 1 + tests/kernel/pending/prj.conf | 2 ++ tests/kernel/pipe/pipe/prj.conf | 2 ++ tests/kernel/pipe/pipe_api/prj.conf | 2 ++ 16 files changed, 30 insertions(+) diff --git a/tests/kernel/mbox/mbox_api/prj.conf b/tests/kernel/mbox/mbox_api/prj.conf index 237b71779ea..930c65f03b2 100644 --- a/tests/kernel/mbox/mbox_api/prj.conf +++ b/tests/kernel/mbox/mbox_api/prj.conf @@ -1,3 +1,4 @@ CONFIG_ZTEST=y CONFIG_NUM_MBOX_ASYNC_MSGS=5 CONFIG_OBJECT_TRACING=y +CONFIG_SMP=n diff --git a/tests/kernel/mbox/mbox_usage/prj.conf b/tests/kernel/mbox/mbox_usage/prj.conf index 9467c292689..1deecd166ef 100644 --- a/tests/kernel/mbox/mbox_usage/prj.conf +++ b/tests/kernel/mbox/mbox_usage/prj.conf @@ -1 +1,3 @@ CONFIG_ZTEST=y + +CONFIG_SMP=n diff --git a/tests/kernel/mem_pool/mem_pool_concept/prj.conf b/tests/kernel/mem_pool/mem_pool_concept/prj.conf index 9467c292689..1deecd166ef 100644 --- a/tests/kernel/mem_pool/mem_pool_concept/prj.conf +++ b/tests/kernel/mem_pool/mem_pool_concept/prj.conf @@ -1 +1,3 @@ CONFIG_ZTEST=y + +CONFIG_SMP=n diff --git a/tests/kernel/mem_pool/mem_pool_threadsafe/prj.conf b/tests/kernel/mem_pool/mem_pool_threadsafe/prj.conf index a508d3161c6..eeb069e9cf9 100644 --- a/tests/kernel/mem_pool/mem_pool_threadsafe/prj.conf +++ b/tests/kernel/mem_pool/mem_pool_threadsafe/prj.conf @@ -2,3 +2,5 @@ CONFIG_ZTEST=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 # 1 millisecond CONFIG_TIMESLICE_SIZE=1 + +CONFIG_SMP=n diff --git a/tests/kernel/mem_protect/stack_random/prj.conf b/tests/kernel/mem_protect/stack_random/prj.conf index 90037d2fc12..1097c9e4403 100644 --- a/tests/kernel/mem_protect/stack_random/prj.conf +++ b/tests/kernel/mem_protect/stack_random/prj.conf @@ -2,3 +2,5 @@ CONFIG_ZTEST=y CONFIG_STACK_POINTER_RANDOM=64 CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y + +CONFIG_SMP=n diff --git a/tests/kernel/mem_slab/mslab/prj.conf b/tests/kernel/mem_slab/mslab/prj.conf index 98c13739ae6..3952f87bebb 100644 --- a/tests/kernel/mem_slab/mslab/prj.conf +++ b/tests/kernel/mem_slab/mslab/prj.conf @@ -1,3 +1,5 @@ CONFIG_BT=n CONFIG_MAIN_THREAD_PRIORITY=5 CONFIG_ZTEST=y + +CONFIG_SMP=n diff --git a/tests/kernel/mem_slab/mslab_api/prj.conf b/tests/kernel/mem_slab/mslab_api/prj.conf index 9a75212e89d..e0335b9d49f 100644 --- a/tests/kernel/mem_slab/mslab_api/prj.conf +++ b/tests/kernel/mem_slab/mslab_api/prj.conf @@ -1,2 +1,4 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y + +CONFIG_SMP=n diff --git a/tests/kernel/mem_slab/mslab_concept/prj.conf b/tests/kernel/mem_slab/mslab_concept/prj.conf index 9467c292689..1deecd166ef 100644 --- a/tests/kernel/mem_slab/mslab_concept/prj.conf +++ b/tests/kernel/mem_slab/mslab_concept/prj.conf @@ -1 +1,3 @@ CONFIG_ZTEST=y + +CONFIG_SMP=n diff --git a/tests/kernel/mem_slab/mslab_threadsafe/prj.conf b/tests/kernel/mem_slab/mslab_threadsafe/prj.conf index a508d3161c6..eeb069e9cf9 100644 --- a/tests/kernel/mem_slab/mslab_threadsafe/prj.conf +++ b/tests/kernel/mem_slab/mslab_threadsafe/prj.conf @@ -2,3 +2,5 @@ CONFIG_ZTEST=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 # 1 millisecond CONFIG_TIMESLICE_SIZE=1 + +CONFIG_SMP=n diff --git a/tests/kernel/msgq/msgq_api/prj.conf b/tests/kernel/msgq/msgq_api/prj.conf index 117448d7f07..24ec6ef7e44 100644 --- a/tests/kernel/msgq/msgq_api/prj.conf +++ b/tests/kernel/msgq/msgq_api/prj.conf @@ -2,3 +2,5 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y CONFIG_USERSPACE=y CONFIG_DYNAMIC_OBJECTS=y + +CONFIG_SMP=n diff --git a/tests/kernel/mutex/mutex/prj.conf b/tests/kernel/mutex/mutex/prj.conf index cbcfe7c52d2..b6f27e8fa94 100644 --- a/tests/kernel/mutex/mutex/prj.conf +++ b/tests/kernel/mutex/mutex/prj.conf @@ -1,3 +1,5 @@ CONFIG_MAIN_THREAD_PRIORITY=10 CONFIG_ZTEST=y CONFIG_ZTEST_STACKSIZE=512 + +CONFIG_SMP=n diff --git a/tests/kernel/mutex/mutex_api/prj.conf b/tests/kernel/mutex/mutex_api/prj.conf index 9a75212e89d..e0335b9d49f 100644 --- a/tests/kernel/mutex/mutex_api/prj.conf +++ b/tests/kernel/mutex/mutex_api/prj.conf @@ -1,2 +1,4 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y + +CONFIG_SMP=n diff --git a/tests/kernel/obj_tracing/prj.conf b/tests/kernel/obj_tracing/prj.conf index a0e2d47a759..2f9ece2fec2 100644 --- a/tests/kernel/obj_tracing/prj.conf +++ b/tests/kernel/obj_tracing/prj.conf @@ -2,3 +2,4 @@ CONFIG_OBJECT_TRACING=y CONFIG_THREAD_MONITOR=y CONFIG_ZTEST=y CONFIG_BT=n +CONFIG_SMP=n diff --git a/tests/kernel/pending/prj.conf b/tests/kernel/pending/prj.conf index 9467c292689..1deecd166ef 100644 --- a/tests/kernel/pending/prj.conf +++ b/tests/kernel/pending/prj.conf @@ -1 +1,3 @@ CONFIG_ZTEST=y + +CONFIG_SMP=n diff --git a/tests/kernel/pipe/pipe/prj.conf b/tests/kernel/pipe/pipe/prj.conf index e39776e7067..21f3474dd9a 100644 --- a/tests/kernel/pipe/pipe/prj.conf +++ b/tests/kernel/pipe/pipe/prj.conf @@ -1,2 +1,4 @@ CONFIG_ZTEST=y CONFIG_TEST_USERSPACE=y + +CONFIG_SMP=n diff --git a/tests/kernel/pipe/pipe_api/prj.conf b/tests/kernel/pipe/pipe_api/prj.conf index 928ab3b4968..6da5a62cc24 100644 --- a/tests/kernel/pipe/pipe_api/prj.conf +++ b/tests/kernel/pipe/pipe_api/prj.conf @@ -2,3 +2,5 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y CONFIG_TEST_USERSPACE=y CONFIG_DYNAMIC_OBJECTS=y + +CONFIG_SMP=n