From 66ad3770c761ab03ca1f67b15b32bebb6a4f2cac Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 10 Dec 2022 15:36:07 -0500 Subject: Use consistent meson formatting --- test/bad_syntax.lv2/meson.build | 40 ++++++++++++++++++------------ test/failed_instantiation.lv2/meson.build | 40 ++++++++++++++++++------------ test/failed_lib_descriptor.lv2/meson.build | 40 ++++++++++++++++++------------ test/lib_descriptor.lv2/meson.build | 40 ++++++++++++++++++------------ test/meson.build | 26 +++++++++++-------- test/missing_descriptor.lv2/meson.build | 40 ++++++++++++++++++------------ test/missing_name.lv2/meson.build | 40 ++++++++++++++++++------------ test/missing_plugin.lv2/meson.build | 40 ++++++++++++++++++------------ test/missing_port.lv2/meson.build | 40 ++++++++++++++++++------------ test/missing_port_name.lv2/meson.build | 40 ++++++++++++++++++------------ test/new_version.lv2/meson.build | 22 +++++++++------- test/old_version.lv2/meson.build | 22 +++++++++------- test/test_plugin.lv2/meson.build | 22 +++++++++------- 13 files changed, 271 insertions(+), 181 deletions(-) (limited to 'test') diff --git a/test/bad_syntax.lv2/meson.build b/test/bad_syntax.lv2/meson.build index 0f7d77e..dbda502 100644 --- a/test/bad_syntax.lv2/meson.build +++ b/test/bad_syntax.lv2/meson.build @@ -1,28 +1,36 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('bad_syntax', - files('bad_syntax.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'bad_syntax', + files('bad_syntax.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'bad_syntax.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + configuration: config, + input: files(f + '.in'), + output: f, + ) endforeach -test('bad_syntax', - executable('test_bad_syntax', - files('test_bad_syntax.c'), - c_args: c_suppressions + test_args, - dependencies: [lv2_dep, lilv_static_dep]), - args: [meson.current_build_dir() / ''], - suite: 'plugin') +test( + 'bad_syntax', + executable( + 'test_bad_syntax', + files('test_bad_syntax.c'), + c_args: c_suppressions + test_args, + dependencies: [lv2_dep, lilv_static_dep], + ), + args: [meson.current_build_dir() / ''], + suite: 'plugin', +) diff --git a/test/failed_instantiation.lv2/meson.build b/test/failed_instantiation.lv2/meson.build index cac8575..966eed0 100644 --- a/test/failed_instantiation.lv2/meson.build +++ b/test/failed_instantiation.lv2/meson.build @@ -1,28 +1,36 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('failed_instantiation', - files('failed_instantiation.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'failed_instantiation', + files('failed_instantiation.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'failed_instantiation.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + configuration: config, + input: files(f + '.in'), + output: f, + ) endforeach -test('failed_instantiation', - executable('test_failed_instantiation', - files('test_failed_instantiation.c'), - c_args: c_suppressions + test_args, - dependencies: [lv2_dep, lilv_static_dep]), - args: [meson.current_build_dir() / ''], - suite: 'plugin') +test( + 'failed_instantiation', + executable( + 'test_failed_instantiation', + files('test_failed_instantiation.c'), + c_args: c_suppressions + test_args, + dependencies: [lv2_dep, lilv_static_dep], + ), + args: [meson.current_build_dir() / ''], + suite: 'plugin', +) diff --git a/test/failed_lib_descriptor.lv2/meson.build b/test/failed_lib_descriptor.lv2/meson.build index e742dff..61de196 100644 --- a/test/failed_lib_descriptor.lv2/meson.build +++ b/test/failed_lib_descriptor.lv2/meson.build @@ -1,28 +1,36 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('failed_lib_descriptor', - files('failed_lib_descriptor.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'failed_lib_descriptor', + files('failed_lib_descriptor.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'failed_lib_descriptor.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + input: files(f + '.in'), + output: f, + configuration: config, + ) endforeach -test('failed_lib_descriptor', - executable('test_failed_lib_descriptor', - files('test_failed_lib_descriptor.c'), - c_args: c_suppressions + test_args, - dependencies: [lv2_dep, lilv_static_dep]), - args: [meson.current_build_dir() / ''], - suite: 'plugin') +test( + 'failed_lib_descriptor', + executable( + 'test_failed_lib_descriptor', + files('test_failed_lib_descriptor.c'), + c_args: c_suppressions + test_args, + dependencies: [lv2_dep, lilv_static_dep], + ), + args: [meson.current_build_dir() / ''], + suite: 'plugin', +) diff --git a/test/lib_descriptor.lv2/meson.build b/test/lib_descriptor.lv2/meson.build index f2c3439..ea29b6a 100644 --- a/test/lib_descriptor.lv2/meson.build +++ b/test/lib_descriptor.lv2/meson.build @@ -1,28 +1,36 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('lib_descriptor', - files('lib_descriptor.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'lib_descriptor', + files('lib_descriptor.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'lib_descriptor.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + input: files(f + '.in'), + output: f, + configuration: config, + ) endforeach -test('lib_descriptor', - executable('test_lib_descriptor', - files('test_lib_descriptor.c'), - c_args: c_suppressions + test_args, - dependencies: [lv2_dep, lilv_static_dep]), - args: [meson.current_build_dir() / ''], - suite: 'plugin') +test( + 'lib_descriptor', + executable( + 'test_lib_descriptor', + files('test_lib_descriptor.c'), + c_args: c_suppressions + test_args, + dependencies: [lv2_dep, lilv_static_dep], + ), + args: [meson.current_build_dir() / ''], + suite: 'plugin', +) diff --git a/test/meson.build b/test/meson.build index a8fe184..665b08f 100644 --- a/test/meson.build +++ b/test/meson.build @@ -17,9 +17,11 @@ if get_option('strict') # Check licensing metadata reuse = find_program('reuse', required: false) if reuse.found() - test('REUSE', reuse, - args: ['--root', lilv_src_root, 'lint'], - suite: 'data') + test( + 'REUSE', reuse, + args: ['--root', lilv_src_root, 'lint'], + suite: 'data', + ) endif endif @@ -88,11 +90,15 @@ define_args = [ ] foreach unit : unit_tests - test(unit, - executable('test_@0@'.format(unit), - files('lilv_test_utils.c', 'test_@0@.c'.format(unit)), - c_args: define_args + test_args + c_suppressions, - include_directories: include_directories('../src'), - dependencies: [lv2_dep, lilv_static_dep]), - suite: 'unit') + test( + unit, + executable( + 'test_@0@'.format(unit), + files('lilv_test_utils.c', 'test_@0@.c'.format(unit)), + c_args: define_args + test_args + c_suppressions, + include_directories: include_directories('../src'), + dependencies: [lv2_dep, lilv_static_dep], + ), + suite: 'unit', + ) endforeach diff --git a/test/missing_descriptor.lv2/meson.build b/test/missing_descriptor.lv2/meson.build index c1a55de..b4ad32f 100644 --- a/test/missing_descriptor.lv2/meson.build +++ b/test/missing_descriptor.lv2/meson.build @@ -1,28 +1,36 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('missing_descriptor', - files('missing_descriptor.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'missing_descriptor', + files('missing_descriptor.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'missing_descriptor.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + input: files(f + '.in'), + output: f, + configuration: config, + ) endforeach -test('missing_descriptor', - executable('test_missing_descriptor', - files('test_missing_descriptor.c'), - c_args: c_suppressions + test_args, - dependencies: [lv2_dep, lilv_static_dep]), - args: [meson.current_build_dir() / ''], - suite: 'plugin') +test( + 'missing_descriptor', + executable( + 'test_missing_descriptor', + files('test_missing_descriptor.c'), + c_args: c_suppressions + test_args, + dependencies: [lv2_dep, lilv_static_dep], + ), + args: [meson.current_build_dir() / ''], + suite: 'plugin', +) diff --git a/test/missing_name.lv2/meson.build b/test/missing_name.lv2/meson.build index 42d9856..c32cbb5 100644 --- a/test/missing_name.lv2/meson.build +++ b/test/missing_name.lv2/meson.build @@ -1,28 +1,36 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('missing_name', - files('missing_name.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'missing_name', + files('missing_name.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'missing_name.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + input: files(f + '.in'), + output: f, + configuration: config, + ) endforeach -test('missing_name', - executable('test_missing_name', - files('test_missing_name.c'), - c_args: c_suppressions + test_args, - dependencies: [lv2_dep, lilv_static_dep]), - args: [meson.current_build_dir() / ''], - suite: 'plugin') +test( + 'missing_name', + executable( + 'test_missing_name', + files('test_missing_name.c'), + c_args: c_suppressions + test_args, + dependencies: [lv2_dep, lilv_static_dep], + ), + args: [meson.current_build_dir() / ''], + suite: 'plugin', +) diff --git a/test/missing_plugin.lv2/meson.build b/test/missing_plugin.lv2/meson.build index 9a7068e..b5819ff 100644 --- a/test/missing_plugin.lv2/meson.build +++ b/test/missing_plugin.lv2/meson.build @@ -1,28 +1,36 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('missing_plugin', - files('missing_plugin.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'missing_plugin', + files('missing_plugin.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'missing_plugin.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + input: files(f + '.in'), + output: f, + configuration: config, + ) endforeach -test('missing_plugin', - executable('test_missing_plugin', - files('test_missing_plugin.c'), - c_args: c_suppressions + test_args, - dependencies: [lv2_dep, lilv_static_dep]), - args: [meson.current_build_dir() / ''], - suite: 'plugin') +test( + 'missing_plugin', + executable( + 'test_missing_plugin', + files('test_missing_plugin.c'), + c_args: c_suppressions + test_args, + dependencies: [lv2_dep, lilv_static_dep], + ), + args: [meson.current_build_dir() / ''], + suite: 'plugin', +) diff --git a/test/missing_port.lv2/meson.build b/test/missing_port.lv2/meson.build index e943688..f6138d8 100644 --- a/test/missing_port.lv2/meson.build +++ b/test/missing_port.lv2/meson.build @@ -1,28 +1,36 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('missing_port', - files('missing_port.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'missing_port', + files('missing_port.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'missing_port.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + input: files(f + '.in'), + output: f, + configuration: config, + ) endforeach -test('missing_port', - executable('test_missing_port', - files('test_missing_port.c'), - c_args: c_suppressions + test_args, - dependencies: [lv2_dep, lilv_static_dep]), - args: [meson.current_build_dir() / ''], - suite: 'plugin') +test( + 'missing_port', + executable( + 'test_missing_port', + files('test_missing_port.c'), + c_args: c_suppressions + test_args, + dependencies: [lv2_dep, lilv_static_dep], + ), + args: [meson.current_build_dir() / ''], + suite: 'plugin', +) diff --git a/test/missing_port_name.lv2/meson.build b/test/missing_port_name.lv2/meson.build index 567d25d..3bddcee 100644 --- a/test/missing_port_name.lv2/meson.build +++ b/test/missing_port_name.lv2/meson.build @@ -1,28 +1,36 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('missing_port_name', - files('missing_port_name.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'missing_port_name', + files('missing_port_name.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'missing_port_name.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + input: files(f + '.in'), + output: f, + configuration: config, + ) endforeach -test('missing_port_name', - executable('test_missing_port_name', - files('test_missing_port_name.c'), - c_args: c_suppressions + test_args, - dependencies: [lv2_dep, lilv_static_dep]), - args: [meson.current_build_dir() / ''], - suite: 'plugin') +test( + 'missing_port_name', + executable( + 'test_missing_port_name', + files('test_missing_port_name.c'), + c_args: c_suppressions + test_args, + dependencies: [lv2_dep, lilv_static_dep], + ), + args: [meson.current_build_dir() / ''], + suite: 'plugin', +) diff --git a/test/new_version.lv2/meson.build b/test/new_version.lv2/meson.build index bc7c817..bd90443 100644 --- a/test/new_version.lv2/meson.build +++ b/test/new_version.lv2/meson.build @@ -1,20 +1,24 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('new_version', - files('new_version.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'new_version', + files('new_version.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'new_version.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + input: files(f + '.in'), + output: f, + configuration: config, + ) endforeach diff --git a/test/old_version.lv2/meson.build b/test/old_version.lv2/meson.build index a9d42dc..09434b1 100644 --- a/test/old_version.lv2/meson.build +++ b/test/old_version.lv2/meson.build @@ -1,20 +1,24 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('old_version', - files('old_version.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'old_version', + files('old_version.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'old_version.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + input: files(f + '.in'), + output: f, + configuration: config, + ) endforeach diff --git a/test/test_plugin.lv2/meson.build b/test/test_plugin.lv2/meson.build index fa25476..9b74245 100644 --- a/test/test_plugin.lv2/meson.build +++ b/test/test_plugin.lv2/meson.build @@ -1,20 +1,24 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: 0BSD OR ISC -module = shared_module('test_plugin', - files('test_plugin.c'), - c_args: c_suppressions, - dependencies: lv2_dep, - gnu_symbol_visibility: 'hidden', - name_prefix: '') +module = shared_module( + 'test_plugin', + files('test_plugin.c'), + c_args: c_suppressions, + dependencies: lv2_dep, + gnu_symbol_visibility: 'hidden', + name_prefix: '', +) extension = '.' + module.full_path().split('.')[-1] config = configuration_data({'SHLIB_EXT': extension}) ttl_files = ['manifest.ttl', 'test_plugin.ttl'] foreach f : ttl_files - configure_file(input: files(f + '.in'), - output: f, - configuration: config) + configure_file( + input: files(f + '.in'), + output: f, + configuration: config, + ) endforeach -- cgit v1.2.1