From nobody Sun Feb 8 22:34:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570805644; cv=none; d=zoho.com; s=zohoarc; b=Stqx4rXRiDukJnitdic1SptorXB2QOk/hKAA8befU0NqrznjvGfnUBI3SQMm8qtgJV6cv3exyHy2BbvUKLd3osfdtab7v4+lBvlvJGEG+N9Rj9tTFgUaXJPXjP3tR0hzTrA5/XmRxIHsNdJZ2YtycSnpYlvOQAcKm/rwOSv2ZWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570805644; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Hgc+emI3ot2vdKSyX4dsSzBQt6zrusqry3xwLkbfKAI=; b=Wqcwj9WprU4yfQirTziYKU0+cDJCH2fW4xynyep/pNFXhu+ibh1XIicyQIVK9vReNqrxJdROCNabtST3J4VVoR4l7Q2TQ1AdXFcuhGQj2CIgMSLFgRdacKmxXqPcH1XpFM3bMlWUgiG3lbHII4ht7iKOb6ysUSnsWNZaRyUCXEs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570805644039555.9927897696763; Fri, 11 Oct 2019 07:54:04 -0700 (PDT) Received: from localhost ([::1]:51668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwIr-0000eK-AN for importer@patchew.org; Fri, 11 Oct 2019 10:54:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50101) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwG4-0004xQ-5t for qemu-devel@nongnu.org; Fri, 11 Oct 2019 10:51:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIwG3-0007Fj-3C for qemu-devel@nongnu.org; Fri, 11 Oct 2019 10:51:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41564) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIwG0-0007CL-RS; Fri, 11 Oct 2019 10:51:04 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1BE7D3091761; Fri, 11 Oct 2019 14:51:04 +0000 (UTC) Received: from thuth.com (dhcp-200-228.str.redhat.com [10.33.200.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E31560468; Fri, 11 Oct 2019 14:51:02 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH 4/5] iotests: Skip "make check-block" if QEMU does not support virtio-blk Date: Fri, 11 Oct 2019 16:50:46 +0200 Message-Id: <20191011145047.19051-5-thuth@redhat.com> In-Reply-To: <20191011145047.19051-1-thuth@redhat.com> References: <20191011145047.19051-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 11 Oct 2019 14:51:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The next patch is going to add some python-based tests to 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 at the top level in the check-block.sh script instead (so that it is possible to run "make check" without the "check-block" part for qemu-system-tricore for example). Signed-off-by: Thomas Huth Reviewed-by: Max Reitz --- tests/check-block.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/check-block.sh b/tests/check-block.sh index 679aedec50..7582347ec2 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -26,10 +26,24 @@ if grep -q "CFLAGS.*-fsanitize" config-host.mak 2>/dev/= null ; then exit 0 fi =20 -if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then +if [ -n "$QEMU_PROG" ]; then + qemu_prog=3D"$QEMU_PROG" +else + for binary in *-softmmu/qemu-system-* ; do + if [ -x "$binary" ]; then + qemu_prog=3D"$binary" + break + fi + done +fi +if [ -z "$qemu_prog" ]; then echo "No qemu-system binary available =3D=3D> Not running the qemu-iot= ests." exit 0 fi +if ! "$qemu_prog" -M none -device help | grep virtio-blk >/dev/null 2>&1 ;= then + echo "$qemu_prog does not support virtio-blk =3D=3D> Not running the q= emu-iotests." + exit 0 +fi =20 if ! command -v bash >/dev/null 2>&1 ; then echo "bash not available =3D=3D> Not running the qemu-iotests." --=20 2.18.1