From nobody Tue Nov 4 21:43:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531503531909357.72425188492593; Fri, 13 Jul 2018 10:38:51 -0700 (PDT) Received: from localhost ([::1]:38541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fe21q-00017x-8W for importer@patchew.org; Fri, 13 Jul 2018 13:38:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fe20Z-0000cW-0E for qemu-devel@nongnu.org; Fri, 13 Jul 2018 13:37:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fe20Y-000241-6J for qemu-devel@nongnu.org; Fri, 13 Jul 2018 13:37:31 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:59640 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fe20S-0001uv-2q; Fri, 13 Jul 2018 13:37:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 72DF64059FF9; Fri, 13 Jul 2018 17:37:23 +0000 (UTC) Received: from probe.redhat.com (ovpn-124-170.rdu2.redhat.com [10.10.124.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id C27682166BA3; Fri, 13 Jul 2018 17:37:21 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Fri, 13 Jul 2018 13:37:21 -0400 Message-Id: <20180713173721.14915-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 13 Jul 2018 17:37:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 13 Jul 2018 17:37:23 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jsnow@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2] iotests: remove LUKS support from test 226 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, John Snow , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This test doesn't actually care about the format anyway, it just supports "all formats" as a convenience. LUKS however does not use a simple image filename which confuses this iotest. We can simply skip the test for formats that use IMGOPTSSYNTAX for their filenames without missing much coverage. Signed-off-by: John Snow --- V2: Test against IMGOPTSSYNTAX instead of 'luks' directly (Kevin) tests/qemu-iotests/226 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qemu-iotests/226 b/tests/qemu-iotests/226 index 460aea2fc9..34987d43f9 100755 --- a/tests/qemu-iotests/226 +++ b/tests/qemu-iotests/226 @@ -41,6 +41,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # Generic format, but tests file-protocol specific error handling _supported_fmt generic +if [ "$IMGOPTSSYNTAX" =3D "true" ]; then + _unsupported_fmt $IMGFMT +fi _supported_proto file _supported_os Linux =20 --=20 2.14.4