aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2022-02-23 10:38:38 +0100
committerHanna Reitz <hreitz@redhat.com>2022-04-20 09:46:54 +0200
commitf1f8af238bd08cefbfddfb5675d469a998b2f03f (patch)
treefc9b912c9a97d961d48665068d74d3f5003bffc0
parent1be5a765c08cee3a9587c8a8d3fc2ea247b13f9c (diff)
downloadqemu-f1f8af238bd08cefbfddfb5675d469a998b2f03f.zip
qemu-f1f8af238bd08cefbfddfb5675d469a998b2f03f.tar.gz
qemu-f1f8af238bd08cefbfddfb5675d469a998b2f03f.tar.bz2
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>
-rw-r--r--tests/qemu-iotests/meson.build61
1 files changed, 32 insertions, 29 deletions
diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
index 9747bb6..92f0925 100644
--- a/tests/qemu-iotests/meson.build
+++ b/tests/qemu-iotests/meson.build
@@ -1,30 +1,33 @@
-if have_tools and targetos != 'windows' and not get_option('gprof')
- qemu_iotests_binaries = [qemu_img, qemu_io, qemu_nbd, qsd]
- qemu_iotests_env = {'PYTHON': python.full_path()}
- qemu_iotests_formats = {
- 'qcow2': 'quick',
- 'raw': 'slow',
- 'qed': 'thorough',
- 'vmdk': 'thorough',
- 'vpc': 'thorough'
- }
-
- foreach k, v : emulators
- if k.startswith('qemu-system-')
- qemu_iotests_binaries += v
- endif
- endforeach
- foreach format, speed: qemu_iotests_formats
- if speed == 'quick'
- suites = 'block'
- else
- suites = ['block-' + speed, speed]
- endif
- test('qemu-iotests ' + format, sh, args: [files('../check-block.sh'), format],
- depends: qemu_iotests_binaries, env: qemu_iotests_env,
- protocol: 'tap',
- suite: suites,
- timeout: 0,
- is_parallel: false)
- endforeach
+if not have_tools or targetos == 'windows' or get_option('gprof')
+ subdir_done()
endif
+
+qemu_iotests_binaries = [qemu_img, qemu_io, qemu_nbd, qsd]
+qemu_iotests_env = {'PYTHON': python.full_path()}
+qemu_iotests_formats = {
+ 'qcow2': 'quick',
+ 'raw': 'slow',
+ 'qed': 'thorough',
+ 'vmdk': 'thorough',
+ 'vpc': 'thorough'
+}
+
+foreach k, v : emulators
+ if k.startswith('qemu-system-')
+ qemu_iotests_binaries += v
+ endif
+endforeach
+
+foreach format, speed: qemu_iotests_formats
+ if speed == 'quick'
+ suites = 'block'
+ else
+ suites = ['block-' + speed, speed]
+ endif
+ test('qemu-iotests ' + format, sh, args: [files('../check-block.sh'), format],
+ depends: qemu_iotests_binaries, env: qemu_iotests_env,
+ protocol: 'tap',
+ suite: suites,
+ timeout: 0,
+ is_parallel: false)
+endforeach