From 3900b0771ecb160f26a24b4a9bf72e827256e7da Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 20 Dec 2018 15:40:37 +0000 Subject: [PATCH] test: Move test objects to libtest 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 Signed-off-by: Laurent Pinchart --- test/libtest/meson.build | 7 +++++++ test/{ => libtest}/test.cpp | 0 test/{ => libtest}/test.h | 0 test/media_device/meson.build | 6 ++---- test/meson.build | 25 ++++++++++++++++--------- 5 files changed, 25 insertions(+), 13 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 000000000..b998154dd --- /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/media_device/meson.build b/test/media_device/meson.build index b1d21151b..a73644a08 100644 --- a/test/media_device/meson.build +++ b/test/media_device/meson.build @@ -1,5 +1,3 @@ - media_device_test = executable('media_device_test', 'media_device_test.cpp', - link_with : [libcamera, libtest], - include_directories : [libcamera_internal_includes, - libtest_includes],) + link_with : test_libraries, + include_directories : test_includes_internal) diff --git a/test/meson.build b/test/meson.build index 6233d2c00..aabe79ddc 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,17 +1,24 @@ -libtest_sources = files([ - 'test.cpp', -]) +subdir('libtest') -libtest = static_library('libtest', libtest_sources) -libtest_includes = include_directories('./') +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) list = executable('list', 'list.cpp', - link_with : [libcamera, libtest], - include_directories : libcamera_includes) + link_with : test_libraries, + include_directories : test_includes_public) subdir('media_device')