{"id":1253,"url":"https://patchwork.libcamera.org/api/patches/1253/?format=json","web_url":"https://patchwork.libcamera.org/patch/1253/","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":"<20190521213608.10843-2-paul.elder@ideasonboard.com>","date":"2019-05-21T21:36:08","name":"[libcamera-devel,v6,2/2] tests: ipa: add tests to test IPAModule","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"01491e066f496ddfb90e7a1f866e03b7d3ca2d30","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/1253/mbox/","series":[{"id":315,"url":"https://patchwork.libcamera.org/api/series/315/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=315","date":"2019-05-21T21:36:07","name":"[libcamera-devel,v6,1/2] libcamera: ipa_module: add IPA shared library module","version":6,"mbox":"https://patchwork.libcamera.org/series/315/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1253/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1253/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AB0FF60C40\n\tfor ;\n\tTue, 21 May 2019 23:36:17 +0200 (CEST)","from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 024FA54B;\n\tTue, 21 May 2019 23:36:16 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558474577;\n\tbh=lYz0pbmh5rfeUYagq2wN/QwEZMFM/g0titMBHRC/Q98=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=fImXPuvVTSdnQWLvHMn0Q40ZR81qk28jGGM1A5imArt2hYPZ1ZUDfgcQC9AvKwJA3\n\t/MtEsPtEvr2b3przq8xyhvFrQxTNRn6iaK0bEYZJO2iMtzB6kPQGkNC8GeIV5vC1E3\n\tibxfJI1RXGFQiDnmNH187rRHmUP7DTVqgfdTaAa8=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 21 May 2019 17:36:08 -0400","Message-Id":"<20190521213608.10843-2-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190521213608.10843-1-paul.elder@ideasonboard.com>","References":"<20190521213608.10843-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 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 21:36:17 -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 v6:\n- allow each test to have different test info content\n- rename C test module to make it clear it's in C (as opposed to no\n label)\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- make the C test module info have the same content as the C++ test module info\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 | 76 ++++++++++++++++++++++++++++++++++++++++\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, 116 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..3ef403d\n--- /dev/null\n+++ b/test/ipa/ipa_test.cpp\n@@ -0,0 +1,76 @@\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 runTest(const string &path, struct IPAModuleInfo &testInfo)\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 \" << path << \" is invalid\"\n+\t\t\t << endl;\n+\t\t\tret = -1;\n+\t\t\tgoto done;\n+\t\t}\n+\n+\t\tinfo = ll->info();\n+\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 \\\"\"\n+\t\t\t << 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 \\\"\"\n+\t\t\t << 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\tstruct IPAModuleInfo testInfo = {\n+\t\t\t\"It's over nine thousand!\",\n+\t\t\t9001,\n+\t\t};\n+\n+\t\tcount += runTest(\"test/ipa/ipa-dummy-c.so\", testInfo);\n+\n+\t\tcount += runTest(\"test/ipa/ipa-dummy-cpp.so\", testInfo);\n+\n+\t\tif (count < 0)\n+\t\t\treturn TestFail;\n+\n+\t\treturn TestPass;\n+\t}\n+};\n+\n+TEST_REGISTER(IPAModuleTest)\ndiff --git a/test/ipa/meson.build b/test/ipa/meson.build\nnew file mode 100644\nindex 0000000..6df0671\n--- /dev/null\n+++ b/test/ipa/meson.build\n@@ -0,0 +1,21 @@\n+ipa_modules_sources = [\n+ ['ipa-dummy-c', '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","v6","2/2"]}