We add possibility to declare cflags for a given test. Since we want to preserve the uniqueness of test binaries, we prevent repeating those cflags later, for an existing binary.
This ensures one executable == one set of cflags, and if dev needs duplication, they can use a custom 'exe_name' to override this. Reviewed-by: Manos Pitsidianakis <[email protected]> Tested-by: Alex Bennée <[email protected]> Signed-off-by: Pierrick Bouvier <[email protected]> --- tests/tcg/meson.build | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index ae7ec998f63..e8d8cfbcf88 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -13,6 +13,7 @@ tcg_tests = {} # 'src_file': { # 'exe_name': ['provide an alternative binary name'], # 'test_name': ['provide an alternative test name'], +# 'cflags': ['additional cflags to compile test', ...], # } # }, # ... @@ -20,7 +21,8 @@ tcg_tests = {} # } # } # -# Every test executable, identified by 'exe_name' is built only once. +# Every test executable, identified by 'exe_name' is built only once, and we +# ensure cflags are specified only once, on first declaration. # Tests for a given src use the same executable by default, and their definition # is guaranteed to be unique also. Several tests for the same executable can # declared using 'test_name'. @@ -54,7 +56,7 @@ foreach target, plan: tcg_tests foreach src, setup: t # return a clear error if user misspell a setup entry foreach key, _ : setup - allowed = ['exe_name', 'test_name'] + allowed = ['exe_name', 'cflags', 'test_name'] if key not in allowed error('unknown tcg setup entry \'' + key + '\' for test ' + src + ' (possible: [' + ', '.join(allowed) + '])') @@ -82,6 +84,15 @@ foreach target, plan: tcg_tests 'specify a different \'test_name\'') endif + cflags = [] + if 'cflags' in setup + if exe_name in built_tests + error('test ' + exe_name + ' was already built with cflags: ' + + 'remove cflags or set \'exe_name\' (if cflags are different)') + endif + cflags = setup['cflags'] + endif + # build executable if needed if exe_name not in built_tests exe = custom_target(exe_name, @@ -91,7 +102,7 @@ foreach target, plan: tcg_tests '-MMD', '-MF', '@DEPFILE@', '-Wall', '-Werror', '-O0', '-g', '-fno-strict-aliasing', - ], + cflags], depfile: exe_name + '.d', output: exe_name + '.test', build_by_default: false) -- 2.47.3
