[libcamera-devel,v3,09/10] libcamera: test: remove test IPA and use dummy IPA instead

Message ID 20190605005316.4835-10-paul.elder@ideasonboard.com
State Accepted
Headers show
Series
  • Add IPAManager and IPAInterface
Related show

Commit Message

Paul Elder June 5, 2019, 12:53 a.m. UTC
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@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes in v3:
- delete the unused test IPA shared object source

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/ipa/shared_test.cpp | 14 --------------
 3 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 test/ipa/shared_test.cpp

Patch

diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp
index 63e4243..bbef069 100644
--- a/test/ipa/ipa_test.cpp
+++ b/test/ipa/ipa_test.cpp
@@ -56,12 +56,12 @@  protected:
 
 		const struct IPAModuleInfo testInfo = {
 			IPA_MODULE_API_VERSION,
-			9001,
-			"bleep",
-			"It's over nine thousand!",
+			0,
+			"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/ipa/shared_test.cpp b/test/ipa/shared_test.cpp
deleted file mode 100644
index 8bac439..0000000
--- a/test/ipa/shared_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@ 
-#include <libcamera/ipa/ipa_module_info.h>
-
-namespace libcamera {
-
-extern "C" {
-const struct libcamera::IPAModuleInfo ipaModuleInfo = {
-	IPA_MODULE_API_VERSION,
-	9001,
-	"bleep",
-	"It's over nine thousand!",
-};
-};
-
-}; /* namespace libcamera */