From patchwork Fri Dec 21 08:13:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 67 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7EDAE60B0C for ; Fri, 21 Dec 2018 09:13:20 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 08ADE565; Fri, 21 Dec 2018 09:13:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1545380000; bh=Ov6XvFZsnF/Fl+M4+x3oKRBCmE7J93rUz5NSM4nQDMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i9K5IpP1LYAUzBgEF8GmOrs4Y2TiX4oN4IJfOvVzoKjWngxzXxKX/N85i+05reKia pHVn71KSdIe/VbgcvkF5fQ+AcpVfynX+R6NH5S7VWVP4jFXTraZj22Mla2Wdlx3bzI lm21UasOcw7ARL4pv2ysb2mAXw011dM+94jbJfDI= From: Kieran Bingham To: LibCamera Devel Date: Fri, 21 Dec 2018 08:13:07 +0000 Message-Id: <20181221081311.3291-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181221081311.3291-1-kieran.bingham@ideasonboard.com> References: <20181221081311.3291-1-kieran.bingham@ideasonboard.com> Subject: [libcamera-devel] [PATCH 1/5] test: Move test objects to libtest 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: Fri, 21 Dec 2018 08:13:20 -0000 Create a subdirectory to contain the libtest helper library. Define two variables to clarify when tests are aimed at public or internal components. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- test/libtest/meson.build | 7 +++++++ test/{ => libtest}/test.cpp | 0 test/{ => libtest}/test.h | 0 test/meson.build | 20 ++++++++++++++------ 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 test/libtest/meson.build rename test/{ => libtest}/test.cpp (100%) rename test/{ => libtest}/test.h (100%) diff --git a/test/libtest/meson.build b/test/libtest/meson.build new file mode 100644 index 000000000000..b998154dd8d3 --- /dev/null +++ b/test/libtest/meson.build @@ -0,0 +1,7 @@ +libtest_sources = files([ + 'test.cpp', +]) + +libtest = static_library('libtest', libtest_sources) + +libtest_includes = include_directories('.') diff --git a/test/test.cpp b/test/libtest/test.cpp similarity index 100% rename from test/test.cpp rename to test/libtest/test.cpp diff --git a/test/test.h b/test/libtest/test.h similarity index 100% rename from test/test.h rename to test/libtest/test.h diff --git a/test/meson.build b/test/meson.build index da0aea9678d1..50ec11853203 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,11 +1,19 @@ -libtest_sources = files([ - 'test.cpp', -]) +subdir('libtest') -libtest = static_library('libtest', libtest_sources) +test_libraries = [libcamera, libtest] + +test_includes_public = [ + libtest_includes, + libcamera_includes, +] + +test_includes_internal = [ + test_includes_public, + libcamera_internal_includes, +] test_init = executable('test_init', 'init.cpp', - link_with : libcamera, - include_directories : libcamera_includes) + link_with : test_libraries, + include_directories : test_includes_public) test('Initialisation test', test_init)