Skip to content

Commit a8c7a86

Browse files
committed
test: ztest: fix ztest/unit tests to build when CONFIG_SOF is removed
SOF builds previously relied on CONFIG_SOF to be externally defined in zephyr/modules/Kconfig.sof, but set in sof/app/prj.conf. This was removed in Zephyr, and now instead the new CONFIG_SOF_FULL_ZEPHYR_APPLICATION is set on SOF side. This must be set to 'no' for the ztest unit tests to ensure full SOF dependencies are not pulled into unit tests builds. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent 12c2a2a commit a8c7a86

File tree

7 files changed

+4
-3
lines changed

7 files changed

+4
-3
lines changed

test/ztest/unit/fast-get/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ target_include_directories(app PRIVATE
1616

1717
# Define SOF-specific configurations for unit testing
1818
target_compile_definitions(app PRIVATE
19-
-DCONFIG_SOF_LOG_LEVEL=CONFIG_LOG_DEFAULT_LEVEL
2019
-DCONFIG_ZEPHYR_POSIX=1
2120
)
2221

test/ztest/unit/fast-get/prj.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
CONFIG_ZTEST=y
2+
CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n

test/ztest/unit/list/prj.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
CONFIG_ZTEST=y
2+
CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n

test/ztest/unit/math/basic/arithmetic/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ target_include_directories(app PRIVATE
1212

1313
# Define SOF-specific configurations for unit testing
1414
target_compile_definitions(app PRIVATE
15-
-DCONFIG_SOF_LOG_LEVEL=CONFIG_LOG_DEFAULT_LEVEL
1615
-DCONFIG_ZEPHYR_POSIX=1
1716
-DCONFIG_LIBRARY=1
1817
-DCONFIG_NUMBERS_VECTOR_FIND=1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
CONFIG_ZTEST=y
2+
CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n

test/ztest/unit/math/basic/trigonometry/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ target_include_directories(app PRIVATE
1212

1313
# Define SOF-specific configurations for unit testing
1414
target_compile_definitions(app PRIVATE
15-
-DCONFIG_SOF_LOG_LEVEL=CONFIG_LOG_DEFAULT_LEVEL
1615
-DCONFIG_ZEPHYR_POSIX=1
1716
-DCONFIG_LIBRARY=1
1817
-DUNIT_TEST=1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
CONFIG_ZTEST=y
2+
CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n

0 commit comments

Comments
 (0)