diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2021-09-10 11:03:52 +0200 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2021-09-13 11:05:44 +0200 |
| commit | 0342898176b7003760cec4d2f77c623ed846cbb1 (patch) | |
| tree | 302dd6140a4fb6538cfed7467e647ff50ef5a4f7 | |
| parent | 75937c2adc987266631f66c59408f33bfeea62b6 (diff) | |
build: Use dictionary based arguments
Since meson 0.49, a new argument called `kwargs` can be used to pass
a dictionary to specify different parameters[0].
This feature has been used to make test builds more readable.
[0] https://mesonbuild.com/Release-notes-for-0-49-0.html#can-specify-keyword-arguments-with-a-dictionary
| -rw-r--r-- | src/libqmi-glib/test/meson.build | 21 | ||||
| -rw-r--r-- | src/qmi-firmware-update/test/meson.build | 18 |
2 files changed, 19 insertions, 20 deletions
diff --git a/src/libqmi-glib/test/meson.build b/src/libqmi-glib/test/meson.build index ac3e283..884d272 100644 --- a/src/libqmi-glib/test/meson.build +++ b/src/libqmi-glib/test/meson.build @@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2019 - 2021 Iñigo Martinez <inigomartinez@gmail.com> -test_units = [ - ['test-compat-utils', files('test-compat-utils.c'), [libqmi_glib_dep]], - ['test-message', files('test-message.c'), [libqmi_glib_dep]], - ['test-utils', files('test-utils.c'), [libqmi_glib_dep]], -] +test_units = { + 'test-compat-utils': {'sources': files('test-compat-utils.c'), 'dependencies': libqmi_glib_dep}, + 'test-message': {'sources': files('test-message.c'), 'dependencies': libqmi_glib_dep}, + 'test-utils': {'sources': files('test-utils.c'), 'dependencies': libqmi_glib_dep}, +} sources = files( 'test-fixture.c', @@ -18,24 +18,23 @@ deps = [ libqmi_glib_dep, ] -test_units += [['test-generated', sources, deps]] +test_units += {'test-generated': {'sources': sources, 'dependencies': deps}} test_env += { 'G_TEST_BUILDDIR': meson.current_build_dir(), 'G_TEST_SRCDIR': meson.current_source_dir(), } -foreach test_unit: test_units +foreach test_name, test_args: test_units exe = executable( - test_unit[0], - sources: test_unit[1], + test_name, include_directories: top_inc, - dependencies: test_unit[2], c_args: ['-DLIBQMI_GLIB_COMPILATION'] + no_deprecated_declarations_flags, + kwargs: test_args, ) test( - test_unit[0], + test_name, exe, env: test_env, ) diff --git a/src/qmi-firmware-update/test/meson.build b/src/qmi-firmware-update/test/meson.build index e5da831..ea156b2 100644 --- a/src/qmi-firmware-update/test/meson.build +++ b/src/qmi-firmware-update/test/meson.build @@ -1,28 +1,28 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2019 - 2021 Iñigo Martinez <inigomartinez@gmail.com> -test_units = [ - ['test-utils', libutils_dep], - ['test-firehose', libfirehose_dep], -] +test_units = { + 'test-utils': {'dependencies': libutils_dep}, + 'test-firehose': {'dependencies': libfirehose_dep}, +} test_env += { 'G_TEST_BUILDDIR': meson.current_build_dir(), 'G_TEST_SRCDIR': meson.current_source_dir(), } -foreach test_unit: test_units +foreach test_name, test_args: test_units exe = executable( # FIXME: added `firm` prefix to avoid target name collision - 'firm-' + test_unit[0], - sources: test_unit[0] + '.c', + 'firm-' + test_name, + sources: test_name + '.c', include_directories: top_inc, - dependencies: test_unit[1], c_args: '-DLIBQMI_GLIB_COMPILATION', + kwargs: test_args, ) test( - test_unit[0], + test_name, exe, env: test_env, ) |