From: Thomas Huth <thuth@redhat.com>
To: qemu-block@nongnu.org, Hanna Reitz <hreitz@redhat.com>,
Kevin Wolf <kwolf@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Subject: [PATCH 6/6] tests: Remove check-block.sh
Date: Tue, 8 Feb 2022 11:13:11 +0100 [thread overview]
Message-ID: <20220208101311.1511083-7-thuth@redhat.com> (raw)
In-Reply-To: <20220208101311.1511083-1-thuth@redhat.com>
Now that the iotests are added by the meson.build file already,
we do not need the check-block.sh wrapper script anymore.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/check-block.sh | 73 --------------------------------------------
1 file changed, 73 deletions(-)
delete mode 100755 tests/check-block.sh
diff --git a/tests/check-block.sh b/tests/check-block.sh
deleted file mode 100755
index af0c574812..0000000000
--- a/tests/check-block.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-if [ "$#" -eq 0 ]; then
- echo "Usage: $0 fmt..." >&2
- exit 99
-fi
-
-# 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() {
- echo "1..0 #SKIP $*"
- exit 0
-}
-
-if grep -q "CONFIG_GPROF=y" config-host.mak 2>/dev/null ; then
- skip "GPROF is enabled ==> Not running the qemu-iotests."
-fi
-
-# Disable tests with any sanitizer except for specific ones
-SANITIZE_FLAGS=$( grep "CFLAGS.*-fsanitize" config-host.mak 2>/dev/null )
-ALLOWED_SANITIZE_FLAGS="safe-stack cfi-icall"
-#Remove all occurrencies of allowed Sanitize flags
-for j in ${ALLOWED_SANITIZE_FLAGS}; do
- TMP_FLAGS=${SANITIZE_FLAGS}
- SANITIZE_FLAGS=""
- for i in ${TMP_FLAGS}; do
- if ! echo ${i} | grep -q "${j}" 2>/dev/null; then
- SANITIZE_FLAGS="${SANITIZE_FLAGS} ${i}"
- fi
- done
-done
-if echo ${SANITIZE_FLAGS} | grep -q "\-fsanitize" 2>/dev/null; then
- # Have a sanitize flag that is not allowed, stop
- skip "Sanitizers are enabled ==> Not running the qemu-iotests."
-fi
-
-if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
- skip "No qemu-system binary available ==> Not running the qemu-iotests."
-fi
-
-if ! command -v bash >/dev/null 2>&1 ; then
- skip "bash not available ==> Not running the qemu-iotests."
-fi
-
-if LANG=C bash --version | grep -q 'GNU bash, version [123]' ; then
- skip "bash version too old ==> Not running the qemu-iotests."
-fi
-
-cd tests/qemu-iotests
-
-# QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests
-export QEMU_CHECK_BLOCK_AUTO=1
-export PYTHONUTF8=1
-# If make was called with -jN we want to call ./check with -j N. Extract the
-# flag from MAKEFLAGS, so that if it absent (or MAKEFLAGS is not defined), JOBS
-# would be an empty line otherwise JOBS is prepared string of flag with value:
-# "-j N"
-# Note, that the following works even if make was called with "-j N" or even
-# "--jobs N", as all these variants becomes simply "-jN" in MAKEFLAGS variable.
-JOBS=$(echo "$MAKEFLAGS" | sed -n 's/\(^\|.* \)-j\([0-9]\+\)\( .*\|$\)/-j \2/p')
-
-ret=0
-for fmt in $format_list ; do
- ${PYTHON} ./check $JOBS -tap -$fmt $group || ret=1
-done
-
-exit $ret
--
2.27.0
prev parent reply other threads:[~2022-02-08 10:51 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-08 10:13 [PATCH 0/6] Improve integration of iotests in the meson test harness Thomas Huth
2022-02-08 10:13 ` [PATCH 1/6] tests/qemu-iotests: Improve the check for GNU sed Thomas Huth
2022-02-08 11:46 ` Hanna Reitz
2022-02-08 12:13 ` Thomas Huth
2022-02-08 12:28 ` Hanna Reitz
2022-02-08 12:38 ` Thomas Huth
2022-02-08 13:11 ` Philippe Mathieu-Daudé via
2022-02-08 14:52 ` Thomas Huth
2022-02-11 16:14 ` Eric Blake
2022-02-11 16:48 ` Thomas Huth
2022-02-15 13:28 ` Thomas Huth
2022-02-15 13:51 ` Daniel P. Berrangé
2022-02-15 16:09 ` Thomas Huth
2022-02-08 10:13 ` [PATCH 2/6] tests/qemu-iotests/meson.build: Improve the indentation Thomas Huth
2022-02-08 10:51 ` Philippe Mathieu-Daudé via
2022-02-08 12:00 ` Hanna Reitz
2022-02-08 10:13 ` [PATCH 3/6] tests/qemu-iotests: Allow to run "./check -n" from the source directory, too Thomas Huth
2022-02-08 12:26 ` Hanna Reitz
2022-02-08 10:13 ` [PATCH 4/6] tests/qemu-iotests/meson.build: Call the 'check' script directly Thomas Huth
2022-02-08 12:36 ` Paolo Bonzini
2022-02-08 15:10 ` Thomas Huth
2022-02-08 16:19 ` Paolo Bonzini
2022-02-08 13:12 ` Hanna Reitz
2022-02-08 15:46 ` Thomas Huth
2022-02-08 10:13 ` [PATCH 5/6] tests: Do not treat the iotests as separate meson test target anymore Thomas Huth
2022-02-08 10:26 ` Peter Maydell
2022-02-08 11:16 ` Thomas Huth
2022-02-08 11:33 ` Peter Maydell
2022-02-08 12:37 ` Paolo Bonzini
2022-02-08 10:13 ` Thomas Huth [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220208101311.1511083-7-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).