iotests: remove the check-block.sh script
Now that meson directly invokes the individual I/O tests, the check-block.sh wrapper script is no longer required. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Acked-by: Hanna Czenczek <hreitz@redhat.com> Tested-by: Thomas Huth <thuth@redhat.com> Message-Id: <20230303160727.3977246-9-berrange@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20230315174331.2959-26-alex.bennee@linaro.org>
This commit is contained in:
parent
51ab5f8bd7
commit
0d01a2f8a4
@ -1,43 +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 [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
|
||||
skip "No qemu-system binary available ==> 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
|
Loading…
Reference in New Issue
Block a user