From patchwork Mon Oct 21 10:53:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11201893 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3730913B1 for ; Mon, 21 Oct 2019 10:55:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0C9CC2084C for ; Mon, 21 Oct 2019 10:55:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ETlLvDsp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C9CC2084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVLq-0006Sv-CK for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Oct 2019 06:55:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45689) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVKI-0004CR-4C for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVKF-0001hP-Ud for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:13 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:38188 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMVKD-0001f2-QY for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571655249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ifHsHTBcMhSqGAy591LJdMSm21J89JLOA6i3bO9Pwso=; b=ETlLvDspKQXhvBibm7JeztfzPnASF7z0uHFDZQkbGc3AEWZtzXB1KnxpkK0E3ISMngwdvb /u8zZlMznDPsIP5PsM4Up7grXQ9Yqwb2+mi5Vm9SZV2rcrdD93eHDEKCsCPkvKMikHNd+z IScJsogp+3YU6w+Gjw85zN004cJXPN0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-67-8rBsMvk6NpWwA3bqoVFs8Q-1; Mon, 21 Oct 2019 06:54:06 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CE20107AD31; Mon, 21 Oct 2019 10:54:06 +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 E4DD360BE2; Mon, 21 Oct 2019 10:54:01 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH v2 1/6] iotests: remove 'linux' from default supported platforms Date: Mon, 21 Oct 2019 12:53:45 +0200 Message-Id: <20191021105350.1710-2-thuth@redhat.com> In-Reply-To: <20191021105350.1710-1-thuth@redhat.com> References: <20191021105350.1710-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 8rBsMvk6NpWwA3bqoVFs8Q-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 effect 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. Reviewed-by: Max Reitz Signed-off-by: John Snow --- 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 5373149ae1..7d6c2d3641 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -871,9 +871,14 @@ def verify_protocol(supported=[], unsupported=[]): if not_sup or (imgproto in unsupported): notrun('not suitable for this protocol: %s' % imgproto) -def verify_platform(supported_oses=['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=None, unsupported=None): + 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) def verify_cache_mode(supported_cache_modes=[]): if supported_cache_modes and (cachemode not in supported_cache_modes): @@ -935,7 +940,8 @@ def execute_unittest(output, verbosity, debug): r'Ran \1 tests', output.getvalue())) def execute_test(test_function=None, - supported_fmts=[], supported_oses=['linux'], + supported_fmts=[], + supported_platforms=None, supported_cache_modes=[], unsupported_fmts=[], supported_protocols=[], unsupported_protocols=[]): """Run either unittest or script-style tests.""" @@ -952,7 +958,7 @@ def execute_test(test_function=None, verbosity = 1 verify_image_format(supported_fmts, unsupported_fmts) verify_protocol(supported_protocols, unsupported_protocols) - verify_platform(supported_oses) + verify_platform(supported=supported_platforms) verify_cache_mode(supported_cache_modes) if debug: From patchwork Mon Oct 21 10:53:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11201889 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 243A1139A for ; Mon, 21 Oct 2019 10:55:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ECC132084C for ; Mon, 21 Oct 2019 10:55:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OZOOvPPv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ECC132084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVLe-0006Cs-Qw for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Oct 2019 06:55:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45704) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVKI-0004CW-45 for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVKG-0001i2-TE for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:33797 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMVKG-0001hq-Pl for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571655252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F6xpS5jn3FPueHeHNbHmw7PW4u/jvYS3g/pddsd2v1A=; b=OZOOvPPvfY2MCg64lP9J9u860Au97C4wWvTSpxkQb0uLDdGO27ONCNG/ohHVxcBou3cr+G 3v58crLSw5o5vN2yK7C98YRtlppzcesG3T9wTwLg+QLnFwDwOJ6BDBz7HZ4AxY0I/i86ow 0UcIf2zSklPuZDw4+gRGU2PvPG6K60k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-80-4rzQJ8NGPWuxSxYyjnLsuQ-1; Mon, 21 Oct 2019 06:54:08 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5FC1A100551E; Mon, 21 Oct 2019 10:54:07 +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 454CD60BE2; Mon, 21 Oct 2019 10:54:06 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH v2 2/6] iotests: Test 041 only works on certain systems Date: Mon, 21 Oct 2019 12:53:46 +0200 Message-Id: <20191021105350.1710-3-thuth@redhat.com> In-Reply-To: <20191021105350.1710-1-thuth@redhat.com> References: <20191021105350.1710-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 4rzQJ8NGPWuxSxYyjnLsuQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 041 works fine on Linux, FreeBSD, NetBSD and OpenBSD, but fails on macOS. Let's mark it as only supported on the systems where we know that it is working fine. 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..0326888c98 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -1123,4 +1123,5 @@ class TestOrphanedSource(iotests.QMPTestCase): if __name__ == '__main__': iotests.main(supported_fmts=['qcow2', 'qed'], - supported_protocols=['file']) + supported_protocols=['file'], + supported_platforms=['linux', 'freebsd', 'netbsd', 'openbsd']) From patchwork Mon Oct 21 10:53:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11201895 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B06D13B1 for ; Mon, 21 Oct 2019 10:55:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 218AC2084C for ; Mon, 21 Oct 2019 10:55:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="arMCC35M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 218AC2084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVLs-0006WW-Io for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Oct 2019 06:55:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45705) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVKI-0004CX-4M for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVKH-0001iC-0S for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:20024 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMVKG-0001hu-T3 for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571655252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U7fE3CimUtLQu2tN3FQVw3n9zYsYUqqPEGbjy3LxWxA=; b=arMCC35MslvvjXdhMpxJT9Rov1uwkjKBHEsDN504vx/NdWsZUSBbfRWYkI9OXApoM+k7/l vN9QEiZ2HsfFa0aClracKZwBXyL4c/shzSlYrRadvb9wrgcbuCdULBYjpWxdwCSfxLikyK u1dY/HjacN1KkcLo7zvLL5WVEWGpMgQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-EdhVZ12nNDKt55oaSxN3pA-1; Mon, 21 Oct 2019 06:54:09 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC3D15ED; Mon, 21 Oct 2019 10:54:08 +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 9CAAD60BE2; Mon, 21 Oct 2019 10:54:07 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH v2 3/6] iotests: Test 183 does not work on macOS and OpenBSD Date: Mon, 21 Oct 2019 12:53:47 +0200 Message-Id: <20191021105350.1710-4-thuth@redhat.com> In-Reply-To: <20191021105350.1710-1-thuth@redhat.com> References: <20191021105350.1710-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: EdhVZ12nNDKt55oaSxN3pA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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, FreeBSD and NetBSD). 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..0bbae13647 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 +_supported_os Linux FreeBSD NetBSD _supported_fmt qcow2 raw qed quorum _supported_proto file From patchwork Mon Oct 21 10:53:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11201891 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 39826139A for ; Mon, 21 Oct 2019 10:55:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 106BD2084C for ; Mon, 21 Oct 2019 10:55:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="O9CNyl2t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 106BD2084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVLj-0006Ip-Gl for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Oct 2019 06:55:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45762) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVKK-0004Dq-Lx for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVKJ-0001kN-DJ for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:16 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:35401 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMVKJ-0001k8-90 for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571655254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ChAKUyJC7iiVoJsEwLh+lO4vhVCdqQ6OROJITLpnBN8=; b=O9CNyl2tZFJie0Cr4Omml1TcR0eD9Gm5r+5OgqKtj9GlXEjXLk9G24RMgmwX2NJsNnPYli cF5x6Rjp7w+aiigev74t3YupXkLhPUrGDPNecwr+6vCZyTyE8dU+9bE+d/OinxwU1NiBLs MQ1YoAXT0ldp2KdOAriC36B6XcJCXME= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-178-y56AF-2RMEKKMEoJPbXKDw-1; Mon, 21 Oct 2019 06:54:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E438107AD31; Mon, 21 Oct 2019 10:54:12 +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 20EAC60BE2; Mon, 21 Oct 2019 10:54:08 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH v2 4/6] iotests: Skip "make check-block" if QEMU does not support virtio-blk Date: Mon, 21 Oct 2019 12:53:48 +0200 Message-Id: <20191021105350.1710-5-thuth@redhat.com> In-Reply-To: <20191021105350.1710-1-thuth@redhat.com> References: <20191021105350.1710-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: y56AF-2RMEKKMEoJPbXKDw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- 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..e9e2978818 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." From patchwork Mon Oct 21 10:53:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11201899 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 076D01515 for ; Mon, 21 Oct 2019 10:58:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D2BB22084C for ; Mon, 21 Oct 2019 10:57:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="W0FQs+Vq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2BB22084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVNu-00017z-P1 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Oct 2019 06:57:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45808) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVKP-0004NM-Jn for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVKO-0001pg-Bk for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24450 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMVKO-0001pU-8E for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571655259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EWEY4b6PjdseCjRZ6lS/PKvEvsNUldXSh2Vzzbk2YUI=; b=W0FQs+VqIUB4JcHmHqjSPC6pTG3cjZRK3dD7mX2Ym0ND6FfDPzvR3Av/FuLCJ/ruOrA7yB UDEt9u4r3Rrq5H9U6wHnJ3wbZUWF6VqucGtOYPKhwrK1a37499I0IcqwSiwcOqW/Ecsih4 iD979yCxW13AOO2mbycZIw6+/rCpO0w= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-177-uajou6qzP_KSOFcec3-lFw-1; Mon, 21 Oct 2019 06:54:16 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0023480183E; Mon, 21 Oct 2019 10:54:16 +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 85D2C60BE2; Mon, 21 Oct 2019 10:54:12 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH v2 5/6] iotests: Enable more tests in the 'auto' group to improve test coverage Date: Mon, 21 Oct 2019 12:53:49 +0200 Message-Id: <20191021105350.1710-6-thuth@redhat.com> In-Reply-To: <20191021105350.1710-1-thuth@redhat.com> References: <20191021105350.1710-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: uajou6qzP_KSOFcec3-lFw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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). Reviewed-by: Max Reitz Signed-off-by: Thomas Huth --- 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 a73df279e5..2dd671b82e 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 260 rw quick From patchwork Mon Oct 21 10:53:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11201923 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6D18B13BD for ; Mon, 21 Oct 2019 11:00:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 440C12084C for ; Mon, 21 Oct 2019 11:00:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SNHplR8t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 440C12084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVQk-00040n-VH for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Oct 2019 07:00:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45823) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVKQ-0004Qe-Lz for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVKP-0001rO-FG for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:22 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:30060 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMVKP-0001qy-Al for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:54:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571655260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dXJRCDn0+l4gCV7yTkBZRBy899zbb0rUJ6QExh/wgTM=; b=SNHplR8tQsnjYSRq+66r1OrPxvHwgFjbe+OmcYb6qRWF6sq2LIeEKgLKJurcJpHizy1Hqz 4Dif5GArjaY7CWUX3ITq8waTcJH10d0QOIEMaFMW3jVbREEajYWWPSOmWI3ZIksPjLM874 sxlCJpQLcybmKKv7KGGb1lkTx/1oN0M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-296-dN9MG7_pP8eUqcMcNZZ4lw-1; Mon, 21 Oct 2019 06:54:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4EF595ED; Mon, 21 Oct 2019 10:54:17 +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 3621960BE2; Mon, 21 Oct 2019 10:54:16 +0000 (UTC) From: Thomas Huth To: Max Reitz , qemu-block@nongnu.org Subject: [PATCH v2 6/6] iotests: Remove 130 from the "auto" group Date: Mon, 21 Oct 2019 12:53:50 +0200 Message-Id: <20191021105350.1710-7-thuth@redhat.com> In-Reply-To: <20191021105350.1710-1-thuth@redhat.com> References: <20191021105350.1710-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: dN9MG7_pP8eUqcMcNZZ4lw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Peter hit a "Could not open 'TEST_DIR/t.IMGFMT': Failed to get shared 'write' lock - Is another process using the image [TEST_DIR/t.IMGFMT]?" error with 130 already twice. Looks like this test is a little bit shaky, so for the time being, let's disable it from the "auto" group so that it does not gate the pull requests. Reviewed-by: John Snow Signed-off-by: Thomas Huth --- tests/qemu-iotests/group | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 2dd671b82e..9f99f8623f 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -151,7 +151,7 @@ 127 rw auto backing quick 128 rw quick 129 rw quick -130 rw auto quick +130 rw quick 131 rw quick 132 rw quick 133 auto quick