From nobody Mon Apr 14 13:40:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710767037; cv=none; d=zohomail.com; s=zohoarc; b=YVhf0fbdLLniogovM+FucuV3/ODt0R0Oedrv5PcS6s5Nkyy+kDkExpUp26vdNUXanBznMkJzZPRagRndntJDU+xZO8ngta4tV3rnyx0k9W6k/z63Q/QeLDjQyzzu/b5paLjuWgLav14LHJzDKhrXDwjopYnmmxxS1QAG5IaYdh4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710767037; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SkpQHWbKrON+MQuGfqxk62PqBz1Pz/Uu1qXAMa1davk=; b=R9jAHqfHZe5ul71Bij0tI3CR+4REIk7SBb9trbDDbO7By3ItaHr3nZQfruFMnZIG3O8LvQ9B1t1dhCVLFsoiobiSkQbINUt2ISP5mzslvzLRmZAjjXAkiHKzEocViNGmgnebdelaUC+Yv0lVYNkZ1m2+OG5EFgRCdGzloDnKwAY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171076703706287.23907143745191; Mon, 18 Mar 2024 06:03:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmCeY-0004im-0L; Mon, 18 Mar 2024 09:03:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmCca-0002RF-RS for qemu-devel@nongnu.org; Mon, 18 Mar 2024 09:01:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmCcX-0007hQ-2m for qemu-devel@nongnu.org; Mon, 18 Mar 2024 09:01:44 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-438-7fuEXBM-OxqKY8waeVNxNg-1; Mon, 18 Mar 2024 09:01:36 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 658C38007AB; Mon, 18 Mar 2024 13:01:36 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.194.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD2942166B33; Mon, 18 Mar 2024 13:01:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710766898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SkpQHWbKrON+MQuGfqxk62PqBz1Pz/Uu1qXAMa1davk=; b=ACdTy1RUGzM0ipG8MQNhK+9QKY6GVhSUdqPYn1RdDuErwhnmen9mTscihnwTag94gjRsw5 Z/6gL1oXD1gXrxAU0duzyqKi5XuGlZgwcZCgC6lNxG1LbsIu5+d1toCFBtWGWWMf8MaMUT 2K3V3P8FDmDt2oR6jXDAnC7HFYT96oI= X-MC-Unique: 7fuEXBM-OxqKY8waeVNxNg-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 13/15] tests/qemu-iotests: Fix some tests that use --image-opts for other protocols Date: Mon, 18 Mar 2024 14:01:16 +0100 Message-ID: <20240318130118.358920-14-kwolf@redhat.com> In-Reply-To: <20240318130118.358920-1-kwolf@redhat.com> References: <20240318130118.358920-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710767038259100001 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Tests 263, 284 and detect-zeroes-registered-buf use qemu-io with --image-opts so we have to enforce IMGOPTSSYNTAX=3Dtrue here to get $TEST_IMG in shape for other protocols than "file". Signed-off-by: Thomas Huth Message-ID: <20240315111108.153201-9-thuth@redhat.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- tests/qemu-iotests/263 | 6 ++++-- tests/qemu-iotests/284 | 7 +++---- tests/qemu-iotests/tests/detect-zeroes-registered-buf | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/263 b/tests/qemu-iotests/263 index ec09b41405..44fdada0d6 100755 --- a/tests/qemu-iotests/263 +++ b/tests/qemu-iotests/263 @@ -34,6 +34,8 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 +IMGOPTSSYNTAX=3Dtrue + # get standard environment, filters and checks . ./common.rc . ./common.filter @@ -73,7 +75,7 @@ echo "testing LUKS qcow2 encryption" echo =20 _make_test_img --object $SECRET -o "encrypt.format=3Dluks,encrypt.key-secr= et=3Dsec0,encrypt.iter-time=3D10,cluster_size=3D64K" $size -_run_test "driver=3D$IMGFMT,encrypt.key-secret=3Dsec0,file.filename=3D$TES= T_IMG" +_run_test "$TEST_IMG,encrypt.key-secret=3Dsec0" _cleanup_test_img =20 echo @@ -82,7 +84,7 @@ echo =20 =20 _make_test_img --object $SECRET -o "encrypt.format=3Daes,encrypt.key-secre= t=3Dsec0,cluster_size=3D64K" $size -_run_test "driver=3D$IMGFMT,encrypt.key-secret=3Dsec0,file.filename=3D$TES= T_IMG" +_run_test "$TEST_IMG,encrypt.key-secret=3Dsec0" _cleanup_test_img =20 =20 diff --git a/tests/qemu-iotests/284 b/tests/qemu-iotests/284 index 5a82639e7f..722267486d 100755 --- a/tests/qemu-iotests/284 +++ b/tests/qemu-iotests/284 @@ -33,6 +33,8 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 +IMGOPTSSYNTAX=3Dtrue + # get standard environment, filters and checks . ./common.rc . ./common.filter @@ -47,14 +49,12 @@ size=3D1M =20 SECRET=3D"secret,id=3Dsec0,data=3Dastrochicken" =20 -IMGSPEC=3D"driver=3D$IMGFMT,file.filename=3D$TEST_IMG,encrypt.key-secret= =3Dsec0" QEMU_IO_OPTIONS=3D$QEMU_IO_OPTIONS_NO_FMT =20 _run_test() { - IMGOPTSSYNTAX=3Dtrue OLD_TEST_IMG=3D"$TEST_IMG" - TEST_IMG=3D"driver=3D$IMGFMT,file.filename=3D$TEST_IMG,encrypt.key= -secret=3Dsec0" + TEST_IMG=3D"$TEST_IMG,encrypt.key-secret=3Dsec0" QEMU_IMG_EXTRA_ARGS=3D"--image-opts --object $SECRET" =20 echo @@ -78,7 +78,6 @@ _run_test() =20 TEST_IMG=3D"$OLD_TEST_IMG" QEMU_IMG_EXTRA_ARGS=3D - IMGOPTSSYNTAX=3D } =20 =20 diff --git a/tests/qemu-iotests/tests/detect-zeroes-registered-buf b/tests/= qemu-iotests/tests/detect-zeroes-registered-buf index edb5f2cee5..5eaf34e5a6 100755 --- a/tests/qemu-iotests/tests/detect-zeroes-registered-buf +++ b/tests/qemu-iotests/tests/detect-zeroes-registered-buf @@ -36,6 +36,8 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 +IMGOPTSSYNTAX=3Dtrue + # get standard environment, filters and checks cd .. . ./common.rc @@ -46,7 +48,7 @@ _supported_proto generic =20 size=3D128M _make_test_img $size -IMGSPEC=3D"driver=3D$IMGFMT,file.filename=3D$TEST_IMG,discard=3Dunmap,dete= ct-zeroes=3Dunmap" +IMGSPEC=3D"$TEST_IMG,discard=3Dunmap,detect-zeroes=3Dunmap" =20 echo echo "=3D=3D writing zero buffer to image =3D=3D" --=20 2.44.0