tests/qemu-iotests/meson.build: Improve the indentation

By using subdir_done(), we can get rid of one level of indentation
in this file. This will make it easier to add more conditions to
skip the iotests in future patches.

Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220223093840.2515281-3-thuth@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Thomas Huth 2022-02-23 10:38:38 +01:00 committed by Hanna Reitz
parent 1be5a765c0
commit f1f8af238b

View file

@ -1,20 +1,24 @@
if have_tools and targetos != 'windows' and not get_option('gprof') if not have_tools or targetos == 'windows' or get_option('gprof')
qemu_iotests_binaries = [qemu_img, qemu_io, qemu_nbd, qsd] subdir_done()
qemu_iotests_env = {'PYTHON': python.full_path()} endif
qemu_iotests_formats = {
qemu_iotests_binaries = [qemu_img, qemu_io, qemu_nbd, qsd]
qemu_iotests_env = {'PYTHON': python.full_path()}
qemu_iotests_formats = {
'qcow2': 'quick', 'qcow2': 'quick',
'raw': 'slow', 'raw': 'slow',
'qed': 'thorough', 'qed': 'thorough',
'vmdk': 'thorough', 'vmdk': 'thorough',
'vpc': 'thorough' 'vpc': 'thorough'
} }
foreach k, v : emulators foreach k, v : emulators
if k.startswith('qemu-system-') if k.startswith('qemu-system-')
qemu_iotests_binaries += v qemu_iotests_binaries += v
endif endif
endforeach endforeach
foreach format, speed: qemu_iotests_formats
foreach format, speed: qemu_iotests_formats
if speed == 'quick' if speed == 'quick'
suites = 'block' suites = 'block'
else else
@ -26,5 +30,4 @@ if have_tools and targetos != 'windows' and not get_option('gprof')
suite: suites, suite: suites,
timeout: 0, timeout: 0,
is_parallel: false) is_parallel: false)
endforeach endforeach
endif