| Message ID | 20190101212947.28098-4-kieran.bingham@ideasonboard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Kieran, Thank you for the patch. On Tuesday, 1 January 2019 23:29:45 EET Kieran Bingham wrote: > With the libtest functionality moved to it's own library folder, the s/it's/its/ > definitions for test inlcludes should reasonably live there too. s/inlcludes/includes/ > > The libtest subdir should always remain the first entry in the > test/meson.build file. > > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> With this fixed, for 1-3, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> and pushed. > --- > test/libtest/meson.build | 12 ++++++++++++ > test/meson.build | 12 ------------ > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/test/libtest/meson.build b/test/libtest/meson.build > index b998154dd8d3..e0893b70c3d4 100644 > --- a/test/libtest/meson.build > +++ b/test/libtest/meson.build > @@ -5,3 +5,15 @@ libtest_sources = files([ > 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, > +] > diff --git a/test/meson.build b/test/meson.build > index bf8232f32787..9270a55e052a 100644 > --- a/test/meson.build > +++ b/test/meson.build > @@ -1,17 +1,5 @@ > subdir('libtest') > > -test_libraries = [libcamera, libtest] > - > -test_includes_public = [ > - libtest_includes, > - libcamera_includes, > -] > - > -test_includes_internal = [ > - test_includes_public, > - libcamera_internal_includes, > -] > - > subdir('media_device') > > public_tests = [
diff --git a/test/libtest/meson.build b/test/libtest/meson.build index b998154dd8d3..e0893b70c3d4 100644 --- a/test/libtest/meson.build +++ b/test/libtest/meson.build @@ -5,3 +5,15 @@ libtest_sources = files([ 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, +] diff --git a/test/meson.build b/test/meson.build index bf8232f32787..9270a55e052a 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,17 +1,5 @@ subdir('libtest') -test_libraries = [libcamera, libtest] - -test_includes_public = [ - libtest_includes, - libcamera_includes, -] - -test_includes_internal = [ - test_includes_public, - libcamera_internal_includes, -] - subdir('media_device') public_tests = [
With the libtest functionality moved to it's own library folder, the definitions for test inlcludes should reasonably live there too. The libtest subdir should always remain the first entry in the test/meson.build file. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> --- test/libtest/meson.build | 12 ++++++++++++ test/meson.build | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-)