From nobody Sun May 12 00:59:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.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=1575474668; cv=none; d=zohomail.com; s=zohoarc; b=hGsliY2KVUjLHsqtIVh+3kyvcpm/FC91WRD81e2ffcfNXSjiZY/upwVSVxi7apoOv/QCdPqlkIGBDcVDOO45oh8x4SILKoaTDazg1he2f5TyWaAgagMqLrQq2V0zyqvlckYGSf/Haklg04GdlwOZCa1Dtd5Pom9JH9m8S2djfFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575474668; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lTXssPse7UZyktj9whmk8xhBp0q1OIis1hguSo9ilPs=; b=OSOyHUspQwcAG5huWZ3/07zS/GwsnDJycle19Rbs3mZYHcZ+OmfWQXpXRFDXfr4ku4zwrkBYFhq8v+kNppu1mgmzK5vgYYV8JQurWIcRRFDlmmWT3FLU6zzrQflY3Askd6FtbiDJN12mMIQ+LMDyTebetFe1Xhf++eOLDxKpl5A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1575474668217943.8710592328606; Wed, 4 Dec 2019 07:51:08 -0800 (PST) Received: from localhost ([::1]:40618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icWvj-0000uh-14 for importer@patchew.org; Wed, 04 Dec 2019 10:51:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55998) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icWrO-0007NX-OP for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:46:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icWrN-0008Ss-6J for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:46:38 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:29741 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 1icWrM-0008Rp-QR for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:46:36 -0500 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-336-OUeeyZm6O_yVg9RHYos1Dw-1; Wed, 04 Dec 2019 10:46:34 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76BF71005509; Wed, 4 Dec 2019 15:46:33 +0000 (UTC) Received: from thuth.com (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BA6A600C8; Wed, 4 Dec 2019 15:46:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575474395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lTXssPse7UZyktj9whmk8xhBp0q1OIis1hguSo9ilPs=; b=doDqupInRrzyHr+FG8/NSPKAG+iltP9pst5qSVas3ntJGCN2yyvIToLDHA3se8Wdbj4xK+ 3kiirBen3SfRZ5OsA2xES3zh9nXij4owNOESnKXHLDJdy5tpyziZtOeqs5ncmiaWVWJ4EX KPf7a5S+wTFcooxTcOyIgjAcDyO/FpE= From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 1/7] iotests: Provide a function for checking the creation of huge files Date: Wed, 4 Dec 2019 16:46:12 +0100 Message-Id: <20191204154618.23560-2-thuth@redhat.com> In-Reply-To: <20191204154618.23560-1-thuth@redhat.com> References: <20191204154618.23560-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: OUeeyZm6O_yVg9RHYos1Dw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: qemu-block@nongnu.org, Christian Ehrhardt , Eric Auger , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Some tests create huge (but sparse) files, and to be able to run those tests in certain limited environments (like CI containers), we have to check for the possibility to create such files first. Thus let's introduce a common function to check for large files, and replace the already existing checks in the iotests 005 and 220 with this function. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Thomas Huth Reviewed-by: Cleber Rosa Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Cleber Rosa --- tests/qemu-iotests/005 | 5 +---- tests/qemu-iotests/220 | 6 ++---- tests/qemu-iotests/common.rc | 10 ++++++++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 index 58442762fe..b6d03ac37d 100755 --- a/tests/qemu-iotests/005 +++ b/tests/qemu-iotests/005 @@ -59,10 +59,7 @@ fi # Sanity check: For raw, we require a file system that permits the creation # of a HUGE (but very sparse) file. Check we can create it before continui= ng. if [ "$IMGFMT" =3D "raw" ]; then - if ! truncate --size=3D5T "$TEST_IMG"; then - _notrun "file system on $TEST_DIR does not support large enough fi= les" - fi - rm "$TEST_IMG" + _require_large_file 5T fi =20 echo diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220 index 2d62c5dcac..15159270d3 100755 --- a/tests/qemu-iotests/220 +++ b/tests/qemu-iotests/220 @@ -42,10 +42,8 @@ echo "=3D=3D Creating huge file =3D=3D" =20 # Sanity check: We require a file system that permits the creation # of a HUGE (but very sparse) file. tmpfs works, ext4 does not. -if ! truncate --size=3D513T "$TEST_IMG"; then - _notrun "file system on $TEST_DIR does not support large enough files" -fi -rm "$TEST_IMG" +_require_large_file 513T + IMGOPTS=3D'cluster_size=3D2M,refcount_bits=3D1' _make_test_img 513T =20 echo "=3D=3D Populating refcounts =3D=3D" diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 0cc8acc9ed..6f0582c79a 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -643,5 +643,15 @@ _require_drivers() done } =20 +# Check that we have a file system that allows huge (but very sparse) files +# +_require_large_file() +{ + if ! truncate --size=3D"$1" "$TEST_IMG"; then + _notrun "file system on $TEST_DIR does not support large enough fi= les" + fi + rm "$TEST_IMG" +} + # make sure this script returns success true --=20 2.18.1 From nobody Sun May 12 00:59:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.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=1575475353; cv=none; d=zohomail.com; s=zohoarc; b=gyQO8Tu0mK7dCUbTmDzxK0aIV3ig24YbciG/AOxDIYOH63+HmiAGS8yMLOzl+jmtw8vBw5kOQN4cWG+LqdigmzaLQiNzd5SMlfJvW7u6wepw/q3lp4U/BGUqnfwaX5TfHRnq8c+l7xLLIzaGb6nfNU6JtVi2O03dxztiKCe5LZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575475353; h=Content-Type:Content-Transfer-Encoding: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=Fj6HDM3KE3pRtu7dxE+8pWnox8YZTgmkPdDHuXVOU1Q=; b=hyAfKHOsTRxTeyFA/zq+P4u07tKF/Bw7BRHU1t+2IVyLrT83PwQ4XIpgkkeaG6z4+ZgEGueW2EtWpLc3i9ysakuBvdJuSP5zJRgr4tm3ClINc++lBkRYb7k7rlc67lZj0MWFK4W2arnrwKaefJ5i61yCg/ltoQ10bna1JHPbG/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1575475353445350.4443961737709; Wed, 4 Dec 2019 08:02:33 -0800 (PST) Received: from localhost ([::1]:40718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icX6l-000751-P3 for importer@patchew.org; Wed, 04 Dec 2019 11:02:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56075) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icWrn-0007Pw-U1 for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icWrc-0000D1-ON for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:46:58 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:42514 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 1icWrP-0008UI-3A for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:46:42 -0500 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-35-dQyjZ8SlOdKBz8-_Z6OabA-1; Wed, 04 Dec 2019 10:46:36 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id A2B40DBE5; Wed, 4 Dec 2019 15:46:35 +0000 (UTC) Received: from thuth.com (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1548600C8; Wed, 4 Dec 2019 15:46:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575474398; 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=Fj6HDM3KE3pRtu7dxE+8pWnox8YZTgmkPdDHuXVOU1Q=; b=KppQk5An2E6x/z9DvpiXys6lFMO9U6Z77Rngu6nkeSmB/SaIHhv/EFQiG6HElmSubOxiZr +KLTgLhonV0KedNnj48TYUX3+MxWPvM8p6WrfDt2mISsiyeHhyGdbCYC5XGt8G3FscPBjQ /lcy9t8TZfmLaTageVXO9ECcZEwv44o= From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 2/7] iotests: Skip test 060 if it is not possible to create large files Date: Wed, 4 Dec 2019 16:46:13 +0100 Message-Id: <20191204154618.23560-3-thuth@redhat.com> In-Reply-To: <20191204154618.23560-1-thuth@redhat.com> References: <20191204154618.23560-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: dQyjZ8SlOdKBz8-_Z6OabA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable 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: qemu-block@nongnu.org, Christian Ehrhardt , Eric Auger , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Test 060 fails in the arm64, s390x and ppc64le LXD containers on Travis (which we will hopefully enable in our CI soon). These containers apparently do not allow large files to be created. The repair process in test 060 creates a file of 64 GiB, so test first whether such large files are possible and skip the test if that's not the case. Signed-off-by: Thomas Huth Reviewed-by: Cleber Rosa Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Cleber Rosa --- tests/qemu-iotests/060 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index b91d8321bb..d96f17a484 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -49,6 +49,9 @@ _supported_fmt qcow2 _supported_proto file _supported_os Linux =20 +# The repair process will create a large file - so check for availability = first +_require_large_file 64G + rt_offset=3D65536 # 0x10000 (XXX: just an assumption) rb_offset=3D131072 # 0x20000 (XXX: just an assumption) l1_offset=3D196608 # 0x30000 (XXX: just an assumption) --=20 2.18.1 From nobody Sun May 12 00:59:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.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=1575475015; cv=none; d=zohomail.com; s=zohoarc; b=ZQMkM4GP5aiP+FObk8FScbhl4bYesUj2nquY6fPkPCXyPE1FWk7GOJ/Uk1SRtIx30AWMgeNtypl70JwXpnVN8IVcRLsDwcm7oP6aXmIBCa5eumG+3+dVwc2Iqe6Y1QAylYiJLDPdSHn9TT6EYZO+osSvGODNmo2Q+AEDvtqhkiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575475015; h=Content-Type:Content-Transfer-Encoding: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=06bvpxKQ3N/x7DAPDOf5iIrQAdu/5VBGhG8lLFNcv2g=; b=VagVKiryclDl8f+GJH9iI9mwP/R5IYDIvYWEzl9n1ONwF1wA3obDnXeEIbIxhWvBP7W/l6VCmB74rTlAuukXySPCMxdLLZIA1XPQfZnJzTy9p4uTqc5Jy0DmGhghtaOdXM+62hzi/R4xa2ON6r3ZGEoAMRMr3Z2wak3XkFhHidc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1575475015163660.0452448063107; Wed, 4 Dec 2019 07:56:55 -0800 (PST) Received: from localhost ([::1]:40690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icX1J-0004eo-FI for importer@patchew.org; Wed, 04 Dec 2019 10:56:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56187) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icWru-0007Vk-5s for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icWrs-0000S6-Fl for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:09 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:24596 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 1icWrs-00008M-90 for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:08 -0500 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-248-Url-wyLBN-q3h8owcKk-WA-1; Wed, 04 Dec 2019 10:46:39 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D0755801E78; Wed, 4 Dec 2019 15:46:37 +0000 (UTC) Received: from thuth.com (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFC15600C8; Wed, 4 Dec 2019 15:46:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575474403; 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=06bvpxKQ3N/x7DAPDOf5iIrQAdu/5VBGhG8lLFNcv2g=; b=MFjgh+P8U3ZFNpUz7FPCJgbFM2NvpMk0KkRbLtUgYE7kmklZBd3TieU7fBhhcwPIV1Y8lz IGUJ+D+rvkK9kzwsiwL2G3swP1mi2ea0qxZC5CHVqx5Iia+FknuDW0nz+8QrJ8ucSP0VS8 9YmKm4sX7jNXepnjGd0Y6sGcrkpT7CM= From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 3/7] iotests: Skip test 079 if it is not possible to create large files Date: Wed, 4 Dec 2019 16:46:14 +0100 Message-Id: <20191204154618.23560-4-thuth@redhat.com> In-Reply-To: <20191204154618.23560-1-thuth@redhat.com> References: <20191204154618.23560-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: Url-wyLBN-q3h8owcKk-WA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: qemu-block@nongnu.org, Christian Ehrhardt , Eric Auger , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Test 079 fails in the arm64, s390x and ppc64le LXD containers on Travis (which we will hopefully enable in our CI soon). These containers apparently do not allow large files to be created. Test 079 tries to create a 4G sparse file, which is apparently already too big for these containers, so check first whether we can really create such files before executing the test. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qemu-iotests/079 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index 81f0c21f53..78536d3bbf 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -39,6 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file nfs =20 +# Some containers (e.g. non-x86 on Travis) do not allow large files +_require_large_file 4G + echo "=3D=3D=3D Check option preallocation and cluster_size =3D=3D=3D" echo cluster_sizes=3D"16384 32768 65536 131072 262144 524288 1048576 2097152 41= 94304" --=20 2.18.1 From nobody Sun May 12 00:59:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.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=1575474643; cv=none; d=zohomail.com; s=zohoarc; b=b5JGQc9I1K95EpHoNAfGSwZkbGrmj4JEct87j2eCbDZT/u3e4JwU8QgCxeI5vhpT5r23N0c3HUWe0LhlCYzvTO3Sfx7kyLGhLyjqx2aktV8hWXnl6EfwcP9NTRRoXLgUdVcsLt/TZpnKcSOqa3BnZYFoIP+EIBCHek/J0j93l3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575474643; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oB+EOiiCttCcGlWig7+GhXmtpFmyqeMozADnXcGVpu4=; b=PAYHZ/nd86KECQl/yrEt3lRRyS5j3gp3eu3HG3so3nX/On2a8m7y+oeWJo18drSxX3jwzto8yZ2aFBTCbA7vjh14kaODF06E0QSuEX9eFa0szBZ1QdCexz90l74YlaqFu8lxRAU/IZlTeUr0fn2ITkzpZgxWcMkJVLEEkJPh//E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1575474643643269.5935303025266; Wed, 4 Dec 2019 07:50:43 -0800 (PST) Received: from localhost ([::1]:40616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icWvH-0000gD-Pt for importer@patchew.org; Wed, 04 Dec 2019 10:50:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56073) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icWrn-0007Pv-U0 for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icWrd-0000Dq-Kr for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:46:58 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:25389 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 1icWrY-00005w-Vi for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:46:52 -0500 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-299-ja4qg2khPZyU-Tt1v8avcQ-1; Wed, 04 Dec 2019 10:46:41 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07DA9107ACC4; Wed, 4 Dec 2019 15:46:40 +0000 (UTC) Received: from thuth.com (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25925600C8; Wed, 4 Dec 2019 15:46:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575474402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oB+EOiiCttCcGlWig7+GhXmtpFmyqeMozADnXcGVpu4=; b=GYtdIGwsy9iaTikeSjgk+DWbq9rnX7ZSho/7K159bwC7W/bbsXunQODqy+ZfBv4lIxuCgg /G/XxKOQO7iARe9NRnNwgRhfmwW9JkGuH676e4MhxBiVmutbdwQdFQY3HvACpqn6x9aN4f QfceHoWU2oRVg8uhzXD8ll3HRMJaxRQ= From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 4/7] tests/hd-geo-test: Skip test when images can not be created Date: Wed, 4 Dec 2019 16:46:15 +0100 Message-Id: <20191204154618.23560-5-thuth@redhat.com> In-Reply-To: <20191204154618.23560-1-thuth@redhat.com> References: <20191204154618.23560-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: ja4qg2khPZyU-Tt1v8avcQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable 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: qemu-block@nongnu.org, Christian Ehrhardt , Eric Auger , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In certain environments like restricted containers, we can not create huge test images. To be able to use "make check" in such container environments, too, let's skip the hd-geo-test instead of failing when the test images could not be created. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Thomas Huth Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa --- tests/hd-geo-test.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index 7e86c5416c..a249800544 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -34,8 +34,13 @@ static char *create_test_img(int secs) fd =3D mkstemp(template); g_assert(fd >=3D 0); ret =3D ftruncate(fd, (off_t)secs * 512); - g_assert(ret =3D=3D 0); close(fd); + + if (ret) { + free(template); + template =3D NULL; + } + return template; } =20 @@ -934,6 +939,10 @@ int main(int argc, char **argv) for (i =3D 0; i < backend_last; i++) { if (img_secs[i] >=3D 0) { img_file_name[i] =3D create_test_img(img_secs[i]); + if (!img_file_name[i]) { + g_test_message("Could not create test images."); + goto test_add_done; + } } else { img_file_name[i] =3D NULL; } @@ -965,6 +974,7 @@ int main(int argc, char **argv) "skipping hd-geo/override/* tests"); } =20 +test_add_done: ret =3D g_test_run(); =20 for (i =3D 0; i < backend_last; i++) { --=20 2.18.1 From nobody Sun May 12 00:59:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.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=1575475514; cv=none; d=zohomail.com; s=zohoarc; b=CS5avCO9ZnBWEkuV/l7PWCoKNvF+dpOqL9GbPz3UlMFePNRnBaPS4y9am0JyMZJkbMducxirHQys5eoxp4XTjwsXZaqF3PWWMQpG7dWvl2+SY/ojfSswr65nJGSXNHC171GUCRvfj8Lrl6U47WE9ZGttdi30IQ4jwAdFvZZxNgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575475514; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6WkRx7Bv6afUEMvOsobegDUv3reP8taV3sqxSAvgXx4=; b=laBTvDOgonPH7j69SruKiDiKEDkP+vzcmSWmz5laO6V05PlRqgb6QZBnRULcw41MjsBOtlsSTyOIkPhR7NigBmsbW2k09DkGfPAiRKcNNFEHiTbD0Mv8QadmejBKqC+IQlocyFq9HrSga45YgcOGagtN9uQxxo3bgA92og+tOS8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 157547551416441.487731383224286; Wed, 4 Dec 2019 08:05:14 -0800 (PST) Received: from localhost ([::1]:40758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icX97-0000Mz-TR for importer@patchew.org; Wed, 04 Dec 2019 11:05:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56185) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icWru-0007Vi-5u for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icWrs-0000Rp-99 for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:09 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:53018 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 1icWrs-0000F5-2l for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:08 -0500 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-329--VM5xHynOcS5n0ehbrGJsg-1; Wed, 04 Dec 2019 10:46:53 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6B6E18543A0; Wed, 4 Dec 2019 15:46:51 +0000 (UTC) Received: from thuth.com (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5590F600C8; Wed, 4 Dec 2019 15:46:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575474416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6WkRx7Bv6afUEMvOsobegDUv3reP8taV3sqxSAvgXx4=; b=ewRxzUJeM3jvyU75wISLl36+sOoqOu32EDXM/JtJPvXaZbK0W4ExlIkdoHR524zmNdThNI 0UJ/Kh7w6gFRj4aLHJKO4875BQQcv4HtkrxA6ZS/wBbEO9TW1sgV34BDabeDGxIKNjxbOP WxCdh6tv2kanzhicUyKNlI+vCL1G3og= From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 5/7] tests/test-util-filemonitor: Skip test on non-x86 Travis containers Date: Wed, 4 Dec 2019 16:46:16 +0100 Message-Id: <20191204154618.23560-6-thuth@redhat.com> In-Reply-To: <20191204154618.23560-1-thuth@redhat.com> References: <20191204154618.23560-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: -VM5xHynOcS5n0ehbrGJsg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable 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: qemu-block@nongnu.org, Christian Ehrhardt , Eric Auger , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" test-util-filemonitor fails in restricted non-x86 Travis containers since they apparently blacklisted some required system calls there. Let's simply skip the test if we detect such an environment. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Thomas Huth Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa --- tests/test-util-filemonitor.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/test-util-filemonitor.c b/tests/test-util-filemonitor.c index 301cd2db61..45009c69f4 100644 --- a/tests/test-util-filemonitor.c +++ b/tests/test-util-filemonitor.c @@ -406,10 +406,21 @@ test_file_monitor_events(void) char *pathdst =3D NULL; QFileMonitorTestData data; GHashTable *ids =3D g_hash_table_new(g_int64_hash, g_int64_equal); + char *travis_arch; =20 qemu_mutex_init(&data.lock); data.records =3D NULL; =20 + /* + * This test does not work on Travis LXD containers since some + * syscalls are blocked in that environment. + */ + travis_arch =3D getenv("TRAVIS_ARCH"); + if (travis_arch && !g_str_equal(travis_arch, "x86_64")) { + g_test_skip("Test does not work on non-x86 Travis containers."); + return; + } + /* * The file monitor needs the main loop running in * order to receive events from inotify. We must --=20 2.18.1 From nobody Sun May 12 00:59:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.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=1575475623; cv=none; d=zohomail.com; s=zohoarc; b=j4kxpHoaoE14bOchiUvUyOZGgm4Z6e+W9AqyT3KJq1K6FscEwN5lnK5wvbz7pO4FqcLHjefDEjMhgVSAPwG7Uni9byRK0O4z+mUv/4c02viw++P4DDPdzbrlitMnkUhTCYpE1Bc5BWIjeBK6kGqzJ9UXMh43HbZSm1jxKH1f88E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575475623; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SsOzM8MNH4R58D2tLbl4GOaOBXqI7tFgk7eGtkoiEOQ=; b=ZIoFE9C+4JVBfNn/ARykZEmEqNUhI/5KVZDz6IIsQmXPSYB0Lw4ruy9VPYTjNuh8GwIIFZQKMjUYEK9sjOHrWjCI/EJXkLpL+SKkC9XrtHVAoUSVfpYQsSK9gNTlOnCKZTuDZdJRiZtbDjgNpO7DLYO7SepXoT75Kl3CkPFvUHk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1575475623229987.7580755947383; Wed, 4 Dec 2019 08:07:03 -0800 (PST) Received: from localhost ([::1]:40766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icXB7-0001No-SR for importer@patchew.org; Wed, 04 Dec 2019 11:07:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56161) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icWrt-0007Ud-8w for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icWrs-0000RM-17 for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:09 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:51177 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 1icWrq-0000FB-1f for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:06 -0500 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-431-sNYFBhfxNIeWPziF3ZagWg-1; Wed, 04 Dec 2019 10:46:55 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B9361005502; Wed, 4 Dec 2019 15:46:54 +0000 (UTC) Received: from thuth.com (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C306600C8; Wed, 4 Dec 2019 15:46:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575474417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SsOzM8MNH4R58D2tLbl4GOaOBXqI7tFgk7eGtkoiEOQ=; b=aKZdEKRGxipU8H+kpoXT8HP5A8lsi1RzeTUb8Q24VXSdK9ZQ2LdIdi8Fkv+gi+aVpYAYHp m+6/r0mg4mETS5FRD5QsPBkzzl+zU1sJqNJXRwcntLlBxeKVPTKV1RG95fg1qDeF7J9+QR 4iE3A0F9zBiyAHy3b8YjkBb6JY2IP54= From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 6/7] configure: allow disable of cross compilation containers Date: Wed, 4 Dec 2019 16:46:17 +0100 Message-Id: <20191204154618.23560-7-thuth@redhat.com> In-Reply-To: <20191204154618.23560-1-thuth@redhat.com> References: <20191204154618.23560-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: sNYFBhfxNIeWPziF3ZagWg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable 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: qemu-block@nongnu.org, Christian Ehrhardt , Eric Auger , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Alex Benn=C3=A9e Our docker infrastructure isn't quite as multiarch as we would wish so let's allow the user to disable it if they want. This will allow us to use still run check-tcg on non-x86 CI setups. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Stefan Weil Signed-off-by: Thomas Huth Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa --- configure | 8 +++++++- tests/tcg/configure.sh | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6099be1d84..fe6d0971f1 100755 --- a/configure +++ b/configure @@ -302,6 +302,7 @@ audio_win_int=3D"" libs_qga=3D"" debug_info=3D"yes" stack_protector=3D"" +use_containers=3D"yes" =20 if test -e "$source_path/.git" then @@ -1539,6 +1540,10 @@ for opt do ;; --disable-plugins) plugins=3D"no" ;; + --enable-containers) use_containers=3D"yes" + ;; + --disable-containers) use_containers=3D"no" + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" @@ -1722,6 +1727,7 @@ Advanced options (experts only): track the maximum stack usage of stacks created= by qemu_alloc_stack --enable-plugins enable plugins via shared library loading + --disable-containers don't use containers for cross-building =20 Optional features, enabled with --enable-FEATURE and disabled with --disable-FEATURE, default is enabled if available: @@ -8039,7 +8045,7 @@ done (for i in $cross_cc_vars; do export $i done -export target_list source_path +export target_list source_path use_containers $source_path/tests/tcg/configure.sh) =20 # temporary config to build submodules diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 6c4a471aea..210e68396f 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -36,8 +36,10 @@ TMPC=3D"${TMPDIR1}/qemu-conf.c" TMPE=3D"${TMPDIR1}/qemu-conf.exe" =20 container=3D"no" -if has "docker" || has "podman"; then - container=3D$($python $source_path/tests/docker/docker.py probe) +if test $use_containers =3D "yes"; then + if has "docker" || has "podman"; then + container=3D$($python $source_path/tests/docker/docker.py probe) + fi fi =20 # cross compilers defaults, can be overridden with --cross-cc-ARCH --=20 2.18.1 From nobody Sun May 12 00:59:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.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=1575475009; cv=none; d=zohomail.com; s=zohoarc; b=L+sU5oksXgEu9qsc4hQea7faczBBoVrPOPNHWqL19iW7JO9rnIbhK/CGcg833b0wnBRkDZhHTLzNsu54QcirPAd71SayQq5ZktsD3vE9AyWwURn5M9Bb3zmeh/d/F+a+TFtFnzV3LUta9rDqGzkNKJu4o5Qp4davvTviyTF5+RM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575475009; h=Content-Type:Content-Transfer-Encoding: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=wfbwmcxEU9ulT1ANQx9x8E9MQAuRCkvXgzodGvlOIe4=; b=cauP4ECe6NYSjW3YwuDEirEUpPYlJ9UTbGORFIBetwtlu0/oMk9q+LstReGNxreRkbXegkNyDY1olBmRgWy1zgftJQOeH/AJjQtcNjEZQUl0kbsQFvwM0Jk3jL68ac05wBUfxj6DQpz7mIZ774Q3mW+fkYZASv3DZpbi4h3TtaU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1575475009912166.76312320287116; Wed, 4 Dec 2019 07:56:49 -0800 (PST) Received: from localhost ([::1]:40688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icX1E-0004VF-2e for importer@patchew.org; Wed, 04 Dec 2019 10:56:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56184) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icWru-0007Vh-5o for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icWrs-0000Rb-60 for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:09 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:22530 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 1icWrr-0000In-Tm for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:08 -0500 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-214-rEeKplYPNr-SCR6Qh66ndw-1; Wed, 04 Dec 2019 10:46:57 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37C3618543A0; Wed, 4 Dec 2019 15:46:56 +0000 (UTC) Received: from thuth.com (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 583AF600C8; Wed, 4 Dec 2019 15:46:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575474420; 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=wfbwmcxEU9ulT1ANQx9x8E9MQAuRCkvXgzodGvlOIe4=; b=iqu6dAhtWdHy9HZ5S4hP+EPoO4uCUXLJ7o5pQg/jaXYPc2ERGTvR3AhH5uRKrVudOoE8NE EWnso0SBZ8sPhzuvyz9rDL6+laQNGSbrPheohYHaDvy1zAlvuje0yZqDJsz8OLxezRNWz2 X8r1n+mKL+F688tijRP8mojLAm2/YEA= From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 7/7] travis.yml: Enable builds on arm64, ppc64le and s390x Date: Wed, 4 Dec 2019 16:46:18 +0100 Message-Id: <20191204154618.23560-8-thuth@redhat.com> In-Reply-To: <20191204154618.23560-1-thuth@redhat.com> References: <20191204154618.23560-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: rEeKplYPNr-SCR6Qh66ndw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: qemu-block@nongnu.org, Christian Ehrhardt , Eric Auger , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Travis recently added the possibility to test on these architectures, too, so let's enable them in our travis.yml file to extend our test coverage. Unfortunately, the libssh in this Ubuntu version (bionic) is in a pretty unusable Frankenstein state and libspice-server-dev is not available here, so we can not use the global list of packages to install, but have to provide individual package lists instead. Also, some of the iotests crash when using "dist: bionic" on arm64 and ppc64le, thus these two builders have to use "dist: xenial" until the problem is understood / fixed. Signed-off-by: Thomas Huth Acked-by: David Gibson --- .travis.yml | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/.travis.yml b/.travis.yml index 445b0646c1..0e6458b0af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -354,6 +354,92 @@ matrix: - TEST_CMD=3D"make -j3 check-tcg V=3D1" - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-debug-tcg" =20 + - arch: arm64 + dist: xenial + addons: + apt_packages: + - libaio-dev + - libattr1-dev + - libbrlapi-dev + - libcap-ng-dev + - libgcrypt20-dev + - libgnutls28-dev + - libgtk-3-dev + - libiscsi-dev + - liblttng-ust-dev + - libncurses5-dev + - libnfs-dev + - libnss3-dev + - libpixman-1-dev + - libpng-dev + - librados-dev + - libsdl2-dev + - libseccomp-dev + - liburcu-dev + - libusb-1.0-0-dev + - libvdeplug-dev + - libvte-2.91-dev + env: + - TEST_CMD=3D"make check check-tcg V=3D1" + - CONFIG=3D"--disable-containers --target-list=3D${MAIN_SOFTMMU_TA= RGETS}" + + - arch: ppc64le + dist: xenial + addons: + apt_packages: + - libaio-dev + - libattr1-dev + - libbrlapi-dev + - libcap-ng-dev + - libgcrypt20-dev + - libgnutls28-dev + - libgtk-3-dev + - libiscsi-dev + - liblttng-ust-dev + - libncurses5-dev + - libnfs-dev + - libnss3-dev + - libpixman-1-dev + - libpng-dev + - librados-dev + - libsdl2-dev + - libseccomp-dev + - liburcu-dev + - libusb-1.0-0-dev + - libvdeplug-dev + - libvte-2.91-dev + env: + - TEST_CMD=3D"make check check-tcg V=3D1" + - CONFIG=3D"--disable-containers --target-list=3D${MAIN_SOFTMMU_TA= RGETS},ppc64le-linux-user" + + - arch: s390x + dist: bionic + addons: + apt_packages: + - libaio-dev + - libattr1-dev + - libbrlapi-dev + - libcap-ng-dev + - libgcrypt20-dev + - libgnutls28-dev + - libgtk-3-dev + - libiscsi-dev + - liblttng-ust-dev + - libncurses5-dev + - libnfs-dev + - libnss3-dev + - libpixman-1-dev + - libpng-dev + - librados-dev + - libsdl2-dev + - libseccomp-dev + - liburcu-dev + - libusb-1.0-0-dev + - libvdeplug-dev + - libvte-2.91-dev + env: + - TEST_CMD=3D"make check check-tcg V=3D1" + - CONFIG=3D"--disable-containers --target-list=3D${MAIN_SOFTMMU_TA= RGETS},s390x-linux-user" =20 # Release builds # The make-release script expect a QEMU version, so our tag must start= with a 'v'. --=20 2.18.1