From 5b29fff725013e9f4d39b934c384130e29b1016a Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Sun, 24 Nov 2024 12:09:36 -0500
Subject: [PATCH] tests: workqueue: avoid filters

Use Kconfig to configure watchdog instead of using expensive filters.

Also disable CONFIG_TEST_HW_STACK_PROTECTION for this test so we do not
have to create special cases.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 tests/kernel/workq/critical/Kconfig       |  9 +++++++++
 tests/kernel/workq/critical/prj.conf      |  1 +
 tests/kernel/workq/critical/testcase.yaml | 12 ------------
 3 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 tests/kernel/workq/critical/Kconfig

diff --git a/tests/kernel/workq/critical/Kconfig b/tests/kernel/workq/critical/Kconfig
new file mode 100644
index 00000000000..6015f47d4bf
--- /dev/null
+++ b/tests/kernel/workq/critical/Kconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+source "Kconfig.zephyr"
+
+if WDT_SAM
+config WDT_DISABLE_AT_BOOT
+	bool "Disable at boot"
+	default y
+endif
diff --git a/tests/kernel/workq/critical/prj.conf b/tests/kernel/workq/critical/prj.conf
index f8d48f84037..5b27337d354 100644
--- a/tests/kernel/workq/critical/prj.conf
+++ b/tests/kernel/workq/critical/prj.conf
@@ -1,2 +1,3 @@
 CONFIG_ZTEST=y
 CONFIG_MP_MAX_NUM_CPUS=1
+CONFIG_TEST_HW_STACK_PROTECTION=n
diff --git a/tests/kernel/workq/critical/testcase.yaml b/tests/kernel/workq/critical/testcase.yaml
index 7ba31c3661c..b4d7c4688a2 100644
--- a/tests/kernel/workq/critical/testcase.yaml
+++ b/tests/kernel/workq/critical/testcase.yaml
@@ -4,17 +4,5 @@ common:
     - workqueue
 tests:
   kernel.workqueue.critical:
-    platform_exclude: nsim/nsim_sem/mpu_stack_guard
-    filter: not CONFIG_WDT_SAM
     integration_platforms:
       - qemu_x86
-  kernel.workqueue.critical.sam:
-    filter: CONFIG_WDT_SAM
-    extra_configs:
-      - CONFIG_WDT_DISABLE_AT_BOOT=y
-    integration_platforms:
-      - sam_e70_xplained/same70q21
-  kernel.workqueue.critical.nsim:
-    platform_allow: nsim/nsim_sem/mpu_stack_guard
-    extra_configs:
-      - CONFIG_TEST_HW_STACK_PROTECTION=n