summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2018-12-20 15:40:37 +0000
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-01-01 18:24:22 +0200
commit3900b0771ecb160f26a24b4a9bf72e827256e7da (patch)
tree7955c54f01b6f65aa664f1399e36eba7eb1347ab
parentb43f56c46d65cc983936498492a85e7e377c212b (diff)
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 <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--test/libtest/meson.build7
-rw-r--r--test/libtest/test.cpp (renamed from test/test.cpp)0
-rw-r--r--test/libtest/test.h (renamed from test/test.h)0
-rw-r--r--test/media_device/meson.build6
-rw-r--r--test/meson.build25
5 files changed, 25 insertions, 13 deletions
diff --git a/test/libtest/meson.build b/test/libtest/meson.build
new file mode 100644
index 00000000..b998154d
--- /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
index 1bb6ebcb..1bb6ebcb 100644
--- a/test/test.cpp
+++ b/test/libtest/test.cpp
diff --git a/test/test.h b/test/libtest/test.h
index c85eeb5d..c85eeb5d 100644
--- a/test/test.h
+++ b/test/libtest/test.h
diff --git a/test/media_device/meson.build b/test/media_device/meson.build
index b1d21151..a73644a0 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 6233d2c0..aabe79dd 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')