[{"id":1652,"web_url":"https://patchwork.libcamera.org/comment/1652/","msgid":"<20190521210445.GL5674@pendragon.ideasonboard.com>","date":"2019-05-21T21:04:45","subject":"Re: [libcamera-devel] [PATCH v5 2/2] tests: ipa: add tests to test\n\tIPAModule","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Tue, May 21, 2019 at 04:54:29PM -0400, Paul Elder wrote:\n> Add tests to test the the IPAModule class, for loading the IPA module\n> info from IPA module .so shared objects, with modules written in both C\n> and C++.\n> \n> Signed-off-by: Paul Elder \n> ---\n> Changes 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> \n> No changes in v4\n> \n> Changes in v3:\n> - remove tests for incorrect bitness\n> - make the test IPA module .so a C one and a C++ one\n> \n> Changes 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\n> \n> diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp\n> new file mode 100644\n> index 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\nPlease validate instead of printing :-) You can pass the expected name\nand version number from the caller to make this easier. Or you can use\nthe same info for both modules.\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 \\\"\" << 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\nThis will fail for the C implementation.\n\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)\n> diff --git a/test/ipa/meson.build b/test/ipa/meson.build\n> new file mode 100644\n> index 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\nI'd name this ipa-dummy-c. With this fixed,\n\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\n> diff --git a/test/ipa/shared_test.c b/test/ipa/shared_test.c\n> new file mode 100644\n> index 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> +};\n> diff --git a/test/ipa/shared_test.cpp b/test/ipa/shared_test.cpp\n> new file mode 100644\n> index 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 */\n> diff --git a/test/meson.build b/test/meson.build\n> index 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')","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 0E31360C40\n\tfor ;\n\tTue, 21 May 2019 23:05:03 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 77C4152C;\n\tTue, 21 May 2019 23:05:02 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558472702;\n\tbh=BVsJ4grhhNWo2jK7PkfKCcaYVjOApr/IvPFZnEqUTf4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=RW6qymzV1R+guiX9xbK+OCD/H3Gpf/ngXTc8GXf/uS8DmTYhvmBtEPsuvQ5Qb62Cs\n\tF8h2bYAoSeSzwhuNZsjsK8WLldwwuVEgNOg7DVMa2E4p1ha52A/Nv9Z/ydeHs70tVb\n\tIGOHyMJLCujrP9mFOJ+KRmnHkqixT6w91YS6HIIk=","Date":"Wed, 22 May 2019 00:04:45 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190521210445.GL5674@pendragon.ideasonboard.com>","References":"<20190521205429.6529-1-paul.elder@ideasonboard.com>\n\t<20190521205429.6529-2-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20190521205429.6529-2-paul.elder@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [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 21:05:03 -0000"}}]