We can now add multiarch system tests. Because of our policy to not repeat cflags, we must make sure we only add those once per executable.
Signed-off-by: Pierrick Bouvier <[email protected]> --- tests/tcg/aarch64/system/meson.build | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tests/tcg/aarch64/system/meson.build b/tests/tcg/aarch64/system/meson.build index a1edf1b8442..2a613cca52d 100644 --- a/tests/tcg/aarch64/system/meson.build +++ b/tests/tcg/aarch64/system/meson.build @@ -17,6 +17,32 @@ qemu_base_args = ['-display', 'none', '-kernel'] qemu_def_args = ['-M', 'virt', '-cpu', 'max', qemu_base_args] +# Multi arch tests - add cflags only once per src +multi_src = [] +foreach t: tcg_tests['multiarch-softmmu']['tests'] + foreach src, setup: t + new_cflags = cflags + if fs.stem(src) == 'memory' + new_cflags += '-DCHECK_UNALIGNED=1' + endif + if src not in multi_src + setup += {'cflags': [new_cflags]} + multi_src += src + endif + tests += {src: setup + {'qemu_args': qemu_def_args}} + endforeach +endforeach + +if cc_has_feat['sve'] + tests += { + '../../multiarch/system/memory.c': { + 'exe_name': 'memory-sve', + 'cflags': [cflags, feat_cflags['sve'], '-DCHECK_UNALIGNED=1', '-O3'], + 'qemu_args': qemu_def_args, + }, + } +endif + tests += { 'asid2.c': {'cflags': cflags, 'qemu_args': qemu_def_args}, 'feat-xs.c': {'cflags': cflags, 'qemu_args': qemu_def_args}, @@ -30,6 +56,11 @@ tests += { qemu_def_args], 'wrapper': [prog_run_with_input, 'X'] }, + '../../multiarch/system/memory.c': { + 'test_name': 'memory-record-replay', + 'qemu_args': qemu_def_args, + 'wrapper': [prog_record_replay], + }, 'vtimer.c': { 'cflags': cflags, 'qemu_args': ['-M', 'virt,virtualization=on,gic-version=2', -- 2.43.0
