[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] tests/qemu-iotests/meson.build: Improve the indentation
From: |
Thomas Huth |
Subject: |
[PATCH 2/6] tests/qemu-iotests/meson.build: Improve the indentation |
Date: |
Tue, 8 Feb 2022 11:13:07 +0100 |
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.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/meson.build | 61 ++++++++++++++++++----------------
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
index 5be3c74127..e1832c90e0 100644
--- a/tests/qemu-iotests/meson.build
+++ b/tests/qemu-iotests/meson.build
@@ -1,30 +1,33 @@
-if have_tools and targetos != 'windows'
- 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'
+ 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
--
2.27.0
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, (continued)
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, Thomas Huth, 2022/02/08
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, Hanna Reitz, 2022/02/08
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, Thomas Huth, 2022/02/08
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, Philippe Mathieu-Daudé, 2022/02/08
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, Thomas Huth, 2022/02/08
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, Eric Blake, 2022/02/11
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, Thomas Huth, 2022/02/11
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, Thomas Huth, 2022/02/15
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, Daniel P . Berrangé, 2022/02/15
- Re: [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed, Thomas Huth, 2022/02/15
[PATCH 2/6] tests/qemu-iotests/meson.build: Improve the indentation,
Thomas Huth <=
[PATCH 3/6] tests/qemu-iotests: Allow to run "./check -n" from the source directory, too, Thomas Huth, 2022/02/08
[PATCH 5/6] tests: Do not treat the iotests as separate meson test target anymore, Thomas Huth, 2022/02/08
[PATCH 6/6] tests: Remove check-block.sh, Thomas Huth, 2022/02/08