tests: CONFIG_TEST_USERSPACE now off by default

Andrew Boie · Andrew Boie · commit 71689d2e5ef2 · 2019-04-05T17:06:42.000-07:00
Unlike CONFIG_HW_STACK_PROTECTION, which greatly helps expose stack overflows in test code, activating userspace without putting threads in user mode is of very limited value. Now CONFIG_TEST_USERSPACE is off by default. Any test which puts threads in user mode will need to set CONFIG_TEST_USERSPACE. This should greatly increase sanitycheck build times as there is non-trivial build time overhead to enabling this feature. This also allows some tests which failed the build on RAM-constrained platforms to compile properly. tests/drivers/build_all is a special case; it doesn't put threads in user mode, but we want to ensure all the syscall handlers compile properly. Fixes: #15103 (and probably others) Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 CONFIG_TEST=y
-CONFIG_USERSPACE=n
 #CONFIG_INIT_STACKS=y
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
diff --git 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/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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,2 +1,3 @@
 CONFIG_I2S=y
 CONFIG_ZTEST=y
+CONFIG_TEST_USERSPACE=y
diff --git 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/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
@@ -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/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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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/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
@@ -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/misc/prj.conf b/tests/net/socket/misc/prj.conf
@@ -25,4 +25,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/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/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/traffic_class/prj.conf b/tests/net/traffic_class/prj.conf
diff --git a/tests/subsys/fs/nffs_fs_api/basic/nrf5x.conf b/tests/subsys/fs/nffs_fs_api/basic/nrf5x.conf
diff --git a/tests/subsys/fs/nffs_fs_api/cache/nrf5x.conf b/tests/subsys/fs/nffs_fs_api/cache/nrf5x.conf
diff --git a/tests/subsys/fs/nffs_fs_api/large/nrf5x.conf b/tests/subsys/fs/nffs_fs_api/large/nrf5x.conf

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-CONFIG_TEST_USERSPACE=n`
`2`	`1`	`CONFIG_NUM_PREEMPT_PRIORITIES=8`
`3`	`2`	`CONFIG_NUM_COOP_PRIORITIES=8`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`CONFIG_TEST=y`
`2`		`-CONFIG_USERSPACE=n`
`3`	`2`	`#CONFIG_INIT_STACKS=y`
`4`	`3`	`CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`CONFIG_TEST=y`
	`2`	`+CONFIG_TEST_USERSPACE=y`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`CONFIG_TEST=y`
	`2`	`+CONFIG_TEST_USERSPACE=y`
`2`	`3`	`CONFIG_GPIO=y`
`3`	`4`	`CONFIG_I2C=y`
`4`	`5`	`CONFIG_SENSOR=y`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`CONFIG_I2S=y`
`2`	`2`	`CONFIG_ZTEST=y`
	`3`	`+CONFIG_TEST_USERSPACE=y`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`CONFIG_ZTEST=y`
`2`	`2`	`CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=2048`
	`3`	`+CONFIG_TEST_USERSPACE=y`