From patchwork Tue Oct 22 19:17:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 177228 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp5313330ill; Tue, 22 Oct 2019 12:36:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqwdt+prx5Cccwp8r90VIxzrK2KhCsLkR1aiVkMc3A3QQ2zr9u0POuOh6iUQXldnfZ7dLBhD X-Received: by 2002:ac8:2c09:: with SMTP id d9mr5275276qta.381.1571773015652; Tue, 22 Oct 2019 12:36:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571773015; cv=none; d=google.com; s=arc-20160816; b=JS0Xzur2F35Ty1x40gFYKJlYtzg7xSp0l2ka0kj/HVMf0Qde6fio+j7A8m9d0LQwL3 0Jrx5PoKY4wS19h960j/9Pm1jSYiD7T4QtBi9fVf1+xS7x+9556C9JeHxoB9yGGHVnQd AQmJLFwhpnveUaT51RzRbg+rUtFWD7LBwVXZwkk7dZpianSx8RtStnVZwmGEga3oQP7A 1qw8IdOzEPu6H8meStnCZ2uxxUDS3wAjMGwF6goPp7W/4Qy6dy/OL5kXE2frbbbF2O0Q 79klB85jhnhsQxABhQWjOjwtwOzgIBblGn8CQZmRGQTGxUzGViAcQ5Ycd1HU4n5tmvt+ oczw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=LpJXKQKkVgScovOu0Bd6ZFI8XIdqfOawG4aSS/zoE0s=; b=PWmfdz9cx5mi77HN1eVkm9UODzFt7j+T9msVNimLQV+9v5yOx27GAJHKN3X75K46Q9 TFyuATXQdvHwvVBtoXxsGokZMsqcHqpvRfJoaoBOkhXQ2ZLlrKA5J30f/dVtb3V6hEQ1 XFuYFJP7MZU4engTcn7EV3T/wf9HVreDjvjPVhuV851PLWh4Mtqytd+bAI8scsal/Yjo jjn9UCR3/of44VxnL2jYeAjZQHBAbc5H+MgjXts94g6rTxtdDnemjxofeqz0KZSh1A3Y 9Pd4fskAf+EY00v5qlwr++gMry80MTV1SYamNoq7C+bTiZRc7bS2jO5jjkM6vmZiZyIZ RoEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iYQDLutP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u51si2416800qtc.23.2019.10.22.12.36.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2019 12:36:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iYQDLutP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMzxe-0007qS-Lh for patch@linaro.org; Tue, 22 Oct 2019 15:36:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37543) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMznV-0004xp-HA for qemu-devel@nongnu.org; Tue, 22 Oct 2019 15:26:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMznU-00027E-8f for qemu-devel@nongnu.org; Tue, 22 Oct 2019 15:26:25 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42496) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMznU-00026b-25 for qemu-devel@nongnu.org; Tue, 22 Oct 2019 15:26:24 -0400 Received: by mail-wr1-x441.google.com with SMTP id r1so9556404wrs.9 for ; Tue, 22 Oct 2019 12:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LpJXKQKkVgScovOu0Bd6ZFI8XIdqfOawG4aSS/zoE0s=; b=iYQDLutPJOnZIZm9HXBfzFWbYMMwMfh+V76yE/CiZawGqnveccxCJD0TBxpJP65OEX tj1VQH5X8JlMIeHUgNzx0s1SwhUFRDtMjgfLn3h2ICrpd+svQAWl4sy11S8qkWrT/ZSz vlSqxlrVnEMNBh9x05Fc7Mn/BzWbd9x1Z9dVZPt9gtvxwvCoOmUhJnGbK8NceijqMFlD g9U13z4VYC8/HLt8SKiQG9hObJ9cpD8/JipCc5XEaqHXV8MbVw5PmRk1usjxXic0BLj1 sEaWa29Cx+xJL9odLeBjpAGwFhNfkNBaastV4sUbeMEThNdLPbus4tedW7hzOLXAwm7a RMxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LpJXKQKkVgScovOu0Bd6ZFI8XIdqfOawG4aSS/zoE0s=; b=kCXigkhJjLX1saxU7c01LDzAGMNF1V7kk58fyw0ID21B2uxx7VoKhVf+lAnd1YfXY6 m7dvkT5KWm6Jn4XmDNo5LwiEEnHT2Zm+we5fpD9bsLW++S+fyXSO3NVQfZrrFstkBlL/ ULBC2N0/hKENZGTOoYdfVQphGllzx+jGDLyvnOB3egmEbwhbVqvIBG6G6f5DL+jLM3nz H+R4LzHINw0fSJqZXs9UACLUZPtEONG159eER7Na4X/gPXODW7Qphhuq/dE0syjqC8zQ yzwJMM80HgRygohXOVvwARXdpw92dTcgQH8hcC69siMjQOjK/hbETja4ekKoTEQ/+tQq Jy+A== X-Gm-Message-State: APjAAAVWNENvLFhLxtERHLbLUwOMxzUdG3En0WPlO6vjMeHgXuJX0h7B NeB//fk4FTeDWzOIgRglkgJbcQ== X-Received: by 2002:a05:6000:10d:: with SMTP id o13mr4737511wrx.321.1571772382945; Tue, 22 Oct 2019 12:26:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v20sm15804359wml.26.2019.10.22.12.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 12:26:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C64A11FFA5; Tue, 22 Oct 2019 20:17:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 17/19] iotests: Skip "make check-block" if QEMU does not support virtio-blk Date: Tue, 22 Oct 2019 20:17:02 +0100 Message-Id: <20191022191704.6134-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022191704.6134-1-alex.bennee@linaro.org> References: <20191022191704.6134-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, stefanb@linux.vnet.ibm.com, richard.henderson@linaro.org, f4bug@amsat.org, Max Reitz , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth 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). Reviewed-by: Max Reitz Signed-off-by: Thomas Huth Message-Id: <20191022072135.11188-5-thuth@redhat.com> --- tests/check-block.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/check-block.sh b/tests/check-block.sh index 679aedec50c..e9e2978818a 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 -if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then +if [ -n "$QEMU_PROG" ]; then + qemu_prog="$QEMU_PROG" +else + for binary in *-softmmu/qemu-system-* ; do + if [ -x "$binary" ]; then + qemu_prog="$binary" + break + fi + done +fi +if [ -z "$qemu_prog" ]; then echo "No qemu-system binary available ==> Not running the qemu-iotests." exit 0 fi +if ! "$qemu_prog" -M none -device help | grep -q virtio-blk >/dev/null 2>&1 ; then + echo "$qemu_prog does not support virtio-blk ==> Not running the qemu-iotests." + exit 0 +fi if ! command -v bash >/dev/null 2>&1 ; then echo "bash not available ==> Not running the qemu-iotests."