| Message ID | 20221005193944.16383-2-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Commit | 2ee8faf3c89e8f5f3f7d9693d3ed8cd892bcb5ec |
| Headers | show |
| Series |
|
| Related | show |
Hi Laurent On Wed, Oct 05, 2022 at 10:39:43PM +0300, Laurent Pinchart via libcamera-devel wrote: > The 't' name is very short and not very explicit. Rename it to 'test' > instead. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Thanks j > --- > test/camera/meson.build | 6 +++--- > test/controls/meson.build | 6 +++--- > test/gstreamer/meson.build | 6 +++--- > test/ipa/meson.build | 6 +++--- > test/ipc/meson.build | 6 +++--- > test/log/meson.build | 6 +++--- > test/media_device/meson.build | 6 +++--- > test/meson.build | 30 +++++++++++++++--------------- > test/pipeline/ipu3/meson.build | 6 +++--- > test/pipeline/rkisp1/meson.build | 6 +++--- > test/process/meson.build | 6 +++--- > test/serialization/meson.build | 6 +++--- > test/stream/meson.build | 6 +++--- > test/v4l2_subdevice/meson.build | 6 +++--- > test/v4l2_videodevice/meson.build | 6 +++--- > 15 files changed, 57 insertions(+), 57 deletions(-) > > diff --git a/test/camera/meson.build b/test/camera/meson.build > index 668d5c03fb6e..df0520293bdb 100644 > --- a/test/camera/meson.build > +++ b/test/camera/meson.build > @@ -11,10 +11,10 @@ camera_tests = [ > ['camera_reconfigure', 'camera_reconfigure.cpp'], > ] > > -foreach t : camera_tests > - exe = executable(t[0], t[1], > +foreach test : camera_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite : 'camera', is_parallel : false) > + test(test[0], exe, suite : 'camera', is_parallel : false) > endforeach > diff --git a/test/controls/meson.build b/test/controls/meson.build > index 0103543e1fc2..8cf23be6487c 100644 > --- a/test/controls/meson.build > +++ b/test/controls/meson.build > @@ -7,10 +7,10 @@ control_tests = [ > ['control_value', 'control_value.cpp'], > ] > > -foreach t : control_tests > - exe = executable(t[0], t[1], > +foreach test : control_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_public, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite : 'controls', is_parallel : false) > + test(test[0], exe, suite : 'controls', is_parallel : false) > endforeach > diff --git a/test/gstreamer/meson.build b/test/gstreamer/meson.build > index 10058fc5206f..46f6a77a771e 100644 > --- a/test/gstreamer/meson.build > +++ b/test/gstreamer/meson.build > @@ -10,11 +10,11 @@ gstreamer_tests = [ > ] > gstreamer_dep = dependency('gstreamer-1.0', required: true) > > -foreach t : gstreamer_tests > - exe = executable(t[0], t[1], 'gstreamer_test.cpp', > +foreach test : gstreamer_tests > + exe = executable(test[0], test[1], 'gstreamer_test.cpp', > dependencies : [libcamera_private, gstreamer_dep], > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'gstreamer', is_parallel : false) > + test(test[0], exe, suite : 'gstreamer', is_parallel : false) > endforeach > diff --git a/test/ipa/meson.build b/test/ipa/meson.build > index 7938633e54ab..295807fd8a45 100644 > --- a/test/ipa/meson.build > +++ b/test/ipa/meson.build > @@ -5,11 +5,11 @@ ipa_test = [ > ['ipa_interface_test', 'ipa_interface_test.cpp'], > ] > > -foreach t : ipa_test > - exe = executable(t[0], [t[1], libcamera_generated_ipa_headers], > +foreach test : ipa_test > + exe = executable(test[0], [test[1], libcamera_generated_ipa_headers], > dependencies : libcamera_private, > link_with : [libipa, test_libraries], > include_directories : [libipa_includes, test_includes_internal]) > > - test(t[0], exe, suite : 'ipa') > + test(test[0], exe, suite : 'ipa') > endforeach > diff --git a/test/ipc/meson.build b/test/ipc/meson.build > index 2a6cd7fb8433..ce21135b701d 100644 > --- a/test/ipc/meson.build > +++ b/test/ipc/meson.build > @@ -5,11 +5,11 @@ ipc_tests = [ > ['unixsocket', 'unixsocket.cpp'], > ] > > -foreach t : ipc_tests > - exe = executable(t[0], t[1], > +foreach test : ipc_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'ipc') > + test(test[0], exe, suite : 'ipc') > endforeach > diff --git a/test/log/meson.build b/test/log/meson.build > index ac87841a24e1..d2d51e471d52 100644 > --- a/test/log/meson.build > +++ b/test/log/meson.build > @@ -5,11 +5,11 @@ log_test = [ > ['log_process', 'log_process.cpp'], > ] > > -foreach t : log_test > - exe = executable(t[0], t[1], > +foreach test : log_test > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'log') > + test(test[0], exe, suite : 'log') > endforeach > diff --git a/test/media_device/meson.build b/test/media_device/meson.build > index 83dfe8f11d2f..7d34509d6797 100644 > --- a/test/media_device/meson.build > +++ b/test/media_device/meson.build > @@ -14,11 +14,11 @@ lib_mdev_test = static_library('lib_mdev_test', lib_mdev_test_sources, > dependencies : libcamera_private, > include_directories : test_includes_internal) > > -foreach t : media_device_tests > - exe = executable(t[0], t[1], > +foreach test : media_device_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : [test_libraries, lib_mdev_test], > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'media_device', is_parallel : false) > + test(test[0], exe, suite : 'media_device', is_parallel : false) > endforeach > diff --git a/test/meson.build b/test/meson.build > index 9bf7bf34e796..4bc01d78f4e6 100644 > --- a/test/meson.build > +++ b/test/meson.build > @@ -64,44 +64,44 @@ internal_non_parallel_tests = [ > ['mapped-buffer', 'mapped-buffer.cpp'], > ] > > -foreach t : public_tests > +foreach test : public_tests > deps = [libcamera_public] > - if t.length() > 2 > - deps += t[2] > + if test.length() > 2 > + deps += test[2] > endif > > - exe = executable(t[0], t[1], > + exe = executable(test[0], test[1], > dependencies : deps, > link_with : test_libraries, > include_directories : test_includes_public) > > - test(t[0], exe) > + test(test[0], exe) > endforeach > > -foreach t : internal_tests > +foreach test : internal_tests > deps = [libcamera_private] > - if t.length() > 2 > - deps += t[2] > + if test.length() > 2 > + deps += test[2] > endif > > - exe = executable(t[0], t[1], > + exe = executable(test[0], test[1], > dependencies : deps, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe) > + test(test[0], exe) > endforeach > > -foreach t : internal_non_parallel_tests > +foreach test : internal_non_parallel_tests > deps = [libcamera_private] > - if t.length() > 2 > - deps += t[2] > + if test.length() > 2 > + deps += test[2] > endif > > - exe = executable(t[0], t[1], > + exe = executable(test[0], test[1], > dependencies : deps, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, is_parallel : false) > + test(test[0], exe, is_parallel : false) > endforeach > diff --git a/test/pipeline/ipu3/meson.build b/test/pipeline/ipu3/meson.build > index 16701080ca2b..5fcf5730b0b0 100644 > --- a/test/pipeline/ipu3/meson.build > +++ b/test/pipeline/ipu3/meson.build > @@ -4,11 +4,11 @@ ipu3_test = [ > ['ipu3_pipeline_test', 'ipu3_pipeline_test.cpp'], > ] > > -foreach t : ipu3_test > - exe = executable(t[0], t[1], > +foreach test : ipu3_test > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'ipu3', is_parallel : false) > + test(test[0], exe, suite : 'ipu3', is_parallel : false) > endforeach > diff --git a/test/pipeline/rkisp1/meson.build b/test/pipeline/rkisp1/meson.build > index 364b5711a0f9..c82cc78972f6 100644 > --- a/test/pipeline/rkisp1/meson.build > +++ b/test/pipeline/rkisp1/meson.build > @@ -4,11 +4,11 @@ rkisp1_test = [ > ['rkisp1_pipeline_test', 'rkisp1_pipeline_test.cpp'], > ] > > -foreach t : rkisp1_test > - exe = executable(t[0], t[1], > +foreach test : rkisp1_test > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'rkisp1', is_parallel : false) > + test(test[0], exe, suite : 'rkisp1', is_parallel : false) > endforeach > diff --git a/test/process/meson.build b/test/process/meson.build > index af86b277db63..c656d7343e54 100644 > --- a/test/process/meson.build > +++ b/test/process/meson.build > @@ -4,11 +4,11 @@ process_tests = [ > ['process_test', 'process_test.cpp'], > ] > > -foreach t : process_tests > - exe = executable(t[0], t[1], > +foreach test : process_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'process', is_parallel : false) > + test(test[0], exe, suite : 'process', is_parallel : false) > endforeach > diff --git a/test/serialization/meson.build b/test/serialization/meson.build > index 26e42b150b40..c4206cb3632b 100644 > --- a/test/serialization/meson.build > +++ b/test/serialization/meson.build > @@ -7,10 +7,10 @@ serialization_tests = [ > ['ipa_data_serializer_test', 'ipa_data_serializer_test.cpp'], > ] > > -foreach t : serialization_tests > - exe = executable(t[0], [t[1], 'serialization_test.cpp'], > +foreach test : serialization_tests > + exe = executable(test[0], [test[1], 'serialization_test.cpp'], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite : 'serialization', is_parallel : false) > + test(test[0], exe, suite : 'serialization', is_parallel : false) > endforeach > diff --git a/test/stream/meson.build b/test/stream/meson.build > index 89f51c18a63e..3a97868bce1c 100644 > --- a/test/stream/meson.build > +++ b/test/stream/meson.build > @@ -5,10 +5,10 @@ stream_tests = [ > ['stream_formats', 'stream_formats.cpp'], > ] > > -foreach t : stream_tests > - exe = executable(t[0], t[1], > +foreach test : stream_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_public, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite: 'stream') > + test(test[0], exe, suite: 'stream') > endforeach > diff --git a/test/v4l2_subdevice/meson.build b/test/v4l2_subdevice/meson.build > index d82be3c60b75..4e607d41fc54 100644 > --- a/test/v4l2_subdevice/meson.build > +++ b/test/v4l2_subdevice/meson.build > @@ -5,10 +5,10 @@ v4l2_subdevice_tests = [ > ['test_formats', 'test_formats.cpp'], > ] > > -foreach t : v4l2_subdevice_tests > - exe = executable(t[0], [t[1], 'v4l2_subdevice_test.cpp'], > +foreach test : v4l2_subdevice_tests > + exe = executable(test[0], [test[1], 'v4l2_subdevice_test.cpp'], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite : 'v4l2_subdevice', is_parallel : false) > + test(test[0], exe, suite : 'v4l2_subdevice', is_parallel : false) > endforeach > diff --git a/test/v4l2_videodevice/meson.build b/test/v4l2_videodevice/meson.build > index 7a26f53d106a..f85374854c48 100644 > --- a/test/v4l2_videodevice/meson.build > +++ b/test/v4l2_videodevice/meson.build > @@ -15,10 +15,10 @@ v4l2_videodevice_tests = [ > ['v4l2_m2mdevice', 'v4l2_m2mdevice.cpp'], > ] > > -foreach t : v4l2_videodevice_tests > - exe = executable(t[0], [t[1], 'v4l2_videodevice_test.cpp'], > +foreach test : v4l2_videodevice_tests > + exe = executable(test[0], [test[1], 'v4l2_videodevice_test.cpp'], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite : 'v4l2_videodevice', is_parallel : false) > + test(test[0], exe, suite : 'v4l2_videodevice', is_parallel : false) > endforeach > -- > Regards, > > Laurent Pinchart >
Hi Laurent, Thanks for the patch. On 10/6/22 1:09 AM, Laurent Pinchart via libcamera-devel wrote: > The 't' name is very short and not very explicit. Rename it to 'test' > instead. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com> > --- > test/camera/meson.build | 6 +++--- > test/controls/meson.build | 6 +++--- > test/gstreamer/meson.build | 6 +++--- > test/ipa/meson.build | 6 +++--- > test/ipc/meson.build | 6 +++--- > test/log/meson.build | 6 +++--- > test/media_device/meson.build | 6 +++--- > test/meson.build | 30 +++++++++++++++--------------- > test/pipeline/ipu3/meson.build | 6 +++--- > test/pipeline/rkisp1/meson.build | 6 +++--- > test/process/meson.build | 6 +++--- > test/serialization/meson.build | 6 +++--- > test/stream/meson.build | 6 +++--- > test/v4l2_subdevice/meson.build | 6 +++--- > test/v4l2_videodevice/meson.build | 6 +++--- > 15 files changed, 57 insertions(+), 57 deletions(-) > > diff --git a/test/camera/meson.build b/test/camera/meson.build > index 668d5c03fb6e..df0520293bdb 100644 > --- a/test/camera/meson.build > +++ b/test/camera/meson.build > @@ -11,10 +11,10 @@ camera_tests = [ > ['camera_reconfigure', 'camera_reconfigure.cpp'], > ] > > -foreach t : camera_tests > - exe = executable(t[0], t[1], > +foreach test : camera_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite : 'camera', is_parallel : false) > + test(test[0], exe, suite : 'camera', is_parallel : false) > endforeach > diff --git a/test/controls/meson.build b/test/controls/meson.build > index 0103543e1fc2..8cf23be6487c 100644 > --- a/test/controls/meson.build > +++ b/test/controls/meson.build > @@ -7,10 +7,10 @@ control_tests = [ > ['control_value', 'control_value.cpp'], > ] > > -foreach t : control_tests > - exe = executable(t[0], t[1], > +foreach test : control_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_public, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite : 'controls', is_parallel : false) > + test(test[0], exe, suite : 'controls', is_parallel : false) > endforeach > diff --git a/test/gstreamer/meson.build b/test/gstreamer/meson.build > index 10058fc5206f..46f6a77a771e 100644 > --- a/test/gstreamer/meson.build > +++ b/test/gstreamer/meson.build > @@ -10,11 +10,11 @@ gstreamer_tests = [ > ] > gstreamer_dep = dependency('gstreamer-1.0', required: true) > > -foreach t : gstreamer_tests > - exe = executable(t[0], t[1], 'gstreamer_test.cpp', > +foreach test : gstreamer_tests > + exe = executable(test[0], test[1], 'gstreamer_test.cpp', > dependencies : [libcamera_private, gstreamer_dep], > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'gstreamer', is_parallel : false) > + test(test[0], exe, suite : 'gstreamer', is_parallel : false) > endforeach > diff --git a/test/ipa/meson.build b/test/ipa/meson.build > index 7938633e54ab..295807fd8a45 100644 > --- a/test/ipa/meson.build > +++ b/test/ipa/meson.build > @@ -5,11 +5,11 @@ ipa_test = [ > ['ipa_interface_test', 'ipa_interface_test.cpp'], > ] > > -foreach t : ipa_test > - exe = executable(t[0], [t[1], libcamera_generated_ipa_headers], > +foreach test : ipa_test > + exe = executable(test[0], [test[1], libcamera_generated_ipa_headers], > dependencies : libcamera_private, > link_with : [libipa, test_libraries], > include_directories : [libipa_includes, test_includes_internal]) > > - test(t[0], exe, suite : 'ipa') > + test(test[0], exe, suite : 'ipa') > endforeach > diff --git a/test/ipc/meson.build b/test/ipc/meson.build > index 2a6cd7fb8433..ce21135b701d 100644 > --- a/test/ipc/meson.build > +++ b/test/ipc/meson.build > @@ -5,11 +5,11 @@ ipc_tests = [ > ['unixsocket', 'unixsocket.cpp'], > ] > > -foreach t : ipc_tests > - exe = executable(t[0], t[1], > +foreach test : ipc_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'ipc') > + test(test[0], exe, suite : 'ipc') > endforeach > diff --git a/test/log/meson.build b/test/log/meson.build > index ac87841a24e1..d2d51e471d52 100644 > --- a/test/log/meson.build > +++ b/test/log/meson.build > @@ -5,11 +5,11 @@ log_test = [ > ['log_process', 'log_process.cpp'], > ] > > -foreach t : log_test > - exe = executable(t[0], t[1], > +foreach test : log_test > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'log') > + test(test[0], exe, suite : 'log') > endforeach > diff --git a/test/media_device/meson.build b/test/media_device/meson.build > index 83dfe8f11d2f..7d34509d6797 100644 > --- a/test/media_device/meson.build > +++ b/test/media_device/meson.build > @@ -14,11 +14,11 @@ lib_mdev_test = static_library('lib_mdev_test', lib_mdev_test_sources, > dependencies : libcamera_private, > include_directories : test_includes_internal) > > -foreach t : media_device_tests > - exe = executable(t[0], t[1], > +foreach test : media_device_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : [test_libraries, lib_mdev_test], > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'media_device', is_parallel : false) > + test(test[0], exe, suite : 'media_device', is_parallel : false) > endforeach > diff --git a/test/meson.build b/test/meson.build > index 9bf7bf34e796..4bc01d78f4e6 100644 > --- a/test/meson.build > +++ b/test/meson.build > @@ -64,44 +64,44 @@ internal_non_parallel_tests = [ > ['mapped-buffer', 'mapped-buffer.cpp'], > ] > > -foreach t : public_tests > +foreach test : public_tests > deps = [libcamera_public] > - if t.length() > 2 > - deps += t[2] > + if test.length() > 2 > + deps += test[2] > endif > > - exe = executable(t[0], t[1], > + exe = executable(test[0], test[1], > dependencies : deps, > link_with : test_libraries, > include_directories : test_includes_public) > > - test(t[0], exe) > + test(test[0], exe) > endforeach > > -foreach t : internal_tests > +foreach test : internal_tests > deps = [libcamera_private] > - if t.length() > 2 > - deps += t[2] > + if test.length() > 2 > + deps += test[2] > endif > > - exe = executable(t[0], t[1], > + exe = executable(test[0], test[1], > dependencies : deps, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe) > + test(test[0], exe) > endforeach > > -foreach t : internal_non_parallel_tests > +foreach test : internal_non_parallel_tests > deps = [libcamera_private] > - if t.length() > 2 > - deps += t[2] > + if test.length() > 2 > + deps += test[2] > endif > > - exe = executable(t[0], t[1], > + exe = executable(test[0], test[1], > dependencies : deps, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, is_parallel : false) > + test(test[0], exe, is_parallel : false) > endforeach > diff --git a/test/pipeline/ipu3/meson.build b/test/pipeline/ipu3/meson.build > index 16701080ca2b..5fcf5730b0b0 100644 > --- a/test/pipeline/ipu3/meson.build > +++ b/test/pipeline/ipu3/meson.build > @@ -4,11 +4,11 @@ ipu3_test = [ > ['ipu3_pipeline_test', 'ipu3_pipeline_test.cpp'], > ] > > -foreach t : ipu3_test > - exe = executable(t[0], t[1], > +foreach test : ipu3_test > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'ipu3', is_parallel : false) > + test(test[0], exe, suite : 'ipu3', is_parallel : false) > endforeach > diff --git a/test/pipeline/rkisp1/meson.build b/test/pipeline/rkisp1/meson.build > index 364b5711a0f9..c82cc78972f6 100644 > --- a/test/pipeline/rkisp1/meson.build > +++ b/test/pipeline/rkisp1/meson.build > @@ -4,11 +4,11 @@ rkisp1_test = [ > ['rkisp1_pipeline_test', 'rkisp1_pipeline_test.cpp'], > ] > > -foreach t : rkisp1_test > - exe = executable(t[0], t[1], > +foreach test : rkisp1_test > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'rkisp1', is_parallel : false) > + test(test[0], exe, suite : 'rkisp1', is_parallel : false) > endforeach > diff --git a/test/process/meson.build b/test/process/meson.build > index af86b277db63..c656d7343e54 100644 > --- a/test/process/meson.build > +++ b/test/process/meson.build > @@ -4,11 +4,11 @@ process_tests = [ > ['process_test', 'process_test.cpp'], > ] > > -foreach t : process_tests > - exe = executable(t[0], t[1], > +foreach test : process_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > > - test(t[0], exe, suite : 'process', is_parallel : false) > + test(test[0], exe, suite : 'process', is_parallel : false) > endforeach > diff --git a/test/serialization/meson.build b/test/serialization/meson.build > index 26e42b150b40..c4206cb3632b 100644 > --- a/test/serialization/meson.build > +++ b/test/serialization/meson.build > @@ -7,10 +7,10 @@ serialization_tests = [ > ['ipa_data_serializer_test', 'ipa_data_serializer_test.cpp'], > ] > > -foreach t : serialization_tests > - exe = executable(t[0], [t[1], 'serialization_test.cpp'], > +foreach test : serialization_tests > + exe = executable(test[0], [test[1], 'serialization_test.cpp'], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite : 'serialization', is_parallel : false) > + test(test[0], exe, suite : 'serialization', is_parallel : false) > endforeach > diff --git a/test/stream/meson.build b/test/stream/meson.build > index 89f51c18a63e..3a97868bce1c 100644 > --- a/test/stream/meson.build > +++ b/test/stream/meson.build > @@ -5,10 +5,10 @@ stream_tests = [ > ['stream_formats', 'stream_formats.cpp'], > ] > > -foreach t : stream_tests > - exe = executable(t[0], t[1], > +foreach test : stream_tests > + exe = executable(test[0], test[1], > dependencies : libcamera_public, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite: 'stream') > + test(test[0], exe, suite: 'stream') > endforeach > diff --git a/test/v4l2_subdevice/meson.build b/test/v4l2_subdevice/meson.build > index d82be3c60b75..4e607d41fc54 100644 > --- a/test/v4l2_subdevice/meson.build > +++ b/test/v4l2_subdevice/meson.build > @@ -5,10 +5,10 @@ v4l2_subdevice_tests = [ > ['test_formats', 'test_formats.cpp'], > ] > > -foreach t : v4l2_subdevice_tests > - exe = executable(t[0], [t[1], 'v4l2_subdevice_test.cpp'], > +foreach test : v4l2_subdevice_tests > + exe = executable(test[0], [test[1], 'v4l2_subdevice_test.cpp'], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite : 'v4l2_subdevice', is_parallel : false) > + test(test[0], exe, suite : 'v4l2_subdevice', is_parallel : false) > endforeach > diff --git a/test/v4l2_videodevice/meson.build b/test/v4l2_videodevice/meson.build > index 7a26f53d106a..f85374854c48 100644 > --- a/test/v4l2_videodevice/meson.build > +++ b/test/v4l2_videodevice/meson.build > @@ -15,10 +15,10 @@ v4l2_videodevice_tests = [ > ['v4l2_m2mdevice', 'v4l2_m2mdevice.cpp'], > ] > > -foreach t : v4l2_videodevice_tests > - exe = executable(t[0], [t[1], 'v4l2_videodevice_test.cpp'], > +foreach test : v4l2_videodevice_tests > + exe = executable(test[0], [test[1], 'v4l2_videodevice_test.cpp'], > dependencies : libcamera_private, > link_with : test_libraries, > include_directories : test_includes_internal) > - test(t[0], exe, suite : 'v4l2_videodevice', is_parallel : false) > + test(test[0], exe, suite : 'v4l2_videodevice', is_parallel : false) > endforeach
diff --git a/test/camera/meson.build b/test/camera/meson.build index 668d5c03fb6e..df0520293bdb 100644 --- a/test/camera/meson.build +++ b/test/camera/meson.build @@ -11,10 +11,10 @@ camera_tests = [ ['camera_reconfigure', 'camera_reconfigure.cpp'], ] -foreach t : camera_tests - exe = executable(t[0], t[1], +foreach test : camera_tests + exe = executable(test[0], test[1], dependencies : libcamera_private, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'camera', is_parallel : false) + test(test[0], exe, suite : 'camera', is_parallel : false) endforeach diff --git a/test/controls/meson.build b/test/controls/meson.build index 0103543e1fc2..8cf23be6487c 100644 --- a/test/controls/meson.build +++ b/test/controls/meson.build @@ -7,10 +7,10 @@ control_tests = [ ['control_value', 'control_value.cpp'], ] -foreach t : control_tests - exe = executable(t[0], t[1], +foreach test : control_tests + exe = executable(test[0], test[1], dependencies : libcamera_public, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'controls', is_parallel : false) + test(test[0], exe, suite : 'controls', is_parallel : false) endforeach diff --git a/test/gstreamer/meson.build b/test/gstreamer/meson.build index 10058fc5206f..46f6a77a771e 100644 --- a/test/gstreamer/meson.build +++ b/test/gstreamer/meson.build @@ -10,11 +10,11 @@ gstreamer_tests = [ ] gstreamer_dep = dependency('gstreamer-1.0', required: true) -foreach t : gstreamer_tests - exe = executable(t[0], t[1], 'gstreamer_test.cpp', +foreach test : gstreamer_tests + exe = executable(test[0], test[1], 'gstreamer_test.cpp', dependencies : [libcamera_private, gstreamer_dep], link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'gstreamer', is_parallel : false) + test(test[0], exe, suite : 'gstreamer', is_parallel : false) endforeach diff --git a/test/ipa/meson.build b/test/ipa/meson.build index 7938633e54ab..295807fd8a45 100644 --- a/test/ipa/meson.build +++ b/test/ipa/meson.build @@ -5,11 +5,11 @@ ipa_test = [ ['ipa_interface_test', 'ipa_interface_test.cpp'], ] -foreach t : ipa_test - exe = executable(t[0], [t[1], libcamera_generated_ipa_headers], +foreach test : ipa_test + exe = executable(test[0], [test[1], libcamera_generated_ipa_headers], dependencies : libcamera_private, link_with : [libipa, test_libraries], include_directories : [libipa_includes, test_includes_internal]) - test(t[0], exe, suite : 'ipa') + test(test[0], exe, suite : 'ipa') endforeach diff --git a/test/ipc/meson.build b/test/ipc/meson.build index 2a6cd7fb8433..ce21135b701d 100644 --- a/test/ipc/meson.build +++ b/test/ipc/meson.build @@ -5,11 +5,11 @@ ipc_tests = [ ['unixsocket', 'unixsocket.cpp'], ] -foreach t : ipc_tests - exe = executable(t[0], t[1], +foreach test : ipc_tests + exe = executable(test[0], test[1], dependencies : libcamera_private, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'ipc') + test(test[0], exe, suite : 'ipc') endforeach diff --git a/test/log/meson.build b/test/log/meson.build index ac87841a24e1..d2d51e471d52 100644 --- a/test/log/meson.build +++ b/test/log/meson.build @@ -5,11 +5,11 @@ log_test = [ ['log_process', 'log_process.cpp'], ] -foreach t : log_test - exe = executable(t[0], t[1], +foreach test : log_test + exe = executable(test[0], test[1], dependencies : libcamera_private, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'log') + test(test[0], exe, suite : 'log') endforeach diff --git a/test/media_device/meson.build b/test/media_device/meson.build index 83dfe8f11d2f..7d34509d6797 100644 --- a/test/media_device/meson.build +++ b/test/media_device/meson.build @@ -14,11 +14,11 @@ lib_mdev_test = static_library('lib_mdev_test', lib_mdev_test_sources, dependencies : libcamera_private, include_directories : test_includes_internal) -foreach t : media_device_tests - exe = executable(t[0], t[1], +foreach test : media_device_tests + exe = executable(test[0], test[1], dependencies : libcamera_private, link_with : [test_libraries, lib_mdev_test], include_directories : test_includes_internal) - test(t[0], exe, suite : 'media_device', is_parallel : false) + test(test[0], exe, suite : 'media_device', is_parallel : false) endforeach diff --git a/test/meson.build b/test/meson.build index 9bf7bf34e796..4bc01d78f4e6 100644 --- a/test/meson.build +++ b/test/meson.build @@ -64,44 +64,44 @@ internal_non_parallel_tests = [ ['mapped-buffer', 'mapped-buffer.cpp'], ] -foreach t : public_tests +foreach test : public_tests deps = [libcamera_public] - if t.length() > 2 - deps += t[2] + if test.length() > 2 + deps += test[2] endif - exe = executable(t[0], t[1], + exe = executable(test[0], test[1], dependencies : deps, link_with : test_libraries, include_directories : test_includes_public) - test(t[0], exe) + test(test[0], exe) endforeach -foreach t : internal_tests +foreach test : internal_tests deps = [libcamera_private] - if t.length() > 2 - deps += t[2] + if test.length() > 2 + deps += test[2] endif - exe = executable(t[0], t[1], + exe = executable(test[0], test[1], dependencies : deps, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe) + test(test[0], exe) endforeach -foreach t : internal_non_parallel_tests +foreach test : internal_non_parallel_tests deps = [libcamera_private] - if t.length() > 2 - deps += t[2] + if test.length() > 2 + deps += test[2] endif - exe = executable(t[0], t[1], + exe = executable(test[0], test[1], dependencies : deps, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, is_parallel : false) + test(test[0], exe, is_parallel : false) endforeach diff --git a/test/pipeline/ipu3/meson.build b/test/pipeline/ipu3/meson.build index 16701080ca2b..5fcf5730b0b0 100644 --- a/test/pipeline/ipu3/meson.build +++ b/test/pipeline/ipu3/meson.build @@ -4,11 +4,11 @@ ipu3_test = [ ['ipu3_pipeline_test', 'ipu3_pipeline_test.cpp'], ] -foreach t : ipu3_test - exe = executable(t[0], t[1], +foreach test : ipu3_test + exe = executable(test[0], test[1], dependencies : libcamera_private, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'ipu3', is_parallel : false) + test(test[0], exe, suite : 'ipu3', is_parallel : false) endforeach diff --git a/test/pipeline/rkisp1/meson.build b/test/pipeline/rkisp1/meson.build index 364b5711a0f9..c82cc78972f6 100644 --- a/test/pipeline/rkisp1/meson.build +++ b/test/pipeline/rkisp1/meson.build @@ -4,11 +4,11 @@ rkisp1_test = [ ['rkisp1_pipeline_test', 'rkisp1_pipeline_test.cpp'], ] -foreach t : rkisp1_test - exe = executable(t[0], t[1], +foreach test : rkisp1_test + exe = executable(test[0], test[1], dependencies : libcamera_private, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'rkisp1', is_parallel : false) + test(test[0], exe, suite : 'rkisp1', is_parallel : false) endforeach diff --git a/test/process/meson.build b/test/process/meson.build index af86b277db63..c656d7343e54 100644 --- a/test/process/meson.build +++ b/test/process/meson.build @@ -4,11 +4,11 @@ process_tests = [ ['process_test', 'process_test.cpp'], ] -foreach t : process_tests - exe = executable(t[0], t[1], +foreach test : process_tests + exe = executable(test[0], test[1], dependencies : libcamera_private, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'process', is_parallel : false) + test(test[0], exe, suite : 'process', is_parallel : false) endforeach diff --git a/test/serialization/meson.build b/test/serialization/meson.build index 26e42b150b40..c4206cb3632b 100644 --- a/test/serialization/meson.build +++ b/test/serialization/meson.build @@ -7,10 +7,10 @@ serialization_tests = [ ['ipa_data_serializer_test', 'ipa_data_serializer_test.cpp'], ] -foreach t : serialization_tests - exe = executable(t[0], [t[1], 'serialization_test.cpp'], +foreach test : serialization_tests + exe = executable(test[0], [test[1], 'serialization_test.cpp'], dependencies : libcamera_private, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'serialization', is_parallel : false) + test(test[0], exe, suite : 'serialization', is_parallel : false) endforeach diff --git a/test/stream/meson.build b/test/stream/meson.build index 89f51c18a63e..3a97868bce1c 100644 --- a/test/stream/meson.build +++ b/test/stream/meson.build @@ -5,10 +5,10 @@ stream_tests = [ ['stream_formats', 'stream_formats.cpp'], ] -foreach t : stream_tests - exe = executable(t[0], t[1], +foreach test : stream_tests + exe = executable(test[0], test[1], dependencies : libcamera_public, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite: 'stream') + test(test[0], exe, suite: 'stream') endforeach diff --git a/test/v4l2_subdevice/meson.build b/test/v4l2_subdevice/meson.build index d82be3c60b75..4e607d41fc54 100644 --- a/test/v4l2_subdevice/meson.build +++ b/test/v4l2_subdevice/meson.build @@ -5,10 +5,10 @@ v4l2_subdevice_tests = [ ['test_formats', 'test_formats.cpp'], ] -foreach t : v4l2_subdevice_tests - exe = executable(t[0], [t[1], 'v4l2_subdevice_test.cpp'], +foreach test : v4l2_subdevice_tests + exe = executable(test[0], [test[1], 'v4l2_subdevice_test.cpp'], dependencies : libcamera_private, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'v4l2_subdevice', is_parallel : false) + test(test[0], exe, suite : 'v4l2_subdevice', is_parallel : false) endforeach diff --git a/test/v4l2_videodevice/meson.build b/test/v4l2_videodevice/meson.build index 7a26f53d106a..f85374854c48 100644 --- a/test/v4l2_videodevice/meson.build +++ b/test/v4l2_videodevice/meson.build @@ -15,10 +15,10 @@ v4l2_videodevice_tests = [ ['v4l2_m2mdevice', 'v4l2_m2mdevice.cpp'], ] -foreach t : v4l2_videodevice_tests - exe = executable(t[0], [t[1], 'v4l2_videodevice_test.cpp'], +foreach test : v4l2_videodevice_tests + exe = executable(test[0], [test[1], 'v4l2_videodevice_test.cpp'], dependencies : libcamera_private, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'v4l2_videodevice', is_parallel : false) + test(test[0], exe, suite : 'v4l2_videodevice', is_parallel : false) endforeach
The 't' name is very short and not very explicit. Rename it to 'test' instead. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- test/camera/meson.build | 6 +++--- test/controls/meson.build | 6 +++--- test/gstreamer/meson.build | 6 +++--- test/ipa/meson.build | 6 +++--- test/ipc/meson.build | 6 +++--- test/log/meson.build | 6 +++--- test/media_device/meson.build | 6 +++--- test/meson.build | 30 +++++++++++++++--------------- test/pipeline/ipu3/meson.build | 6 +++--- test/pipeline/rkisp1/meson.build | 6 +++--- test/process/meson.build | 6 +++--- test/serialization/meson.build | 6 +++--- test/stream/meson.build | 6 +++--- test/v4l2_subdevice/meson.build | 6 +++--- test/v4l2_videodevice/meson.build | 6 +++--- 15 files changed, 57 insertions(+), 57 deletions(-)