diff --git a/include/net/socket.h b/include/net/socket.h index 63228c022e67..1cebc8073645 100644 --- a/include/net/socket.h +++ b/include/net/socket.h @@ -382,7 +382,7 @@ int zsock_setsockopt(int sock, int level, int optname, * if :option:`CONFIG_NET_SOCKETS_POSIX_NAMES` is defined. * @endrststar */ -int zsock_gethostname(char *buf, size_t len); +__syscall int zsock_gethostname(char *buf, size_t len); /** * @brief Convert network address from internal to numeric ASCII form diff --git a/kernel/thread.c b/kernel/thread.c index 9be9eba5efe2..8bfce822ce23 100644 --- a/kernel/thread.c +++ b/kernel/thread.c @@ -433,6 +433,12 @@ k_tid_t z_impl_k_thread_create(struct k_thread *new_thread, { __ASSERT(!z_is_in_isr(), "Threads may not be created in ISRs"); + /* Special case, only for unit tests */ +#if defined(CONFIG_TEST) && defined(CONFIG_ARCH_HAS_USERSPACE) && !defined(CONFIG_USERSPACE) + __ASSERT((options & K_USER) == 0, + "Platform is capable of user mode, and test thread created with K_USER option, but CONFIG_TEST_USERSPACE or CONFIG_USERSPACE is not set\n"); +#endif + z_setup_new_thread(new_thread, stack, stack_size, entry, p1, p2, p3, prio, options, NULL); diff --git a/samples/net/gptp/sample.yaml b/samples/net/gptp/sample.yaml index c8eeea992283..e61a78458b9e 100644 --- a/samples/net/gptp/sample.yaml +++ b/samples/net/gptp/sample.yaml @@ -8,6 +8,3 @@ tests: sample.net.gptp: platform_whitelist: frdm_k64f sam_e70_xplained native_posix depends_on: netif - # To avoid "Too many thread objects" error - extra_configs: - - CONFIG_USERSPACE=n diff --git a/subsys/net/lib/sockets/sockets_misc.c b/subsys/net/lib/sockets/sockets_misc.c index c950c71e6882..c2778839dca0 100644 --- a/subsys/net/lib/sockets/sockets_misc.c +++ b/subsys/net/lib/sockets/sockets_misc.c @@ -6,8 +6,9 @@ #include #include +#include -int zsock_gethostname(char *buf, size_t len) +int z_impl_zsock_gethostname(char *buf, size_t len) { const char *p = net_hostname_get(); @@ -15,3 +16,11 @@ int zsock_gethostname(char *buf, size_t len) return 0; } + +#ifdef CONFIG_USERSPACE +Z_SYSCALL_HANDLER(zsock_gethostname, buf, len) +{ + Z_OOPS(Z_SYSCALL_MEMORY_WRITE(buf, len)); + return z_impl_zsock_gethostname((char *)buf, len); +} +#endif diff --git a/subsys/testsuite/Kconfig b/subsys/testsuite/Kconfig index 024bcffb9fd6..7429cabb4d01 100644 --- a/subsys/testsuite/Kconfig +++ b/subsys/testsuite/Kconfig @@ -58,15 +58,33 @@ config COVERAGE_GCOV endif config TEST_USERSPACE - bool "Enable userspace if available" + bool "Indicate that this test exercises user mode" + help + This option indicates that a test case puts threads in user mode, + and that the build system should enable userspace if the platform + supports it. It should be set on a per-test basis. + + The userspace APIs are no-ops if userspace is not enabled, so it is + OK to enable this even if the test will run on platforms which do + not support userspace. The test should still run on those platforms, + just with all threads in supervisor mode. + + If a test *requires* that userspace be enabled in order to + function, CONFIG_ARCH_HAS_USERSPACE should be filtered in its + testcase.yaml. + +config TEST_ENABLE_USERSPACE + bool + depends on TEST_USERSPACE depends on ARCH_HAS_USERSPACE - depends on TEST select USERSPACE select DYNAMIC_OBJECTS default y help - This option will help test the userspace mode. This can be enabled - only when CONFIG_ARCH_HAS_USERSPACE is set. + This hidden option will help test the userspace mode. This will be + enabled only when CONFIG_ARCH_HAS_USERSPACE is set, and that the test + case itself indicates that it exercises user mode via + CONFIG_TEST_HAS_USERSPACE. config TEST_HW_STACK_PROTECTION bool "Enable hardware-based stack overflow detection if available" diff --git a/tests/benchmarks/app_kernel/prj.conf b/tests/benchmarks/app_kernel/prj.conf index d27916f32051..95c251efacf2 100644 --- a/tests/benchmarks/app_kernel/prj.conf +++ b/tests/benchmarks/app_kernel/prj.conf @@ -10,5 +10,4 @@ CONFIG_MAIN_THREAD_PRIORITY=6 CONFIG_FORCE_NO_ASSERT=y #Disable Userspace -CONFIG_TEST_USERSPACE=n CONFIG_TEST_HW_STACK_PROTECTION=n diff --git a/tests/benchmarks/app_kernel/prj_fp.conf b/tests/benchmarks/app_kernel/prj_fp.conf index eae7775731a1..a1ca04e62006 100644 --- a/tests/benchmarks/app_kernel/prj_fp.conf +++ b/tests/benchmarks/app_kernel/prj_fp.conf @@ -15,5 +15,4 @@ CONFIG_TICKLESS_KERNEL=n CONFIG_FORCE_NO_ASSERT=y #Disable Userspace -CONFIG_TEST_USERSPACE=n CONFIG_TEST_HW_STACK_PROTECTION=n diff --git a/tests/benchmarks/boot_time/prj.conf b/tests/benchmarks/boot_time/prj.conf index 7887268e47ef..cf07d8150780 100644 --- a/tests/benchmarks/boot_time/prj.conf +++ b/tests/benchmarks/boot_time/prj.conf @@ -3,7 +3,4 @@ CONFIG_PERFORMANCE_METRICS=y CONFIG_BOOT_TIME_MEASUREMENT=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_FORCE_NO_ASSERT=y - -#Disable Userspace -CONFIG_TEST_USERSPACE=n CONFIG_TEST_HW_STACK_PROTECTION=n diff --git a/tests/benchmarks/latency_measure/prj.conf b/tests/benchmarks/latency_measure/prj.conf index 3f878b4b648b..2d9b015909d9 100644 --- a/tests/benchmarks/latency_measure/prj.conf +++ b/tests/benchmarks/latency_measure/prj.conf @@ -17,7 +17,5 @@ CONFIG_BT=n #CONFIG_THREAD_MONITOR=y CONFIG_FORCE_NO_ASSERT=y -#Disable Userspace -CONFIG_TEST_USERSPACE=n CONFIG_TEST_HW_STACK_PROTECTION=n CONFIG_COVERAGE=n diff --git a/tests/benchmarks/latency_measure/prj_small_freq_divider.conf b/tests/benchmarks/latency_measure/prj_small_freq_divider.conf index bd3f2dec1749..0e3cb09f0b39 100644 --- a/tests/benchmarks/latency_measure/prj_small_freq_divider.conf +++ b/tests/benchmarks/latency_measure/prj_small_freq_divider.conf @@ -11,7 +11,4 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=10 CONFIG_IRQ_OFFLOAD=y CONFIG_FORCE_NO_ASSERT=y -#Disable Userspace -CONFIG_TEST_USERSPACE=n -CONFIG_TEST_HW_STACK_PROTECTION=n CONFIG_COVERAGE=n diff --git a/tests/benchmarks/sched/prj.conf b/tests/benchmarks/sched/prj.conf index f3362e58edfd..2871aaa05bee 100644 --- a/tests/benchmarks/sched/prj.conf +++ b/tests/benchmarks/sched/prj.conf @@ -1,4 +1,3 @@ -CONFIG_TEST_USERSPACE=n CONFIG_NUM_PREEMPT_PRIORITIES=8 CONFIG_NUM_COOP_PRIORITIES=8 diff --git a/tests/benchmarks/sys_kernel/prj.conf b/tests/benchmarks/sys_kernel/prj.conf index 9aa1e03f3ec2..05152f924389 100644 --- a/tests/benchmarks/sys_kernel/prj.conf +++ b/tests/benchmarks/sys_kernel/prj.conf @@ -9,6 +9,4 @@ CONFIG_TICKLESS_KERNEL=n CONFIG_MAIN_STACK_SIZE=16384 CONFIG_FORCE_NO_ASSERT=y -#Disable Userspace -CONFIG_TEST_USERSPACE=n CONFIG_TEST_HW_STACK_PROTECTION=n diff --git a/tests/benchmarks/timing_info/prj.conf b/tests/benchmarks/timing_info/prj.conf index a5c3f8dffd49..0bbcc5826bab 100644 --- a/tests/benchmarks/timing_info/prj.conf +++ b/tests/benchmarks/timing_info/prj.conf @@ -4,10 +4,5 @@ CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_HEAP_MEM_POOL_SIZE=256 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_FORCE_NO_ASSERT=y -CONFIG_APPLICATION_DEFINED_SYSCALL=y - -#Disable Userspace -CONFIG_TEST_USERSPACE=n CONFIG_TEST_HW_STACK_PROTECTION=n - CONFIG_SMP=n diff --git a/tests/benchmarks/timing_info/prj_userspace.conf b/tests/benchmarks/timing_info/prj_userspace.conf index 127df73a91f8..2ac727568368 100644 --- a/tests/benchmarks/timing_info/prj_userspace.conf +++ b/tests/benchmarks/timing_info/prj_userspace.conf @@ -5,3 +5,4 @@ CONFIG_HEAP_MEM_POOL_SIZE=256 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_FORCE_NO_ASSERT=y CONFIG_APPLICATION_DEFINED_SYSCALL=y +CONFIG_TEST_USERSPACE=y diff --git a/tests/bluetooth/init/prj_controller_dbg.conf b/tests/bluetooth/init/prj_controller_dbg.conf index 6db4a9384236..e385a79817c7 100644 --- a/tests/bluetooth/init/prj_controller_dbg.conf +++ b/tests/bluetooth/init/prj_controller_dbg.conf @@ -58,5 +58,3 @@ CONFIG_DEBUG=y CONFIG_FLASH=y CONFIG_SOC_FLASH_NRF_RADIO_SYNC=n CONFIG_ZTEST=y -# FIXME see #7704 -CONFIG_TEST_USERSPACE=n diff --git a/tests/bluetooth/init/prj_controller_dbg_ll_sw_split.conf b/tests/bluetooth/init/prj_controller_dbg_ll_sw_split.conf index d4ef01e4b687..d95e0b0e89cd 100644 --- a/tests/bluetooth/init/prj_controller_dbg_ll_sw_split.conf +++ b/tests/bluetooth/init/prj_controller_dbg_ll_sw_split.conf @@ -59,5 +59,3 @@ CONFIG_DEBUG=y CONFIG_FLASH=y CONFIG_SOC_FLASH_NRF_RADIO_SYNC=n CONFIG_ZTEST=y -# FIXME see #7704 -CONFIG_TEST_USERSPACE=n diff --git a/tests/bluetooth/mesh_shell/prj.conf b/tests/bluetooth/mesh_shell/prj.conf index ea67e73a6003..58e45cd0d148 100644 --- a/tests/bluetooth/mesh_shell/prj.conf +++ b/tests/bluetooth/mesh_shell/prj.conf @@ -1,7 +1,5 @@ CONFIG_TEST=y #CONFIG_INIT_STACKS=y -CONFIG_TEST_USERSPACE=n -CONFIG_USERSPACE=n CONFIG_MAIN_STACK_SIZE=448 CONFIG_ISR_STACK_SIZE=1024 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 diff --git a/tests/bluetooth/shell/mesh.conf b/tests/bluetooth/shell/mesh.conf index 20e3a1387ab6..937d47f60dd9 100644 --- a/tests/bluetooth/shell/mesh.conf +++ b/tests/bluetooth/shell/mesh.conf @@ -1,5 +1,4 @@ CONFIG_TEST=y -CONFIG_USERSPACE=n #CONFIG_INIT_STACKS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 diff --git a/tests/bluetooth/tester/default.conf b/tests/bluetooth/tester/default.conf index 31dcfda0ad5a..e5d87b2ef37e 100644 --- a/tests/bluetooth/tester/default.conf +++ b/tests/bluetooth/tester/default.conf @@ -34,3 +34,6 @@ CONFIG_BT_TESTING=y CONFIG_UART_CONSOLE=n CONFIG_GPIO=y + +# FIXME: #15232 +CONFIG_TEST_USERSPACE=y diff --git a/tests/crypto/mbedtls/prj.conf b/tests/crypto/mbedtls/prj.conf index f0c0304ae582..ed8ee9816435 100644 --- a/tests/crypto/mbedtls/prj.conf +++ b/tests/crypto/mbedtls/prj.conf @@ -4,3 +4,4 @@ CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_CFG_FILE="config-tls-generic.h" CONFIG_MBEDTLS_TEST=y CONFIG_ZTEST=y +CONFIG_TEST_USERSPACE=y diff --git a/tests/crypto/mbedtls/testcase.yaml b/tests/crypto/mbedtls/testcase.yaml index 406f8ec77c7f..b613da2faa5d 100644 --- a/tests/crypto/mbedtls/testcase.yaml +++ b/tests/crypto/mbedtls/testcase.yaml @@ -4,5 +4,5 @@ tests: platform_exclude: qemu_x86_64 # FIXME min_flash: 65 min_ram: 32 - tags: crypto mbedtls + tags: crypto mbedtls userspace timeout: 200 diff --git a/tests/crypto/tinycrypt_hmac_prng/prj.conf b/tests/crypto/tinycrypt_hmac_prng/prj.conf index 9c09e2e68d2d..0830938dc3dd 100644 --- a/tests/crypto/tinycrypt_hmac_prng/prj.conf +++ b/tests/crypto/tinycrypt_hmac_prng/prj.conf @@ -4,4 +4,3 @@ CONFIG_TINYCRYPT_SHA256=y CONFIG_TINYCRYPT_SHA256_HMAC=y CONFIG_TINYCRYPT_SHA256_HMAC_PRNG=y CONFIG_ZTEST=y -CONFIG_TEST_USERSPACE=n diff --git a/tests/drivers/adc/adc_api/prj.conf b/tests/drivers/adc/adc_api/prj.conf index c9761e8bbc1c..c307b998b93b 100644 --- a/tests/drivers/adc/adc_api/prj.conf +++ b/tests/drivers/adc/adc_api/prj.conf @@ -7,3 +7,4 @@ CONFIG_LOG=y CONFIG_ADC_LOG_LEVEL_INF=y CONFIG_LOG_IMMEDIATE=y CONFIG_HEAP_MEM_POOL_SIZE=1024 +CONFIG_TEST_USERSPACE=y diff --git a/tests/drivers/adc/adc_api/testcase.yaml b/tests/drivers/adc/adc_api/testcase.yaml index 7f5dc25c9eba..87fa3dca5518 100644 --- a/tests/drivers/adc/adc_api/testcase.yaml +++ b/tests/drivers/adc/adc_api/testcase.yaml @@ -1,5 +1,5 @@ common: - tags: peripheral adc + tags: peripheral adc userspace tests: peripheral.adc: depends_on: adc diff --git a/tests/drivers/build_all/drivers.conf b/tests/drivers/build_all/drivers.conf index 5706f0bc6078..2e271d7c0051 100644 --- a/tests/drivers/build_all/drivers.conf +++ b/tests/drivers/build_all/drivers.conf @@ -11,3 +11,4 @@ CONFIG_SERIAL=y CONFIG_SPI=y CONFIG_WATCHDOG=y CONFIG_X86_KERNEL_OOPS=n +CONFIG_TEST_USERSPACE=y diff --git a/tests/drivers/build_all/ethernet.conf b/tests/drivers/build_all/ethernet.conf index 6e04409aff8a..2849f8e4dfe1 100644 --- a/tests/drivers/build_all/ethernet.conf +++ b/tests/drivers/build_all/ethernet.conf @@ -4,6 +4,7 @@ CONFIG_NETWORKING=y CONFIG_NET_L2_ETHERNET=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y +CONFIG_TEST_USERSPACE=y # No board will enable the generic SPI hosted enc28j60 driver by # default, force it on: diff --git a/tests/drivers/build_all/gpio.conf b/tests/drivers/build_all/gpio.conf index bedaf7e21452..dfb1ed6861c1 100644 --- a/tests/drivers/build_all/gpio.conf +++ b/tests/drivers/build_all/gpio.conf @@ -1,5 +1,5 @@ CONFIG_TEST=y CONFIG_GPIO=y - +CONFIG_TEST_USERSPACE=y CONFIG_I2C=y CONFIG_GPIO_SX1509B=y diff --git a/tests/drivers/build_all/prj.conf b/tests/drivers/build_all/prj.conf index e1faee53e19d..901353030a12 100644 --- a/tests/drivers/build_all/prj.conf +++ b/tests/drivers/build_all/prj.conf @@ -1 +1,2 @@ CONFIG_TEST=y +CONFIG_TEST_USERSPACE=y diff --git a/tests/drivers/build_all/sensors_a_h.conf b/tests/drivers/build_all/sensors_a_h.conf index a5fdf2204223..e0a98d843c51 100644 --- a/tests/drivers/build_all/sensors_a_h.conf +++ b/tests/drivers/build_all/sensors_a_h.conf @@ -5,6 +5,7 @@ CONFIG_SENSOR=y CONFIG_SPI=y CONFIG_LOG=y CONFIG_SENSOR_LOG_LEVEL_DBG=y +CONFIG_TEST_USERSPACE=y # Some sensor drivers (notably HP206C) demand high tick rates: CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 diff --git a/tests/drivers/build_all/sensors_i_z.conf b/tests/drivers/build_all/sensors_i_z.conf index 772f0848be66..2ca339c2e917 100644 --- a/tests/drivers/build_all/sensors_i_z.conf +++ b/tests/drivers/build_all/sensors_i_z.conf @@ -1,4 +1,5 @@ CONFIG_TEST=y +CONFIG_TEST_USERSPACE=y CONFIG_GPIO=y CONFIG_I2C=y CONFIG_SENSOR=y diff --git a/tests/drivers/build_all/sensors_trigger_a_h.conf b/tests/drivers/build_all/sensors_trigger_a_h.conf index 85920b028732..12ad43b2fed2 100644 --- a/tests/drivers/build_all/sensors_trigger_a_h.conf +++ b/tests/drivers/build_all/sensors_trigger_a_h.conf @@ -1,4 +1,5 @@ CONFIG_TEST=y +CONFIG_TEST_USERSPACE=y CONFIG_I2C=y CONFIG_ADC=y CONFIG_GPIO=y diff --git a/tests/drivers/build_all/sensors_trigger_i_z.conf b/tests/drivers/build_all/sensors_trigger_i_z.conf index 9acd7726fb17..bacd8de8ab3d 100644 --- a/tests/drivers/build_all/sensors_trigger_i_z.conf +++ b/tests/drivers/build_all/sensors_trigger_i_z.conf @@ -1,4 +1,5 @@ CONFIG_TEST=y +CONFIG_TEST_USERSPACE=y CONFIG_I2C=y CONFIG_ADC=y CONFIG_GPIO=y diff --git a/tests/drivers/build_all/testcase.yaml b/tests/drivers/build_all/testcase.yaml index 864a49f7285d..569c0c8d70fd 100644 --- a/tests/drivers/build_all/testcase.yaml +++ b/tests/drivers/build_all/testcase.yaml @@ -36,9 +36,6 @@ tests: platform_exclude: frdm_kw41z tags: drivers footprint depends_on: adc spi - # FIXME see #7703 - extra_configs: - - CONFIG_TEST_USERSPACE=n test_build_sensors_i_z: build_only: true extra_args: CONF_FILE=sensors_i_z.conf diff --git a/tests/drivers/i2s/i2s_api/prj.conf b/tests/drivers/i2s/i2s_api/prj.conf index 99ff252406a1..7c088b1ffe46 100644 --- a/tests/drivers/i2s/i2s_api/prj.conf +++ b/tests/drivers/i2s/i2s_api/prj.conf @@ -1,2 +1,3 @@ CONFIG_I2S=y CONFIG_ZTEST=y +CONFIG_TEST_USERSPACE=y diff --git a/tests/drivers/i2s/i2s_api/testcase.yaml b/tests/drivers/i2s/i2s_api/testcase.yaml index bc44e32b5843..84a075c0624c 100644 --- a/tests/drivers/i2s/i2s_api/testcase.yaml +++ b/tests/drivers/i2s/i2s_api/testcase.yaml @@ -1,4 +1,4 @@ tests: peripheral.i2s: depends_on: i2s - tags: drivers + tags: drivers userspace diff --git a/tests/kernel/common/prj.conf b/tests/kernel/common/prj.conf index 08ce44e54679..cb439592d001 100644 --- a/tests/kernel/common/prj.conf +++ b/tests/kernel/common/prj.conf @@ -5,5 +5,5 @@ CONFIG_POLL=y CONFIG_QEMU_TICKLESS_WORKAROUND=y CONFIG_BOOT_DELAY=500 CONFIG_IRQ_OFFLOAD=y - +CONFIG_TEST_USERSPACE=y CONFIG_SMP=n diff --git a/tests/kernel/common/testcase.yaml b/tests/kernel/common/testcase.yaml index c11f02b235e9..e23241a2ce74 100644 --- a/tests/kernel/common/testcase.yaml +++ b/tests/kernel/common/testcase.yaml @@ -1,6 +1,6 @@ tests: kernel.common: - tags: kernel + tags: kernel userspace min_flash: 33 min_ram: 32 kernel.common.misra: diff --git a/tests/kernel/fatal/prj.conf b/tests/kernel/fatal/prj.conf index f177ccfa001f..acc932d71dc5 100644 --- a/tests/kernel/fatal/prj.conf +++ b/tests/kernel/fatal/prj.conf @@ -1,5 +1,5 @@ CONFIG_HW_STACK_PROTECTION=y CONFIG_ZTEST=y CONFIG_COVERAGE=n - +CONFIG_TEST_USERSPACE=y CONFIG_SMP=n diff --git a/tests/kernel/fatal/sentinel.conf b/tests/kernel/fatal/sentinel.conf index d3aa220596db..bb2c1a2ff616 100644 --- a/tests/kernel/fatal/sentinel.conf +++ b/tests/kernel/fatal/sentinel.conf @@ -1,6 +1,5 @@ CONFIG_STACK_SENTINEL=y CONFIG_TEST_HW_STACK_PROTECTION=n -CONFIG_TEST_USERSPACE=n CONFIG_ZTEST=y CONFIG_COVERAGE=n CONFIG_SMP=n diff --git a/tests/kernel/fatal/testcase.yaml b/tests/kernel/fatal/testcase.yaml index 9063656f328b..be2d91daf440 100644 --- a/tests/kernel/fatal/testcase.yaml +++ b/tests/kernel/fatal/testcase.yaml @@ -2,7 +2,7 @@ tests: kernel.common.stack_protection: extra_args: CONF_FILE=prj.conf filter: CONFIG_ARCH_HAS_STACK_PROTECTION - tags: kernel ignore_faults + tags: kernel ignore_faults userspace kernel.common.stack_sentinel: extra_args: CONF_FILE=sentinel.conf - tags: kernel ignore_faults + tags: kernel ignore_faults userspace diff --git a/tests/kernel/mem_protect/stackprot/prj.conf b/tests/kernel/mem_protect/stackprot/prj.conf index d325775f157b..e49577e1cb18 100644 --- a/tests/kernel/mem_protect/stackprot/prj.conf +++ b/tests/kernel/mem_protect/stackprot/prj.conf @@ -4,3 +4,4 @@ CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_MAIN_THREAD_PRIORITY=7 CONFIG_MAIN_STACK_SIZE=640 +CONFIG_TEST_USERSPACE=y diff --git a/tests/kernel/mem_protect/stackprot/testcase.yaml b/tests/kernel/mem_protect/stackprot/testcase.yaml index 6779a2e0ef5e..93b7656f9ad6 100644 --- a/tests/kernel/mem_protect/stackprot/testcase.yaml +++ b/tests/kernel/mem_protect/stackprot/testcase.yaml @@ -1,4 +1,4 @@ tests: kernel.memory_protection: arch_exclude: nios2 xtensa posix x86_64 - tags: kernel ignore_faults + tags: kernel ignore_faults userspace diff --git a/tests/kernel/mem_protect/userspace/prj.conf b/tests/kernel/mem_protect/userspace/prj.conf index 290785d867ec..1ec41b68d11f 100644 --- a/tests/kernel/mem_protect/userspace/prj.conf +++ b/tests/kernel/mem_protect/userspace/prj.conf @@ -2,3 +2,4 @@ CONFIG_ZTEST=y CONFIG_INIT_STACKS=y CONFIG_APPLICATION_DEFINED_SYSCALL=y CONFIG_THREAD_USERSPACE_LOCAL_DATA=y +CONFIG_TEST_USERSPACE=y diff --git a/tests/kernel/msgq/msgq_api/prj.conf b/tests/kernel/msgq/msgq_api/prj.conf index 24ec6ef7e44d..eeb8af54efd6 100644 --- a/tests/kernel/msgq/msgq_api/prj.conf +++ b/tests/kernel/msgq/msgq_api/prj.conf @@ -1,6 +1,4 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y -CONFIG_USERSPACE=y -CONFIG_DYNAMIC_OBJECTS=y - +CONFIG_TEST_USERSPACE=y CONFIG_SMP=n diff --git a/tests/kernel/mutex/sys_mutex/prj.conf b/tests/kernel/mutex/sys_mutex/prj.conf index b6f27e8fa945..94733f7c65f6 100644 --- a/tests/kernel/mutex/sys_mutex/prj.conf +++ b/tests/kernel/mutex/sys_mutex/prj.conf @@ -1,5 +1,5 @@ CONFIG_MAIN_THREAD_PRIORITY=10 CONFIG_ZTEST=y CONFIG_ZTEST_STACKSIZE=512 - +CONFIG_TEST_USERSPACE=y CONFIG_SMP=n diff --git a/tests/kernel/pipe/pipe/prj.conf b/tests/kernel/pipe/pipe/prj.conf index 21f3474dd9a3..390173dc4a59 100644 --- a/tests/kernel/pipe/pipe/prj.conf +++ b/tests/kernel/pipe/pipe/prj.conf @@ -1,4 +1,3 @@ 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 6da5a62cc24a..822b7dc8a51c 100644 --- a/tests/kernel/pipe/pipe_api/prj.conf +++ b/tests/kernel/pipe/pipe_api/prj.conf @@ -2,5 +2,4 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y CONFIG_TEST_USERSPACE=y CONFIG_DYNAMIC_OBJECTS=y - CONFIG_SMP=n diff --git a/tests/kernel/poll/prj.conf b/tests/kernel/poll/prj.conf index a28ebedf2773..9282d449ea0b 100644 --- a/tests/kernel/poll/prj.conf +++ b/tests/kernel/poll/prj.conf @@ -1,5 +1,5 @@ CONFIG_ZTEST=y CONFIG_POLL=y CONFIG_DYNAMIC_OBJECTS=y - +CONFIG_TEST_USERSPACE=y CONFIG_SMP=n diff --git a/tests/kernel/poll/src/test_poll.c b/tests/kernel/poll/src/test_poll.c index de59470a115d..49488a0a2617 100644 --- a/tests/kernel/poll/src/test_poll.c +++ b/tests/kernel/poll/src/test_poll.c @@ -15,11 +15,16 @@ struct fifo_msg { #define SIGNAL_RESULT 0x1ee7d00d #define FIFO_MSG_VALUE 0xdeadbeef +#define STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACKSIZE) /* verify k_poll() without waiting */ static struct k_sem no_wait_sem; static struct k_fifo no_wait_fifo; static struct k_poll_signal no_wait_signal; +static struct k_thread test_thread; +static struct k_thread test_loprio_thread; +K_THREAD_STACK_DEFINE(test_stack, STACK_SIZE); +K_THREAD_STACK_DEFINE(test_loprio_stack, STACK_SIZE); /** * @brief Test cases to verify poll @@ -113,10 +118,6 @@ static struct k_poll_signal wait_signal = struct fifo_msg wait_msg = { NULL, FIFO_MSG_VALUE }; -static struct k_thread poll_wait_helper_thread; -static K_THREAD_STACK_DEFINE(poll_wait_helper_stack, - KB(1) + CONFIG_TEST_EXTRA_STACKSIZE); - #define TAG_0 10 #define TAG_1 11 #define TAG_2 12 @@ -174,8 +175,8 @@ void test_poll_wait(void) */ k_thread_priority_set(k_current_get(), main_low_prio); - k_thread_create(&poll_wait_helper_thread, poll_wait_helper_stack, - K_THREAD_STACK_SIZEOF(poll_wait_helper_stack), + k_thread_create(&test_thread, test_stack, + K_THREAD_STACK_SIZEOF(test_stack), poll_wait_helper, (void *)1, 0, 0, main_low_prio - 1, K_USER | K_INHERIT_PERMS, 0); @@ -230,8 +231,8 @@ void test_poll_wait(void) */ k_thread_priority_set(k_current_get(), main_low_prio); - k_thread_create(&poll_wait_helper_thread, poll_wait_helper_stack, - K_THREAD_STACK_SIZEOF(poll_wait_helper_stack), + k_thread_create(&test_thread, test_stack, + K_THREAD_STACK_SIZEOF(test_stack), poll_wait_helper, 0, 0, 0, main_low_prio - 1, 0, 0); @@ -265,8 +266,8 @@ void test_poll_wait(void) wait_events[2].state = K_POLL_STATE_NOT_READY; wait_signal.signaled = 0U; - k_thread_create(&poll_wait_helper_thread, poll_wait_helper_stack, - K_THREAD_STACK_SIZEOF(poll_wait_helper_stack), + k_thread_create(&test_thread, test_stack, + K_THREAD_STACK_SIZEOF(test_stack), poll_wait_helper, (void *)1, 0, 0, old_prio + 1, K_USER | K_INHERIT_PERMS, 0); @@ -338,9 +339,6 @@ void test_poll_wait(void) static struct k_fifo cancel_fifo; static struct k_fifo non_cancel_fifo; -static struct k_thread poll_cancel_helper_thread; -static K_THREAD_STACK_DEFINE(poll_cancel_helper_stack, 768); - static void poll_cancel_helper(void *p1, void *p2, void *p3) { (void)p1; (void)p2; (void)p3; @@ -386,8 +384,8 @@ void test_poll_cancel(bool is_main_low_prio) k_thread_priority_set(k_current_get(), main_low_prio); } - k_thread_create(&poll_cancel_helper_thread, poll_cancel_helper_stack, - K_THREAD_STACK_SIZEOF(poll_cancel_helper_stack), + k_thread_create(&test_thread, test_stack, + K_THREAD_STACK_SIZEOF(test_stack), poll_cancel_helper, (void *)1, 0, 0, main_low_prio - 1, K_USER | K_INHERIT_PERMS, 0); @@ -429,10 +427,6 @@ void test_poll_cancel_main_high_prio(void) /* verify multiple pollers */ static K_SEM_DEFINE(multi_sem, 0, 1); -static struct k_thread multi_thread_lowprio; -static K_THREAD_STACK_DEFINE(multi_stack_lowprio, - KB(1) + CONFIG_TEST_EXTRA_STACKSIZE); - static void multi_lowprio(void *p1, void *p2, void *p3) { (void)p1; (void)p2; (void)p3; @@ -450,9 +444,6 @@ static void multi_lowprio(void *p1, void *p2, void *p3) static K_SEM_DEFINE(multi_reply, 0, 1); -static struct k_thread multi_thread; -static K_THREAD_STACK_DEFINE(multi_stack, KB(1) + CONFIG_TEST_EXTRA_STACKSIZE); - static void multi(void *p1, void *p2, void *p3) { (void)p1; (void)p2; (void)p3; @@ -493,8 +484,8 @@ void test_poll_multi(void) k_thread_priority_set(k_current_get(), main_low_prio); - k_thread_create(&multi_thread, multi_stack, - K_THREAD_STACK_SIZEOF(multi_stack), + k_thread_create(&test_thread, test_stack, + K_THREAD_STACK_SIZEOF(test_stack), multi, 0, 0, 0, main_low_prio - 1, K_USER | K_INHERIT_PERMS, 0); @@ -502,8 +493,8 @@ void test_poll_multi(void) * create additional thread to add multiple(more than one) pending threads * in events list to improve code coverage */ - k_thread_create(&multi_thread_lowprio, multi_stack_lowprio, - K_THREAD_STACK_SIZEOF(multi_stack_lowprio), + k_thread_create(&test_loprio_thread, test_loprio_stack, + K_THREAD_STACK_SIZEOF(test_loprio_stack), multi_lowprio, 0, 0, 0, main_low_prio + 1, K_USER | K_INHERIT_PERMS, 0); @@ -527,8 +518,6 @@ void test_poll_multi(void) k_sleep(250); } -static struct k_thread signal_thread; -static K_THREAD_STACK_DEFINE(signal_stack, KB(1) + CONFIG_TEST_EXTRA_STACKSIZE); static struct k_poll_signal signal; static void threadstate(void *p1, void *p2, void *p3) @@ -573,8 +562,8 @@ void test_poll_threadstate(void) k_thread_priority_set(k_current_get(), main_low_prio); k_tid_t ztest_tid = k_current_get(); - k_thread_create(&signal_thread, signal_stack, - K_THREAD_STACK_SIZEOF(signal_stack), threadstate, + k_thread_create(&test_thread, test_stack, + K_THREAD_STACK_SIZEOF(test_stack), threadstate, ztest_tid, 0, 0, main_low_prio - 1, K_INHERIT_PERMS, 0); /* wait for spawn thread to take action */ @@ -595,8 +584,6 @@ void test_poll_grant_access(void) k_thread_access_grant(k_current_get(), &no_wait_sem, &no_wait_fifo, &no_wait_signal, &wait_sem, &wait_fifo, &cancel_fifo, &non_cancel_fifo, - &wait_signal, &poll_wait_helper_thread, - &poll_wait_helper_stack, &multi_sem, - &multi_reply, &multi_thread, &multi_stack, - &multi_thread_lowprio, &multi_stack_lowprio); + &wait_signal, &test_thread, + &test_stack, &multi_sem, &multi_reply) } diff --git a/tests/kernel/queue/prj.conf b/tests/kernel/queue/prj.conf index d1ed30f1b416..6349c6a6b276 100644 --- a/tests/kernel/queue/prj.conf +++ b/tests/kernel/queue/prj.conf @@ -1,5 +1,4 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y -CONFIG_USERSPACE=y -CONFIG_DYNAMIC_OBJECTS=y CONFIG_SMP=n +CONFIG_TEST_USERSPACE=y diff --git a/tests/kernel/queue/prj_poll.conf b/tests/kernel/queue/prj_poll.conf index eacbf000b13e..ddb501245d56 100644 --- a/tests/kernel/queue/prj_poll.conf +++ b/tests/kernel/queue/prj_poll.conf @@ -1,6 +1,5 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y CONFIG_POLL=y -CONFIG_USERSPACE=y -CONFIG_DYNAMIC_OBJECTS=y +CONFIG_TEST_USERSPACE=y CONFIG_SMP=n diff --git a/tests/kernel/queue/testcase.yaml b/tests/kernel/queue/testcase.yaml index 8fcb188e6ee6..426e673159cc 100644 --- a/tests/kernel/queue/testcase.yaml +++ b/tests/kernel/queue/testcase.yaml @@ -1,6 +1,6 @@ tests: kernel.queue: - tags: kernel + tags: kernel userspace kernel.queue.poll: extra_args: CONF_FILE="prj_poll.conf" tags: kernel userspace diff --git a/tests/kernel/semaphore/sema_api/prj.conf b/tests/kernel/semaphore/sema_api/prj.conf index 112164b77443..6349c6a6b276 100644 --- a/tests/kernel/semaphore/sema_api/prj.conf +++ b/tests/kernel/semaphore/sema_api/prj.conf @@ -1,3 +1,4 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y CONFIG_SMP=n +CONFIG_TEST_USERSPACE=y diff --git a/tests/kernel/semaphore/semaphore/prj.conf b/tests/kernel/semaphore/semaphore/prj.conf index 05500734acea..eeb8af54efd6 100644 --- a/tests/kernel/semaphore/semaphore/prj.conf +++ b/tests/kernel/semaphore/semaphore/prj.conf @@ -1,5 +1,4 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y CONFIG_TEST_USERSPACE=y - CONFIG_SMP=n diff --git a/tests/kernel/stack/stack_api/prj.conf b/tests/kernel/stack/stack_api/prj.conf index d1ed30f1b416..eeb8af54efd6 100644 --- a/tests/kernel/stack/stack_api/prj.conf +++ b/tests/kernel/stack/stack_api/prj.conf @@ -1,5 +1,4 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y -CONFIG_USERSPACE=y -CONFIG_DYNAMIC_OBJECTS=y +CONFIG_TEST_USERSPACE=y CONFIG_SMP=n diff --git a/tests/kernel/stack/stack_usage/prj.conf b/tests/kernel/stack/stack_usage/prj.conf index 112164b77443..6349c6a6b276 100644 --- a/tests/kernel/stack/stack_usage/prj.conf +++ b/tests/kernel/stack/stack_usage/prj.conf @@ -1,3 +1,4 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y CONFIG_SMP=n +CONFIG_TEST_USERSPACE=y diff --git a/tests/kernel/threads/dynamic_thread/prj.conf b/tests/kernel/threads/dynamic_thread/prj.conf index ce38e8f14592..07cda4ba9d38 100644 --- a/tests/kernel/threads/dynamic_thread/prj.conf +++ b/tests/kernel/threads/dynamic_thread/prj.conf @@ -1,4 +1,3 @@ CONFIG_ZTEST=y -CONFIG_USERSPACE=y -CONFIG_DYNAMIC_OBJECTS=y +CONFIG_TEST_USERSPACE=y CONFIG_HEAP_MEM_POOL_SIZE=2048 diff --git a/tests/kernel/threads/no-multithreading/prj.conf b/tests/kernel/threads/no-multithreading/prj.conf index 6e1dbf9c4bea..030c9730b8ca 100644 --- a/tests/kernel/threads/no-multithreading/prj.conf +++ b/tests/kernel/threads/no-multithreading/prj.conf @@ -2,11 +2,3 @@ CONFIG_ZTEST=y CONFIG_MULTITHREADING=n CONFIG_BT=n CONFIG_USB=n - -# Running without multithreading implies the lack of MMU support. -# Setting CONFIG_USERSPACE=n alone is not enough to disable userspace. -# The TEST_USERSPACE symbol (designed to enable userspace by default -# on tests platforms that support it) defaults to =y and will -# automatically select it back. -CONFIG_TEST_USERSPACE=n -CONFIG_USERSPACE=n diff --git a/tests/kernel/threads/thread_apis/prj.conf b/tests/kernel/threads/thread_apis/prj.conf index b3b563fa2716..fdfccad3f385 100644 --- a/tests/kernel/threads/thread_apis/prj.conf +++ b/tests/kernel/threads/thread_apis/prj.conf @@ -6,3 +6,4 @@ CONFIG_THREAD_STACK_INFO=y CONFIG_HEAP_MEM_POOL_SIZE=256 CONFIG_SCHED_CPU_MASK=y CONFIG_SMP=n +CONFIG_TEST_USERSPACE=y diff --git a/tests/kernel/threads/thread_init/prj.conf b/tests/kernel/threads/thread_init/prj.conf index 9467c2926896..e39776e7067a 100644 --- a/tests/kernel/threads/thread_init/prj.conf +++ b/tests/kernel/threads/thread_init/prj.conf @@ -1 +1,2 @@ CONFIG_ZTEST=y +CONFIG_TEST_USERSPACE=y diff --git a/tests/kernel/workq/work_queue_api/prj.conf b/tests/kernel/workq/work_queue_api/prj.conf index 88a73baf4ceb..95c517fee423 100644 --- a/tests/kernel/workq/work_queue_api/prj.conf +++ b/tests/kernel/workq/work_queue_api/prj.conf @@ -2,5 +2,5 @@ CONFIG_ZTEST=y CONFIG_IRQ_OFFLOAD=y CONFIG_HEAP_MEM_POOL_SIZE=1024 CONFIG_THREAD_NAME=y - +CONFIG_TEST_USERSPACE=y CONFIG_SMP=n diff --git a/tests/kernel/workq/work_queue_api/testcase.yaml b/tests/kernel/workq/work_queue_api/testcase.yaml index 0ce66662d22e..3cc99b0bb1bd 100644 --- a/tests/kernel/workq/work_queue_api/testcase.yaml +++ b/tests/kernel/workq/work_queue_api/testcase.yaml @@ -1,3 +1,3 @@ tests: kernel.workqueue: - tags: kernel + tags: kernel userspace diff --git a/tests/lib/mem_alloc/prj.conf b/tests/lib/mem_alloc/prj.conf index 76d0e805fad3..87969fc03ff9 100644 --- a/tests/lib/mem_alloc/prj.conf +++ b/tests/lib/mem_alloc/prj.conf @@ -1,2 +1,3 @@ CONFIG_ZTEST=y CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=2048 +CONFIG_TEST_USERSPACE=y diff --git a/tests/lib/mem_alloc/prj_newlib.conf b/tests/lib/mem_alloc/prj_newlib.conf index 91f4ca405615..24fa6a942004 100644 --- a/tests/lib/mem_alloc/prj_newlib.conf +++ b/tests/lib/mem_alloc/prj_newlib.conf @@ -2,3 +2,4 @@ CONFIG_ZTEST=y CONFIG_NEWLIB_LIBC=y CONFIG_MAIN_STACK_SIZE=1024 CONFIG_NEWLIB_LIBC_ALIGNED_HEAP_SIZE=512 +CONFIG_TEST_USERSPACE=y diff --git a/tests/net/lib/mqtt_packet/prj.conf b/tests/net/lib/mqtt_packet/prj.conf index c8e75648481c..1c4a907a1558 100644 --- a/tests/net/lib/mqtt_packet/prj.conf +++ b/tests/net/lib/mqtt_packet/prj.conf @@ -9,5 +9,5 @@ CONFIG_TEST_RANDOM_GENERATOR=y # enable the MQTT lib CONFIG_MQTT_LIB=y CONFIG_ZTEST=y - +CONFIG_TEST_USERSPACE=y CONFIG_MAIN_STACK_SIZE=1280 diff --git a/tests/net/lib/mqtt_packet/testcase.yaml b/tests/net/lib/mqtt_packet/testcase.yaml index fdb07caada3e..4b4092411606 100644 --- a/tests/net/lib/mqtt_packet/testcase.yaml +++ b/tests/net/lib/mqtt_packet/testcase.yaml @@ -1,7 +1,7 @@ common: depends_on: netif - platform_whitelist: native_posix qemu_x86 qemu_cortex_m3 + platform_whitelist: native_posix qemu_x86 mps2_an385 tests: net.mqtt.packet: min_ram: 16 - tags: mqtt net + tags: mqtt net userspace diff --git a/tests/net/socket/getaddrinfo/prj.conf b/tests/net/socket/getaddrinfo/prj.conf index d529146183e2..4a1c4ed64409 100644 --- a/tests/net/socket/getaddrinfo/prj.conf +++ b/tests/net/socket/getaddrinfo/prj.conf @@ -30,4 +30,5 @@ CONFIG_MAIN_STACK_SIZE=2048 CONFIG_ZTEST=y # User mode requirements +CONFIG_TEST_USERSPACE=y CONFIG_HEAP_MEM_POOL_SIZE=128 diff --git a/tests/net/socket/getnameinfo/prj.conf b/tests/net/socket/getnameinfo/prj.conf index 6c5980314d16..4a1c4ed64409 100644 --- a/tests/net/socket/getnameinfo/prj.conf +++ b/tests/net/socket/getnameinfo/prj.conf @@ -28,7 +28,7 @@ CONFIG_DNS_SERVER2="192.0.2.2:15353" CONFIG_MAIN_STACK_SIZE=2048 CONFIG_ZTEST=y -CONFIG_TEST_USERSPACE=n # User mode requirements +CONFIG_TEST_USERSPACE=y CONFIG_HEAP_MEM_POOL_SIZE=128 diff --git a/tests/net/socket/getnameinfo/testcase.yaml b/tests/net/socket/getnameinfo/testcase.yaml index 45b14238ee6e..46096288dc47 100644 --- a/tests/net/socket/getnameinfo/testcase.yaml +++ b/tests/net/socket/getnameinfo/testcase.yaml @@ -1,7 +1,7 @@ common: depends_on: netif - platform_whitelist: native_posix qemu_x86 qemu_cortex_m3 + platform_whitelist: native_posix qemu_x86 mps2_an385 tests: net.socket: min_ram: 21 - tags: net socket + tags: net socket userspace diff --git a/tests/net/socket/misc/prj.conf b/tests/net/socket/misc/prj.conf index 0747f020feca..cd4831e5eacd 100644 --- a/tests/net/socket/misc/prj.conf +++ b/tests/net/socket/misc/prj.conf @@ -23,7 +23,7 @@ CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" CONFIG_MAIN_STACK_SIZE=2048 CONFIG_ZTEST=y -CONFIG_TEST_USERSPACE=n # User mode requirements +CONFIG_TEST_USERSPACE=y CONFIG_HEAP_MEM_POOL_SIZE=128 diff --git a/tests/net/socket/misc/src/main.c b/tests/net/socket/misc/src/main.c index 779e1f1618a5..58651da31484 100644 --- a/tests/net/socket/misc/src/main.c +++ b/tests/net/socket/misc/src/main.c @@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); void test_gethostname(void) { - static char buf[80]; + static ZTEST_BMEM char buf[80]; int res; res = gethostname(buf, sizeof(buf)); diff --git a/tests/net/socket/misc/testcase.yaml b/tests/net/socket/misc/testcase.yaml index 45b14238ee6e..46096288dc47 100644 --- a/tests/net/socket/misc/testcase.yaml +++ b/tests/net/socket/misc/testcase.yaml @@ -1,7 +1,7 @@ common: depends_on: netif - platform_whitelist: native_posix qemu_x86 qemu_cortex_m3 + platform_whitelist: native_posix qemu_x86 mps2_an385 tests: net.socket: min_ram: 21 - tags: net socket + tags: net socket userspace diff --git a/tests/net/socket/select/prj.conf b/tests/net/socket/select/prj.conf index 17f9ee40874a..b600de000ffc 100644 --- a/tests/net/socket/select/prj.conf +++ b/tests/net/socket/select/prj.conf @@ -24,6 +24,7 @@ CONFIG_MAIN_STACK_SIZE=2048 CONFIG_ZTEST=y # User mode requirements +CONFIG_TEST_USERSPACE=y CONFIG_HEAP_MEM_POOL_SIZE=128 CONFIG_QEMU_TICKLESS_WORKAROUND=y diff --git a/tests/net/socket/select/testcase.yaml b/tests/net/socket/select/testcase.yaml index 45b14238ee6e..46096288dc47 100644 --- a/tests/net/socket/select/testcase.yaml +++ b/tests/net/socket/select/testcase.yaml @@ -1,7 +1,7 @@ common: depends_on: netif - platform_whitelist: native_posix qemu_x86 qemu_cortex_m3 + platform_whitelist: native_posix qemu_x86 mps2_an385 tests: net.socket: min_ram: 21 - tags: net socket + tags: net socket userspace diff --git a/tests/net/socket/tcp/prj.conf b/tests/net/socket/tcp/prj.conf index 0a4852d21bd8..0a62fcb432da 100644 --- a/tests/net/socket/tcp/prj.conf +++ b/tests/net/socket/tcp/prj.conf @@ -25,6 +25,7 @@ CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_TEST_USERSPACE=y # The test requires lot of bufs CONFIG_NET_PKT_TX_COUNT=24 diff --git a/tests/net/socket/tcp/testcase.yaml b/tests/net/socket/tcp/testcase.yaml index 8e1a9e6e7810..eea14b02a828 100644 --- a/tests/net/socket/tcp/testcase.yaml +++ b/tests/net/socket/tcp/testcase.yaml @@ -1,7 +1,7 @@ common: depends_on: netif - platform_whitelist: native_posix qemu_x86 qemu_cortex_m3 + platform_whitelist: native_posix qemu_x86 mps2_an385 tests: net.socket.tcp: min_ram: 32 - tags: net socket + tags: net socket userspace diff --git a/tests/net/traffic_class/prj.conf b/tests/net/traffic_class/prj.conf index e1ebeabd3088..2e0620228949 100644 --- a/tests/net/traffic_class/prj.conf +++ b/tests/net/traffic_class/prj.conf @@ -30,7 +30,3 @@ CONFIG_NET_TC_RX_COUNT=8 CONFIG_ZTEST=y CONFIG_NET_CONFIG_SETTINGS=n CONFIG_NET_SHELL=n - -# We run out of CONFIG_MAX_THREAD_BYTES in qemu. Instead of increasing that -# value, just disable user space. -CONFIG_USERSPACE=n diff --git a/tests/subsys/fs/nffs_fs_api/basic/nrf5x.conf b/tests/subsys/fs/nffs_fs_api/basic/nrf5x.conf index 20ad0c168253..311d49c0088e 100644 --- a/tests/subsys/fs/nffs_fs_api/basic/nrf5x.conf +++ b/tests/subsys/fs/nffs_fs_api/basic/nrf5x.conf @@ -2,7 +2,6 @@ CONFIG_ZTEST=y CONFIG_ZTEST_STACKSIZE=2048 CONFIG_MAIN_STACK_SIZE=1024 CONFIG_HEAP_MEM_POOL_SIZE=1024 -CONFIG_TEST_USERSPACE=n CONFIG_FLASH=y CONFIG_SOC_FLASH_NRF_RADIO_SYNC=y diff --git a/tests/subsys/fs/nffs_fs_api/cache/nrf5x.conf b/tests/subsys/fs/nffs_fs_api/cache/nrf5x.conf index 20ad0c168253..311d49c0088e 100644 --- a/tests/subsys/fs/nffs_fs_api/cache/nrf5x.conf +++ b/tests/subsys/fs/nffs_fs_api/cache/nrf5x.conf @@ -2,7 +2,6 @@ CONFIG_ZTEST=y CONFIG_ZTEST_STACKSIZE=2048 CONFIG_MAIN_STACK_SIZE=1024 CONFIG_HEAP_MEM_POOL_SIZE=1024 -CONFIG_TEST_USERSPACE=n CONFIG_FLASH=y CONFIG_SOC_FLASH_NRF_RADIO_SYNC=y diff --git a/tests/subsys/fs/nffs_fs_api/large/nrf5x.conf b/tests/subsys/fs/nffs_fs_api/large/nrf5x.conf index 6dc6e33e4098..0900b617f23b 100644 --- a/tests/subsys/fs/nffs_fs_api/large/nrf5x.conf +++ b/tests/subsys/fs/nffs_fs_api/large/nrf5x.conf @@ -2,7 +2,6 @@ CONFIG_ZTEST=y CONFIG_ZTEST_STACKSIZE=2048 CONFIG_MAIN_STACK_SIZE=1024 CONFIG_HEAP_MEM_POOL_SIZE=1024 -CONFIG_TEST_USERSPACE=n CONFIG_FLASH=y CONFIG_BT=n