[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/14] qemu-iotests: require at least an argument to check-block.s
From: |
Paolo Bonzini |
Subject: |
[PULL 11/14] qemu-iotests: require at least an argument to check-block.sh |
Date: |
Thu, 27 Jan 2022 12:10:34 +0100 |
This is anyway how check-block.sh is used in practice, and by removing the
list of formats in the script we avoid duplication between meson.build
and check-block.sh.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/check-block.sh | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/tests/check-block.sh b/tests/check-block.sh
index 9afeea5275..88e02453d2 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -1,19 +1,16 @@
#!/bin/sh
-# Honor the SPEED environment variable, just like we do it for "meson test"
-if [ "$SPEED" = "slow" ]; then
- format_list="raw qcow2"
- group=
-elif [ "$SPEED" = "thorough" ]; then
- format_list="raw qcow2 qed vmdk vpc"
- group=
-else
- format_list=qcow2
- group="-g auto"
+if [ "$#" -eq 0 ]; then
+ echo "Usage: $0 fmt..." >&2
+ exit 99
fi
-if [ "$#" -ne 0 ]; then
- format_list="$@"
+# Honor the SPEED environment variable, just like we do it for "meson test"
+format_list="$@"
+if [ "$SPEED" = "slow" ] || [ "$SPEED" = "thorough" ]; then
+ group=
+else
+ group="-g auto"
fi
skip() {
--
2.34.1
- [PULL 00/14] Misc patches for 2022-01-27, Paolo Bonzini, 2022/01/27
- [PULL 12/14] check-block: replace -makecheck with TAP output, Paolo Bonzini, 2022/01/27
- [PULL 06/14] exec/cpu: Make host pages variables / macros 'target agnostic', Paolo Bonzini, 2022/01/27
- [PULL 07/14] meson: Use find_program() to resolve the entitlement.sh script, Paolo Bonzini, 2022/01/27
- [PULL 04/14] intc: Unexport InterruptStatsProviderClass-related functions, Paolo Bonzini, 2022/01/27
- [PULL 01/14] build-sys: fix a meson deprecation warning, Paolo Bonzini, 2022/01/27
- [PULL 02/14] build-sys: fix undefined ARCH error, Paolo Bonzini, 2022/01/27
- [PULL 10/14] build: make check-block a meson test, Paolo Bonzini, 2022/01/27
- [PULL 13/14] qapi: Cleanup SGX related comments and restore @section-size, Paolo Bonzini, 2022/01/27
- [PULL 05/14] meson.build: Use a function from libfdt 1.5.1 for the library check, Paolo Bonzini, 2022/01/27
- [PULL 11/14] qemu-iotests: require at least an argument to check-block.sh,
Paolo Bonzini <=
- [PULL 03/14] docker: add msitools to Fedora/mingw cross, Paolo Bonzini, 2022/01/27
- [PULL 08/14] check-block.sh: passthrough -jN flag of make to -j N flag of check, Paolo Bonzini, 2022/01/27
- [PULL 09/14] scripts/mtest2make: add support for SPEED=thorough, Paolo Bonzini, 2022/01/27
- [PULL 14/14] configure: fix parameter expansion of --cross-cc-cflags options, Paolo Bonzini, 2022/01/27
- Re: [PULL 00/14] Misc patches for 2022-01-27, Peter Maydell, 2022/01/27