[libcamera-devel] [PATCH v2 08/10] libcamera: test: remove test IPA and use dummy IPA instead

[Paul Elder]

Use the dummy IPA for testing/sample IPA instead of the earlier test
IPA. Remove the test IPA, and update tests and meson accordingly.

Signed-off-by: Paul Elder <paul.elder at ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
Changes in v2:
- use macros for defining the fields in the expected IPA module info

 test/ipa/ipa_test.cpp |  8 ++++----
 test/ipa/meson.build  | 10 ----------
 test/libtest/test.cpp |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp
index d7b18c7..f401e29 100644
--- a/test/ipa/ipa_test.cpp
+++ b/test/ipa/ipa_test.cpp
@@ -59,12 +59,12 @@ protected:
 
 		const struct IPAModuleInfo testInfo = {
 			IPA_MODULE_API_VERSION,
-			PIPELINE_VERSION(0, 9001),
-			"bleep",
-			"It's over nine thousand!",
+			PIPELINE_VERSION(0, 1),
+			"PipelineHandlerVimc",
+			"Dummy IPA for Vimc",
 		};
 
-		count += runTest("test/ipa/ipa-dummy-cpp.so", testInfo);
+		count += runTest("src/ipa/ipa_dummy.so", testInfo);
 
 		if (count < 0)
 			return TestFail;
diff --git a/test/ipa/meson.build b/test/ipa/meson.build
index 08ee95c..bca39fa 100644
--- a/test/ipa/meson.build
+++ b/test/ipa/meson.build
@@ -1,13 +1,3 @@
-ipa_modules_sources = [
-    ['ipa-dummy-cpp', 'shared_test.cpp'],
-]
-
-foreach m : ipa_modules_sources
-    shared_library(m, name_prefix : '',
-                   dependencies : libcamera_dep,
-                   include_directories : test_includes_public)
-endforeach
-
 ipa_test = [
     ['ipa_test', 'ipa_test.cpp'],
 ]
diff --git a/test/libtest/test.cpp b/test/libtest/test.cpp
index 451c111..a0c5102 100644
--- a/test/libtest/test.cpp
+++ b/test/libtest/test.cpp
@@ -21,7 +21,7 @@ int Test::execute()
 {
 	int ret;
 
-	ret = setenv("IPA_MODULE_PATH", "test/ipa", 1);
+	ret = setenv("IPA_MODULE_PATH", "src/ipa", 1);
 	if (ret)
 		return errno;
 
-- 
2.20.1