From nobody Sun May 19 02:26:39 2024 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=1570805553; cv=none; d=zoho.com; s=zohoarc; b=fLj1oaCiF4c7Wrjj/6d3FheNCwSwDelUEzLorgAHBA2jyVj2zcHFj/03k3UU9y4GwyuvtudFuXXqoLPO++Ai7fI23fkRJRL1wdXICgAoB6EzgJnsapKfp+qKVQsXp1pSdL+gCYo/8NTO2T/em++KpbnvMqeFK/BErRx5mS8rqIw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570805553; 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=0GKubTo1gjPNK3Z03vxaIu62t+3ArRcdKaZbyKmkNb4=; b=jn+FDcJ4sanrMi1q+Hn2MTc6WkQ71F09DkBoABCoqMgPbYndLDfkqJLdSmeh7EYgBuJFNj/fFtZRRZ5BSn6qWTBrQpros1uXQOHz5gxTEjU6vVk/DIFdF3hVqalyOBBv0Vb+O/EgieIKr3oEpFgDN7sLvMeasLcYHqXK+a+9dUA= 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 1570805553183456.3751274063436; Fri, 11 Oct 2019 07:52:33 -0700 (PDT) Received: from localhost ([::1]:51652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwHQ-0006f7-17 for importer@patchew.org; Fri, 11 Oct 2019 10:52:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50038) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwG2-0004tY-0Y for qemu-devel@nongnu.org; Fri, 11 Oct 2019 10:51:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIwG0-0007Cx-Sv for qemu-devel@nongnu.org; Fri, 11 Oct 2019 10:51:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49936) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIwFy-0007Ai-Ed; Fri, 11 Oct 2019 10:51:02 -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 2684518C8914; Fri, 11 Oct 2019 14:51:00 +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 EEAAB6012A; Fri, 11 Oct 2019 14:50:58 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH 1/5] iotests: remove 'linux' from default supported platforms Date: Fri, 11 Oct 2019 16:50:43 +0200 Message-Id: <20191011145047.19051-2-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.6.2 (mx1.redhat.com [10.5.110.70]); Fri, 11 Oct 2019 14:51:00 +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" From: John Snow verify_platform will check an explicit whitelist and blacklist instead. The default will now be assumed to be allowed to run anywhere. For tests that do not specify their platforms explicitly, this has the effe= ct of enabling these tests on non-linux platforms. For tests that always specified linux explicitly, there is no change. For Python tests on FreeBSD at least; only seven python tests fail: 045 147 149 169 194 199 211 045 and 149 appear to be misconfigurations, 147 and 194 are the AF_UNIX path too long error, 169 and 199 are bitmap migration bugs, and 211 is a bug that shows up on Linux platforms, too. This is at least good evidence that these tests are not Linux-only. If they aren't suitable for other platforms, they should be disabled on a per-platform basis as appropriate. Therefore, let's switch these on and deal with the failures. Signed-off-by: John Snow Reviewed-by: Max Reitz --- tests/qemu-iotests/iotests.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 66090b70c1..d7b9a6f3ef 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -844,9 +844,14 @@ def verify_protocol(supported=3D[], unsupported=3D[]): if not_sup or (imgproto in unsupported): notrun('not suitable for this protocol: %s' % imgproto) =20 -def verify_platform(supported_oses=3D['linux']): - if True not in [sys.platform.startswith(x) for x in supported_oses]: - notrun('not suitable for this OS: %s' % sys.platform) +def verify_platform(supported=3DNone, unsupported=3DNone): + if unsupported is not None: + if any((sys.platform.startswith(x) for x in unsupported)): + notrun('not suitable for this OS: %s' % sys.platform) + + if supported is not None: + if not any((sys.platform.startswith(x) for x in supported)): + notrun('not suitable for this OS: %s' % sys.platform) =20 def verify_cache_mode(supported_cache_modes=3D[]): if supported_cache_modes and (cachemode not in supported_cache_modes): @@ -908,7 +913,8 @@ def execute_unittest(output, verbosity, debug): r'Ran \1 tests', output.getvalue())) =20 def execute_test(test_function=3DNone, - supported_fmts=3D[], supported_oses=3D['linux'], + supported_fmts=3D[], + supported_platforms=3DNone, supported_cache_modes=3D[], unsupported_fmts=3D[], supported_protocols=3D[], unsupported_protocols=3D[]): """Run either unittest or script-style tests.""" @@ -925,7 +931,7 @@ def execute_test(test_function=3DNone, verbosity =3D 1 verify_image_format(supported_fmts, unsupported_fmts) verify_protocol(supported_protocols, unsupported_protocols) - verify_platform(supported_oses) + verify_platform(supported=3Dsupported_platforms) verify_cache_mode(supported_cache_modes) =20 if debug: --=20 2.18.1 From nobody Sun May 19 02:26:39 2024 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=1570805645; cv=none; d=zoho.com; s=zohoarc; b=Y0nrxEYAuGlaEoCGWF/daenUCLYs8A8Vl8LQCc57KG2yupKuHUZPlHZFgNzrKWJagIOjDyUcOuhXqokY0aCHdZw9HbMQRW0H1/CvvRy/MOLxF3WbPd31md89JXbqdCtOMFDbf5bphi6z6q75YLbxzR/2Af05tSrHw0GNGXpmg9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570805645; 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=J1gF9zVuYxaw86zSQspqmika1XzEZjZamUy7ptxrCMI=; b=Wao39vaZiIhlNAZr5im7Pv3rIukMcIriVeyjRjiT8oU7qwgSZFlk9sd4uNCoVa1Z6GIE6jWhA+5Al+EJNgIQdkSy/emuDSN2FmUqT9R9bIw0AYAU/RIPQk5ksZWiLmATiRm2btipaWF00Iaz8hrgOFh9+lNVl6TNt0DU9KcCK68= 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 15708056453661007.4329735449177; Fri, 11 Oct 2019 07:54:05 -0700 (PDT) Received: from localhost ([::1]:51672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwIq-0000gs-Mf for importer@patchew.org; Fri, 11 Oct 2019 10:54:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50039) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwG2-0004tc-1Z for qemu-devel@nongnu.org; Fri, 11 Oct 2019 10:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIwG0-0007CR-JQ for qemu-devel@nongnu.org; Fri, 11 Oct 2019 10:51:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54222) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIwFy-0007Az-7l; Fri, 11 Oct 2019 10:51:02 -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 7389B300CB26; Fri, 11 Oct 2019 14:51:01 +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 64E1F60468; Fri, 11 Oct 2019 14:51:00 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH 2/5] iotests: Test 041 does not work on macOS Date: Fri, 11 Oct 2019 16:50:44 +0200 Message-Id: <20191011145047.19051-3-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.46]); Fri, 11 Oct 2019 14:51:01 +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" 041 works fine on Linux, FreeBSD and OpenBSD, so let's mark it as only supported on these systems. Signed-off-by: Thomas Huth --- tests/qemu-iotests/041 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index 8568426311..7211f1950a 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -1123,4 +1123,5 @@ class TestOrphanedSource(iotests.QMPTestCase): =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2', 'qed'], - supported_protocols=3D['file']) + supported_protocols=3D['file'], + supported_platforms=3D['linux', 'freebsd', 'openbsd6']) --=20 2.18.1 From nobody Sun May 19 02:26:39 2024 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=1570805555; cv=none; d=zoho.com; s=zohoarc; b=Ve6C0cQVnwFoqvovyvYcXKT+F9EtCHOXepZrts7vPiRiaiQPF1auo0rplVf3uPM/qCqGdpmowJEisE9ALHThgCCFgocL1kd2NgteIKs4Bgx3JnNhH9Z8Gn0er2QJVlcjct8wkg9dOmoCMXWPn85SqoAd/DMuZy7EBGIRFCoXBZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570805555; 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=gqckJ89nRe+bW6eL4N8Z7GJK8XjYGvNDNsSJOTBV3FM=; b=QleS6jbY0rc6HhpHQS6x0eghXy0KVbktawopaNjsLA0BPE/lFbjx8Pjifpdoa/tgB6RgpZvOO7dmIXIOqPDGX8AZVH2TUiPyJ0x43lPY+5UPB3aomGQ/GUSP6BWSBeNwOd0qFCqyI/ptaAaJE0TKKgUoqw+grvwYyogec1r4lvo= 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 1570805555279156.80045960804284; Fri, 11 Oct 2019 07:52:35 -0700 (PDT) Received: from localhost ([::1]:51650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwHN-0006al-VG for importer@patchew.org; Fri, 11 Oct 2019 10:52:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50060) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwG2-0004uk-KD for qemu-devel@nongnu.org; Fri, 11 Oct 2019 10:51:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIwG1-0007Ec-Nf for qemu-devel@nongnu.org; Fri, 11 Oct 2019 10:51:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53448) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIwFz-0007Bm-Hl; Fri, 11 Oct 2019 10:51:03 -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 C03A07E421; Fri, 11 Oct 2019 14:51:02 +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 B4903601AF; Fri, 11 Oct 2019 14:51:01 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH 3/5] iotests: Test 183 does not work on macOS and OpenBSD Date: Fri, 11 Oct 2019 16:50:45 +0200 Message-Id: <20191011145047.19051-4-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.27]); Fri, 11 Oct 2019 14:51:02 +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" When running 183 in Cirrus-CI on macOS, or with our vm-build-openbsd target, it fails with an "Timeout waiting for return on handle 0" error. Let's mark it as supported only on systems where the test is working fine (i.e. Linux and FreeBSD). Signed-off-by: Thomas Huth --- tests/qemu-iotests/183 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index bced83fae0..feeadb74c8 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -42,6 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter . ./common.qemu =20 +_supported_os Linux FreeBSD _supported_fmt qcow2 raw qed quorum _supported_proto file =20 --=20 2.18.1 From nobody Sun May 19 02:26:39 2024 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 From nobody Sun May 19 02:26:39 2024 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=1570805709; cv=none; d=zoho.com; s=zohoarc; b=B2xhXlxRn4wft6TlpKMk6jAn5OdcgTGv0ktjvG64q4LmREXkqF1XjdzI/LotoRhwVOrw6SW8HjcT+5i2dinGrhLnaL/nTubp/XAkumiEy2txsTCIJI8uSXuC7T1iddFTworXqUQUPZ6UEbeUl2lz8amb+VCXm2xjjxCY9+jM31I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570805709; 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=noDixVL4HjvQ6R7XFJLkkcuE22m5Zjk7zmuynK0RCwU=; b=AIlZpEWl2UKHdRcxJmeoGguNyTAtOI0mdPCZctK0C5h7GSZZxONz1/+FKoOClNNj6kcbQJOLTjSgI48+uRO41r7rZTRfyy4680F5dUO+pHPTugDHGJnx8fUns3gEPu6oRfm25LLnFEH1FeKZ56ELzNvxDonCsvSMGodH7k8yGj8= 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 1570805709025628.6977147421294; Fri, 11 Oct 2019 07:55:09 -0700 (PDT) Received: from localhost ([::1]:51704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwJw-000243-0k for importer@patchew.org; Fri, 11 Oct 2019 10:55:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50114) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIwG6-000512-Ha for qemu-devel@nongnu.org; Fri, 11 Oct 2019 10:51:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIwG4-0007GG-EN for qemu-devel@nongnu.org; Fri, 11 Oct 2019 10:51:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60128) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIwG2-0007EG-6a; Fri, 11 Oct 2019 10:51:06 -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 67D8430BBE87; Fri, 11 Oct 2019 14:51:05 +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 5C70D601AF; Fri, 11 Oct 2019 14:51:04 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH 5/5] iotests: Enable more tests in the 'auto' group to improve test coverage Date: Fri, 11 Oct 2019 16:50:47 +0200 Message-Id: <20191011145047.19051-6-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.49]); Fri, 11 Oct 2019 14:51:05 +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" According to Kevin, tests 030, 040 and 041 are among the most valuable tests that we have, so we should always run them if possible, even if they take a little bit longer. According to Max, it would be good to have a test for iothreads and migration. 127 and 256 seem to be good candidates for iothreads. For migration, let's enable 091, 181, 183, and 203 (which also tests iothreads). Signed-off-by: Thomas Huth Reviewed-by: Max Reitz --- tests/qemu-iotests/group | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 5805a79d9e..fa0d6143b0 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -51,7 +51,7 @@ 027 rw auto quick 028 rw backing quick 029 rw auto quick -030 rw backing +030 rw auto backing 031 rw auto quick 032 rw auto quick 033 rw auto quick @@ -61,8 +61,8 @@ 037 rw auto backing quick 038 rw auto backing quick 039 rw auto quick -040 rw -041 rw backing +040 rw auto +041 rw auto backing 042 rw auto quick 043 rw auto backing 044 rw @@ -112,7 +112,7 @@ 088 rw quick 089 rw auto quick 090 rw auto quick -091 rw migration +091 rw auto migration 092 rw quick 093 throttle 094 rw quick @@ -148,7 +148,7 @@ 124 rw backing 125 rw 126 rw auto backing -127 rw backing quick +127 rw auto backing quick 128 rw quick 129 rw quick 130 rw auto quick @@ -197,9 +197,9 @@ 177 rw auto quick 178 img 179 rw auto quick -181 rw migration +181 rw auto migration 182 rw quick -183 rw migration +183 rw auto migration 184 rw auto quick 185 rw 186 rw auto @@ -218,7 +218,7 @@ 200 rw 201 rw migration 202 rw quick -203 rw migration +203 rw auto migration 204 rw quick 205 rw quick 206 rw @@ -270,7 +270,7 @@ 253 rw quick 254 rw backing quick 255 rw quick -256 rw quick +256 rw auto quick 257 rw 258 rw quick 262 rw quick migration --=20 2.18.1