From 043396598238eb494ad3fd4653d668b57f32afd2 Mon Sep 17 00:00:00 2001
From: Yuval Peress <peress@google.com>
Date: Tue, 11 Oct 2022 21:58:36 -0600
Subject: [PATCH] dsp: move cmsis_dsp basicmath tests

Move the tests to tests/subsys/dsp/ as they'll be a part of the Zephyr
dsp subsystem.

Signed-off-by: Yuval Peress <peress@google.com>
---
 MAINTAINERS.yml                                              | 1 +
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/CMakeLists.txt | 2 ++
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/prj.conf       | 0
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/f16.c      | 2 +-
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/f16.pat    | 0
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/f32.c      | 2 +-
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/f32.pat    | 0
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q15.c      | 2 +-
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q15.pat    | 0
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q31.c      | 2 +-
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q31.pat    | 0
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q7.c       | 2 +-
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q7.pat     | 0
 tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/testcase.yaml  | 0
 14 files changed, 8 insertions(+), 5 deletions(-)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/CMakeLists.txt (80%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/prj.conf (100%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/f16.c (99%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/f16.pat (100%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/f32.c (99%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/f32.pat (100%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q15.c (99%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q15.pat (100%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q31.c (99%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q31.pat (100%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q7.c (99%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/src/q7.pat (100%)
 rename tests/{lib/cmsis_dsp => subsys/dsp}/basicmath/testcase.yaml (100%)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index b02c0b7c35a..a70cf9ea503 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -334,6 +334,7 @@ CMSIS-DSP integration:
     - modules/Kconfig.cmsis_dsp
     - tests/benchmarks/cmsis_dsp/
     - tests/lib/cmsis_dsp/
+    - tests/subsys/dsp/
   labels:
     - "area: CMSIS-DSP"
 
diff --git a/tests/lib/cmsis_dsp/basicmath/CMakeLists.txt b/tests/subsys/dsp/basicmath/CMakeLists.txt
similarity index 80%
rename from tests/lib/cmsis_dsp/basicmath/CMakeLists.txt
rename to tests/subsys/dsp/basicmath/CMakeLists.txt
index 48754f7a8ea..6c972fc0441 100644
--- a/tests/lib/cmsis_dsp/basicmath/CMakeLists.txt
+++ b/tests/subsys/dsp/basicmath/CMakeLists.txt
@@ -12,3 +12,5 @@ target_sources(app PRIVATE
   )
 
 target_sources_ifdef(CONFIG_CMSIS_DSP_FLOAT16 app PRIVATE src/f16.c)
+
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/tests/lib/cmsis_dsp)
diff --git a/tests/lib/cmsis_dsp/basicmath/prj.conf b/tests/subsys/dsp/basicmath/prj.conf
similarity index 100%
rename from tests/lib/cmsis_dsp/basicmath/prj.conf
rename to tests/subsys/dsp/basicmath/prj.conf
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f16.c b/tests/subsys/dsp/basicmath/src/f16.c
similarity index 99%
rename from tests/lib/cmsis_dsp/basicmath/src/f16.c
rename to tests/subsys/dsp/basicmath/src/f16.c
index bfd79cb3f0d..fd10697e89d 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/f16.c
+++ b/tests/subsys/dsp/basicmath/src/f16.c
@@ -9,7 +9,7 @@
 #include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
-#include "../../common/test_common.h"
+#include "common/test_common.h"
 
 #include "f16.pat"
 
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f16.pat b/tests/subsys/dsp/basicmath/src/f16.pat
similarity index 100%
rename from tests/lib/cmsis_dsp/basicmath/src/f16.pat
rename to tests/subsys/dsp/basicmath/src/f16.pat
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f32.c b/tests/subsys/dsp/basicmath/src/f32.c
similarity index 99%
rename from tests/lib/cmsis_dsp/basicmath/src/f32.c
rename to tests/subsys/dsp/basicmath/src/f32.c
index b8f27223f3e..c92b4703662 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/f32.c
+++ b/tests/subsys/dsp/basicmath/src/f32.c
@@ -9,7 +9,7 @@
 #include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
-#include "../../common/test_common.h"
+#include "common/test_common.h"
 
 #include "f32.pat"
 
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f32.pat b/tests/subsys/dsp/basicmath/src/f32.pat
similarity index 100%
rename from tests/lib/cmsis_dsp/basicmath/src/f32.pat
rename to tests/subsys/dsp/basicmath/src/f32.pat
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q15.c b/tests/subsys/dsp/basicmath/src/q15.c
similarity index 99%
rename from tests/lib/cmsis_dsp/basicmath/src/q15.c
rename to tests/subsys/dsp/basicmath/src/q15.c
index 9c7938152ae..c69120cf424 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q15.c
+++ b/tests/subsys/dsp/basicmath/src/q15.c
@@ -9,7 +9,7 @@
 #include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
-#include "../../common/test_common.h"
+#include "common/test_common.h"
 
 #include "q15.pat"
 
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q15.pat b/tests/subsys/dsp/basicmath/src/q15.pat
similarity index 100%
rename from tests/lib/cmsis_dsp/basicmath/src/q15.pat
rename to tests/subsys/dsp/basicmath/src/q15.pat
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q31.c b/tests/subsys/dsp/basicmath/src/q31.c
similarity index 99%
rename from tests/lib/cmsis_dsp/basicmath/src/q31.c
rename to tests/subsys/dsp/basicmath/src/q31.c
index dd0ff26c5c0..87b8048c27d 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q31.c
+++ b/tests/subsys/dsp/basicmath/src/q31.c
@@ -9,7 +9,7 @@
 #include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
-#include "../../common/test_common.h"
+#include "common/test_common.h"
 
 #include "q31.pat"
 
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q31.pat b/tests/subsys/dsp/basicmath/src/q31.pat
similarity index 100%
rename from tests/lib/cmsis_dsp/basicmath/src/q31.pat
rename to tests/subsys/dsp/basicmath/src/q31.pat
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q7.c b/tests/subsys/dsp/basicmath/src/q7.c
similarity index 99%
rename from tests/lib/cmsis_dsp/basicmath/src/q7.c
rename to tests/subsys/dsp/basicmath/src/q7.c
index cb9628fc3b3..dc9f3979bba 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q7.c
+++ b/tests/subsys/dsp/basicmath/src/q7.c
@@ -9,7 +9,7 @@
 #include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
-#include "../../common/test_common.h"
+#include "common/test_common.h"
 
 #include "q7.pat"
 
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q7.pat b/tests/subsys/dsp/basicmath/src/q7.pat
similarity index 100%
rename from tests/lib/cmsis_dsp/basicmath/src/q7.pat
rename to tests/subsys/dsp/basicmath/src/q7.pat
diff --git a/tests/lib/cmsis_dsp/basicmath/testcase.yaml b/tests/subsys/dsp/basicmath/testcase.yaml
similarity index 100%
rename from tests/lib/cmsis_dsp/basicmath/testcase.yaml
rename to tests/subsys/dsp/basicmath/testcase.yaml