{"id":1251,"url":"https://patchwork.libcamera.org/api/patches/1251/?format=json","web_url":"https://patchwork.libcamera.org/patch/1251/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190521205429.6529-2-paul.elder@ideasonboard.com>","date":"2019-05-21T20:54:29","name":"[libcamera-devel,v5,2/2] tests: ipa: add tests to test IPAModule","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"20f9d2bee4486f4c284f6363127ed8de9c461bde","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1251/mbox/","series":[{"id":314,"url":"https://patchwork.libcamera.org/api/series/314/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=314","date":"2019-05-21T20:54:28","name":"[libcamera-devel,v5,1/2] libcamera: ipa_module: add IPA shared library module","version":5,"mbox":"https://patchwork.libcamera.org/series/314/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1251/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1251/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4630E60DE9\n\tfor ;\n\tTue, 21 May 2019 22:54:42 +0200 (CEST)","from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A2EC854B;\n\tTue, 21 May 2019 22:54:41 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558472082;\n\tbh=7Yff0Vn+TPyWrKoXAfPSXUK0kPQVCYRvQe0X5e418A8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=hYykQ0A4Ga1ACWDAJRUSUHzUoUL/W5IDw8y7+m6+cUwT+w8j0mG5OV/GWVWI65zVP\n\trkfNy0E0S9pQethEbyF4kErCPBlmm5VFYQ2zZ7AlgT/eyH32ClBQN5+BPPSeoHwiBZ\n\tkrRhYFSCRn1/NPw2b5DaiGfgRi6kAYij98CJRRCo=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 21 May 2019 16:54:29 -0400","Message-Id":"<20190521205429.6529-2-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190521205429.6529-1-paul.elder@ideasonboard.com>","References":"<20190521205429.6529-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 2/2] tests: ipa: add tests to test\n\tIPAModule","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 21 May 2019 20:54:42 -0000"},"content":"Add tests to test the the IPAModule class, for loading the IPA module\ninfo from IPA module .so shared objects, with modules written in both C\nand C++.\n\nSigned-off-by: Paul Elder \n---\nChanges in v5:\n- remove non-error test output\n- auto-check if the correct module info was loaded\n- make the meson build for the test shared objects prettier\n\nNo changes in v4\n\nChanges in v3:\n- remove tests for incorrect bitness\n- make the test IPA module .so a C one and a C++ one\n\nChanges in v2:\n- added source for test .so\n- updated tests to work with new (v2, see 1/2) IPAModule API\n\n test/ipa/ipa_test.cpp | 79 ++++++++++++++++++++++++++++++++++++++++\n test/ipa/meson.build | 21 +++++++++++\n test/ipa/shared_test.c | 6 +++\n test/ipa/shared_test.cpp | 12 ++++++\n test/meson.build | 1 +\n 5 files changed, 119 insertions(+)\n create mode 100644 test/ipa/ipa_test.cpp\n create mode 100644 test/ipa/meson.build\n create mode 100644 test/ipa/shared_test.c\n create mode 100644 test/ipa/shared_test.cpp","diff":"diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp\nnew file mode 100644\nindex 0000000..fb8eeba\n--- /dev/null\n+++ b/test/ipa/ipa_test.cpp\n@@ -0,0 +1,79 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * load-so.cpp - loading .so tests\n+ */\n+\n+#include \n+#include \n+\n+#include \"ipa_module.h\"\n+\n+#include \"test.h\"\n+\n+using namespace std;\n+using namespace libcamera;\n+\n+class IPAModuleTest : public Test\n+{\n+protected:\n+\tint init()\n+\t{\n+\t\tstrcpy(testInfo_.name, \"It's over nine thousand!\");\n+\t\ttestInfo_.version = 9001;\n+\n+\t\treturn 0;\n+\t}\n+\n+\tint runTest(const string &path)\n+\t{\n+\t\tint ret = 0;\n+\t\tstruct IPAModuleInfo info;\n+\n+\t\tIPAModule *ll = new IPAModule(path);\n+\n+\t\tif (!ll->isValid()) {\n+\t\t\tcerr << \"test IPA module is invalid\" << endl;\n+\t\t\tret = -1;\n+\t\t\tgoto done;\n+\t\t}\n+\n+\t\tinfo = ll->info();\n+\t\t// todo validate instead of print\n+\t\tif (strcmp(info.name, testInfo_.name)) {\n+\t\t\tcerr << \"test IPA module has incorrect name\" << endl;\n+\t\t\tcerr << \"expected \\\"\" << testInfo_.name << \"\\\", got \\\"\" << info.name << \"\\\"\" << endl;\n+\t\t\tret = -1;\n+\t\t}\n+\n+\t\tif (info.version != testInfo_.version) {\n+\t\t\tcerr << \"test IPA module has incorrect version\" << endl;\n+\t\t\tcerr << \"expected \\\"\" << testInfo_.version << \"\\\", got \\\"\" << info.version << \"\\\"\" << endl;\n+\t\t\tret = -1;\n+\t\t}\n+\n+\tdone:\n+\t\tdelete ll;\n+\t\treturn ret;\n+\t}\n+\n+\tint run() override\n+\t{\n+\t\tint count = 0;\n+\n+\t\tcount += runTest(\"test/ipa/ipa-dummy.so\");\n+\n+\t\tcount += runTest(\"test/ipa/ipa-dummy-cpp.so\");\n+\n+\t\tif (count < 0)\n+\t\t\treturn TestFail;\n+\n+\t\treturn TestPass;\n+\t}\n+\n+private:\n+\tstruct IPAModuleInfo testInfo_;\n+};\n+\n+TEST_REGISTER(IPAModuleTest)\ndiff --git a/test/ipa/meson.build b/test/ipa/meson.build\nnew file mode 100644\nindex 0000000..57c6a1c\n--- /dev/null\n+++ b/test/ipa/meson.build\n@@ -0,0 +1,21 @@\n+ipa_modules_sources = [\n+ ['ipa-dummy', 'shared_test.c'],\n+ ['ipa-dummy-cpp', 'shared_test.cpp'],\n+]\n+\n+foreach m : ipa_modules_sources\n+ shared_library(m, name_prefix: '',\n+ include_directories: test_includes_public)\n+endforeach\n+\n+ipa_test = [\n+ ['ipa_test', 'ipa_test.cpp'],\n+]\n+\n+foreach t : ipa_test\n+ exe = executable(t[0], t[1],\n+ link_with : test_libraries,\n+ include_directories : test_includes_internal)\n+\n+ test(t[0], exe, suite: 'ipa', is_parallel: false)\n+endforeach\ndiff --git a/test/ipa/shared_test.c b/test/ipa/shared_test.c\nnew file mode 100644\nindex 0000000..87d182b\n--- /dev/null\n+++ b/test/ipa/shared_test.c\n@@ -0,0 +1,6 @@\n+#include \n+\n+const struct IPAModuleInfo ipaModuleInfo = {\n+\t.name = \"It's over nine thousand!\",\n+\t.version = 9001,\n+};\ndiff --git a/test/ipa/shared_test.cpp b/test/ipa/shared_test.cpp\nnew file mode 100644\nindex 0000000..4e5c976\n--- /dev/null\n+++ b/test/ipa/shared_test.cpp\n@@ -0,0 +1,12 @@\n+#include \n+\n+namespace libcamera {\n+\n+extern \"C\" {\n+const struct libcamera::IPAModuleInfo ipaModuleInfo = {\n+\t\"It's over nine thousand!\",\n+\t9001,\n+};\n+};\n+\n+}; /* namespace libcamera */\ndiff --git a/test/meson.build b/test/meson.build\nindex d501f2b..ef41367 100644\n--- a/test/meson.build\n+++ b/test/meson.build\n@@ -1,6 +1,7 @@\n subdir('libtest')\n \n subdir('camera')\n+subdir('ipa')\n subdir('media_device')\n subdir('pipeline')\n subdir('v4l2_device')\n","prefixes":["libcamera-devel","v5","2/2"]}