tests: explicitly disable HW Stack Protection when needed

ioannisg · MaureenHelm · commit 8ef34566ede6 · 2020-09-24T15:42:09.000-05:00
Some ARM platforms, now, enable HW Stack Protection by
default in the Board definition. So if some tests
need to run without stack protection, it is not
sufficient to disable TEST_HW_STACK_PROTECTION;
we need to explicitly disable HW_STACK_PROTECTION.

Signed-off-by: Ioannis Glaropoulos &lt;Ioannis.Glaropoulos@nordicsemi.no&gt;
diff --git a/tests/benchmarks/app_kernel/prj.conf b/tests/benchmarks/app_kernel/prj.conf
@@ -9,5 +9,6 @@ CONFIG_TICKLESS_KERNEL=n
 CONFIG_MAIN_THREAD_PRIORITY=6
 CONFIG_FORCE_NO_ASSERT=y
 
-#Disable Userspace
+# Disable HW Stack Protection (see #28664)
 CONFIG_TEST_HW_STACK_PROTECTION=n
+CONFIG_HW_STACK_PROTECTION=n
diff --git a/tests/benchmarks/app_kernel/prj_fp.conf b/tests/benchmarks/app_kernel/prj_fp.conf
@@ -14,5 +14,6 @@ CONFIG_TICKLESS_KERNEL=n
 
 CONFIG_FORCE_NO_ASSERT=y
 
-#Disable Userspace
+# Disable HW Stack Protection (see #28664)
 CONFIG_TEST_HW_STACK_PROTECTION=n
+CONFIG_HW_STACK_PROTECTION=n
diff --git a/tests/benchmarks/boot_time/prj.conf b/tests/benchmarks/boot_time/prj.conf
@@ -3,3 +3,5 @@ CONFIG_BOOT_TIME_MEASUREMENT=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_FORCE_NO_ASSERT=y
 CONFIG_TEST_HW_STACK_PROTECTION=n
+# Disable HW Stack Protection (see #28664)
+CONFIG_HW_STACK_PROTECTION=n
diff --git a/tests/benchmarks/latency_measure/prj.conf b/tests/benchmarks/latency_measure/prj.conf
@@ -12,6 +12,8 @@ CONFIG_BT=n
 CONFIG_FORCE_NO_ASSERT=y
 
 CONFIG_TEST_HW_STACK_PROTECTION=n
+# Disable HW Stack Protection (see #28664)
+CONFIG_HW_STACK_PROTECTION=n
 CONFIG_COVERAGE=n
 
 # Disable system power management
diff --git a/tests/benchmarks/sys_kernel/prj.conf b/tests/benchmarks/sys_kernel/prj.conf
@@ -10,6 +10,8 @@ CONFIG_MAIN_STACK_SIZE=16384
 CONFIG_FORCE_NO_ASSERT=y
 
 CONFIG_TEST_HW_STACK_PROTECTION=n
+# Disable HW Stack Protection (see #28664)
+CONFIG_HW_STACK_PROTECTION=n
 
 # Can only run under 1 CPU
 CONFIG_MP_NUM_CPUS=1
diff --git a/tests/kernel/fatal/exception/sentinel.conf b/tests/kernel/fatal/exception/sentinel.conf
@@ -1,5 +1,7 @@
 CONFIG_STACK_SENTINEL=y
 CONFIG_TEST_HW_STACK_PROTECTION=n
+# Disable HW Stack Protection (see #28664)
+CONFIG_HW_STACK_PROTECTION=n
 CONFIG_ZTEST=y
 CONFIG_COVERAGE=n
 CONFIG_TICKLESS_KERNEL=n
diff --git a/tests/kernel/profiling/profiling_api/prj.conf b/tests/kernel/profiling/profiling_api/prj.conf
@@ -4,6 +4,8 @@ CONFIG_PRINTK=y
 CONFIG_THREAD_MONITOR=y
 CONFIG_THREAD_STACK_INFO=y
 CONFIG_TEST_HW_STACK_PROTECTION=n
+# Disable HW Stack Protection (see #28664)
+CONFIG_HW_STACK_PROTECTION=n
 # to check idle thread
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_SYS_POWER_SLEEP_STATES=y
