From 70b41da76d6a0be43b905592a8f76467758d4f27 Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Wed, 22 Jan 2025 11:51:37 +1000
Subject: [PATCH] tests: wifi: nrf_wifi: reduce config overrides

Reduce the number of config overrides needed for the various testcases
by only enabling the options if needed in the first place.

Signed-off-by: Jordan Yates <jordan@embeint.com>
---
 tests/drivers/wifi/nrf_wifi/Kconfig       | 40 +++++++++++++++++++++++
 tests/drivers/wifi/nrf_wifi/prj.conf      | 16 ---------
 tests/drivers/wifi/nrf_wifi/testcase.yaml | 17 ++--------
 3 files changed, 42 insertions(+), 31 deletions(-)
 create mode 100644 tests/drivers/wifi/nrf_wifi/Kconfig

diff --git a/tests/drivers/wifi/nrf_wifi/Kconfig b/tests/drivers/wifi/nrf_wifi/Kconfig
new file mode 100644
index 000000000000..9e6dda3b4a94
--- /dev/null
+++ b/tests/drivers/wifi/nrf_wifi/Kconfig
@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2025 Embeint Inc
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if !CONFIG_WIFI_USAGE_MODE_SCAN_ONLY
+
+configdefault NET_SOCKETS
+	default y
+configdefault NET_LOG
+	default y
+configdefault NET_IPV6
+	default y
+configdefault NET_IPV4
+	default y
+configdefault NET_UDP
+	default y
+configdefault NET_TCP
+	default y
+configdefault NET_DHCPV4
+	default y
+configdefault DNS_RESOLVER
+	default y
+
+configdefault NET_STATISTICS
+	default y
+configdefault NET_STATISTICS_WIFI
+	default y
+configdefault NET_STATISTICS_USER_API
+	default y
+
+configdefault NET_PKT_RX_COUNT
+	default 8
+configdefault NET_PKT_TX_COUNT
+	default 8
+
+endif # !CONFIG_WIFI_USAGE_MODE_SCAN_ONLY
+
+source "Kconfig.zephyr"
diff --git a/tests/drivers/wifi/nrf_wifi/prj.conf b/tests/drivers/wifi/nrf_wifi/prj.conf
index 5074dded01eb..f224626fcfc8 100644
--- a/tests/drivers/wifi/nrf_wifi/prj.conf
+++ b/tests/drivers/wifi/nrf_wifi/prj.conf
@@ -5,27 +5,11 @@
 #
 CONFIG_WIFI=y
 CONFIG_WIFI_NRF70=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 CONFIG_BUILD_ONLY_NO_BLOBS=y
 
 CONFIG_TEST_RANDOM_GENERATOR=y
 # Networking
 CONFIG_NETWORKING=y
-CONFIG_NET_SOCKETS=y
-CONFIG_NET_LOG=y
-CONFIG_NET_IPV6=y
-CONFIG_NET_IPV4=y
-CONFIG_NET_UDP=y
-CONFIG_NET_TCP=y
-CONFIG_NET_DHCPV4=y
-CONFIG_DNS_RESOLVER=y
-
-CONFIG_NET_STATISTICS=y
-CONFIG_NET_STATISTICS_WIFI=y
-CONFIG_NET_STATISTICS_USER_API=y
-
-CONFIG_NET_PKT_RX_COUNT=8
-CONFIG_NET_PKT_TX_COUNT=8
 
 # Below section is the primary contributor to SRAM and is currently
 # tuned for performance, but this will be revisited in the future.
diff --git a/tests/drivers/wifi/nrf_wifi/testcase.yaml b/tests/drivers/wifi/nrf_wifi/testcase.yaml
index f8dac0a1ea8e..74bcbdc1e7c8 100644
--- a/tests/drivers/wifi/nrf_wifi/testcase.yaml
+++ b/tests/drivers/wifi/nrf_wifi/testcase.yaml
@@ -11,24 +11,13 @@ tests:
     extra_configs:
       - CONFIG_NRF70_RADIO_TEST=y
       - CONFIG_NETWORKING=n
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
   nrf70.build.scan_only:
     extra_configs:
-      - CONFIG_NRF70_SCAN_ONLY=y
-      - CONFIG_NETWORKING=y
-      - CONFIG_NET_DHCPV4=n
-      - CONFIG_NET_NATIVE=n
-      - CONFIG_NET_OFFLOAD=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
+      - CONFIG_WIFI_USAGE_MODE_SCAN_ONLY=y
   nrf70.build.raw_scan_results:
     extra_configs:
+      - CONFIG_WIFI_USAGE_MODE_SCAN_ONLY=y
       - CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y
-      - CONFIG_NRF70_SCAN_ONLY=y
-      - CONFIG_NETWORKING=y
-      - CONFIG_NET_DHCPV4=n
-      - CONFIG_NET_NATIVE=n
-      - CONFIG_NET_OFFLOAD=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
   nrf70.build.raw_tx:
     extra_configs:
       - CONFIG_NRF70_RAW_DATA_TX=y
@@ -42,5 +31,3 @@ tests:
     extra_configs:
       - CONFIG_NRF70_OFFLOADED_RAW_TX=y
       - CONFIG_NETWORKING=n
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
-      - CONFIG_NET_L2_WIFI_MGMT=n