summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Elder <paul.elder@ideasonboard.com>2019-05-27 17:50:47 -0400
committerPaul Elder <paul.elder@ideasonboard.com>2019-06-05 10:44:52 -0400
commit87a93e17f8f86e651f2021dba37ba749a43cc363 (patch)
tree4cdf2d6bca63205b523f2c1e29ae43aa01518acd
parentdd5b899c5b599bcafc01dc8a53430d53b59b2db2 (diff)
libcamera: test: remove test IPA and use dummy IPA instead
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>
-rw-r--r--test/ipa/ipa_test.cpp8
-rw-r--r--test/ipa/meson.build10
-rw-r--r--test/ipa/shared_test.cpp14
3 files changed, 4 insertions, 28 deletions
diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp
index 63e4243e..bbef069f 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 08ee95ca..bca39fa3 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 8bac4393..00000000
--- 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 */