From patchwork Mon Jul 23 16:45:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 947871 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Z6t36C8yz9s0R for ; Tue, 24 Jul 2018 02:50:03 +1000 (AEST) Received: from localhost ([::1]:35620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhe25-0004bX-EN for incoming@patchwork.ozlabs.org; Mon, 23 Jul 2018 12:50:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhdxt-0002DK-88 for qemu-devel@nongnu.org; Mon, 23 Jul 2018 12:45:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhdxs-0005Ai-Hs for qemu-devel@nongnu.org; Mon, 23 Jul 2018 12:45:41 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36668 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 1fhdxq-00058p-H1; Mon, 23 Jul 2018 12:45:38 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E5617264E; Mon, 23 Jul 2018 16:45:38 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-83.ams2.redhat.com [10.36.117.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39B657C3B; Mon, 23 Jul 2018 16:45:37 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 23 Jul 2018 18:45:27 +0200 Message-Id: <20180723164530.26599-5-kwolf@redhat.com> In-Reply-To: <20180723164530.26599-1-kwolf@redhat.com> References: <20180723164530.26599-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 23 Jul 2018 16:45:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 23 Jul 2018 16:45:38 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@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] [PULL 4/7] 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, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: John Snow 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 Signed-off-by: Kevin Wolf --- 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 # Generic format, but tests file-protocol specific error handling _supported_fmt generic +if [ "$IMGOPTSSYNTAX" = "true" ]; then + _unsupported_fmt $IMGFMT +fi _supported_proto file _supported_os Linux