qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Kevin Wolf <kwolf@redhat.com>
Cc: qemu-block@nongnu.org
Subject: [PATCH v5 5/6] iotests: Skip Python-based tests if QEMU does not support virtio-blk
Date: Tue, 21 Jan 2020 10:52:04 +0100	[thread overview]
Message-ID: <20200121095205.26323-6-thuth@redhat.com> (raw)
In-Reply-To: <20200121095205.26323-1-thuth@redhat.com>

We are going to enable some of the python-based tests in the "auto" group,
and these tests require virtio-blk to work properly. Running iotests
without virtio-blk likely does not make too much sense anyway, so instead
of adding a check for the availability of virtio-blk to each and every
test (which does not sound very appealing), let's rather add a check for
this a central spot in the "check" script instead (so that it is still
possible to run "make check" for qemu-system-tricore for example).

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/check | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 2890785a10..1629b6c914 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -642,7 +642,15 @@ fi
 python_usable=false
 if $PYTHON -c 'import sys; sys.exit(0 if sys.version_info >= (3,6) else 1)'
 then
-    python_usable=true
+    # Our python framework also requires virtio-blk
+    if "$QEMU_PROG" -M none -device help | grep -q virtio-blk >/dev/null 2>&1
+    then
+        python_usable=true
+    else
+        python_unusable_because="Missing virtio-blk in QEMU binary"
+    fi
+else
+    python_unusable_because="Unsupported Python version"
 fi
 
 default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p')
@@ -830,7 +838,7 @@ do
                 run_command="$PYTHON $seq"
             else
                 run_command="false"
-                echo "Unsupported Python version" > $seq.notrun
+                echo "$python_unusable_because" > $seq.notrun
             fi
         else
             run_command="./$seq"
-- 
2.18.1



  parent reply	other threads:[~2020-01-21  9:57 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-21  9:51 [PATCH v5 0/6] Enable more iotests during "make check-block" Thomas Huth
2020-01-21  9:52 ` [PATCH v5 1/6] iotests: remove 'linux' from default supported platforms Thomas Huth
2020-01-21  9:52 ` [PATCH v5 2/6] iotests: Test 041 only works on certain systems Thomas Huth
2020-01-21  9:52 ` [PATCH v5 3/6] iotests: Test 183 does not work on macOS and OpenBSD Thomas Huth
2020-01-21  9:52 ` [PATCH v5 4/6] iotests: Check for the availability of the required devices in 267 and 127 Thomas Huth
2020-01-21  9:52 ` Thomas Huth [this message]
2020-01-30 22:31   ` [PATCH v5 5/6] iotests: Skip Python-based tests if QEMU does not support virtio-blk Philippe Mathieu-Daudé
2020-01-31  7:08     ` Thomas Huth
2020-01-31 14:34       ` Philippe Mathieu-Daudé
2020-01-21  9:52 ` [PATCH v5 6/6] iotests: Enable more tests in the 'auto' group to improve test coverage Thomas Huth
2020-01-21 10:34 ` [PATCH v5 0/6] Enable more iotests during "make check-block" Max Reitz

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=20200121095205.26323-6-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@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).