From patchwork Tue May 21 00:40:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 1239 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AB90260BC9 for ; Tue, 21 May 2019 02:41:12 +0200 (CEST) Received: from localhost.localdomain (unknown [96.44.9.117]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 025A552C; Tue, 21 May 2019 02:41:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1558399272; bh=n8OXlYPeaN59IoiJKTzdeg8PPNhTb1Mv4xYRLpLH4b8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VB6lxymLbSJFTu4wgRk8Z6t1pbWPnttSAnsSTTHHPRaAJbSMHnTr6lgR018A6er5E yDYHEb6d2kc7J+urG3gUSO3EVP6DcSoYFcEWyBOK4dMUqyatJ/TD/l0J0xeW8EwB4A hY+WTxMg9NTKfWujuP7Gp6SlSjNyFVK9tVAMo+kE= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Mon, 20 May 2019 20:40:59 -0400 Message-Id: <20190521004059.7750-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190521004059.7750-1-paul.elder@ideasonboard.com> References: <20190521004059.7750-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/2] tests: ipa: add tests to test IPAModule X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 May 2019 00:41:12 -0000 Add tests to test the the IPAModule class, for loading the IPA module info from IPA module .so shared objects, with modules written in both C and C++. Signed-off-by: Paul Elder --- Changes in v3: - remove tests for incorrect bitness - make the test IPA module .so a C one and a C++ one Changes in v2: - added source for test .so - updated tests to work with new (v2, see 1/2) IPAModule API test/ipa/ipa_test.cpp | 65 ++++++++++++++++++++++++++++++++++++++++ test/ipa/meson.build | 29 ++++++++++++++++++ test/ipa/shared_test.c | 6 ++++ test/ipa/shared_test.cpp | 12 ++++++++ test/meson.build | 1 + 5 files changed, 113 insertions(+) create mode 100644 test/ipa/ipa_test.cpp create mode 100644 test/ipa/meson.build create mode 100644 test/ipa/shared_test.c create mode 100644 test/ipa/shared_test.cpp diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp new file mode 100644 index 0000000..74854df --- /dev/null +++ b/test/ipa/ipa_test.cpp @@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * load-so.cpp - loading .so tests + */ + +#include + +#include "ipa_module.h" + +#include "test.h" + +using namespace std; +using namespace libcamera; + +class IPAModuleTest : public Test +{ +protected: + int init() + { + return 0; + } + + int run_test(const string path) + { + cout << "running lib loader test" << endl; + + IPAModule *ll = new IPAModule(path); + + if (!ll->isValid()) { + cout << "failed to load" << endl; + return TestFail; + } + + struct IPAModuleInfo info = ll->info(); + cout << "loaded!" << endl; + cout << "name = " << info.name << ", version = " << info.version << endl; + + delete ll; + return TestPass; + } + + int run() + { + int count = 0; + + cout << "testing C IPAModule" << endl; + count += run_test("test/ipa/ipa-dummy.so"); + + cout << "testing C++ IPAModule" << endl; + count += run_test("test/ipa/ipa-dummy-cpp.so"); + + if (count < 0) + return TestFail; + + return TestPass; + } + + void cleanup() + { + } +}; + +TEST_REGISTER(IPAModuleTest) diff --git a/test/ipa/meson.build b/test/ipa/meson.build new file mode 100644 index 0000000..dc8fbdd --- /dev/null +++ b/test/ipa/meson.build @@ -0,0 +1,29 @@ +ipa_test = [ + ['ipa_test', 'ipa_test.cpp'], +] + +foreach t : ipa_test + exe = executable(t[0], t[1], + link_with : test_libraries, + include_directories : test_includes_internal) + + test(t[0], exe, suite: 'ipa', is_parallel: false) +endforeach + +ipa_dummy_sources = files([ + 'shared_test.c' +]) + +ipa_dummy_sources_cpp = files([ + 'shared_test.cpp' +]) + +ipa_dummy = shared_library('ipa-dummy', + ipa_dummy_sources, + name_prefix: '', + include_directories: test_includes_public) + +ipa_dummy_cpp = shared_library('ipa-dummy-cpp', + ipa_dummy_sources_cpp, + name_prefix: '', + include_directories: test_includes_public) diff --git a/test/ipa/shared_test.c b/test/ipa/shared_test.c new file mode 100644 index 0000000..4959a03 --- /dev/null +++ b/test/ipa/shared_test.c @@ -0,0 +1,6 @@ +#include + +const struct IPAModuleInfo ipaModuleInfo = { + .name = "Answer to the Ultimate Question of Life, the Universe, and Everything", + .version = 42, +}; diff --git a/test/ipa/shared_test.cpp b/test/ipa/shared_test.cpp new file mode 100644 index 0000000..4e5c976 --- /dev/null +++ b/test/ipa/shared_test.cpp @@ -0,0 +1,12 @@ +#include + +namespace libcamera { + +extern "C" { +const struct libcamera::IPAModuleInfo ipaModuleInfo = { + "It's over nine thousand!", + 9001, +}; +}; + +}; /* namespace libcamera */ diff --git a/test/meson.build b/test/meson.build index d501f2b..ef41367 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,6 +1,7 @@ subdir('libtest') subdir('camera') +subdir('ipa') subdir('media_device') subdir('pipeline') subdir('v4l2_device')