From nobody Sun Feb 8 16:06:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631177447; cv=none; d=zohomail.com; s=zohoarc; b=iFADR2bxKTrSb4UlOp1iuuXaIQKDbAoTEEbX6ZrSoluLi9Mh51Nhn+URwkRU6vEuSjT+PeTamwwj7hl7vJmGRpKOnxuXSCeE8PkNI2bvw/TliHFt7ah5d0ungai+abY8tOiIl8EOlC+v/DWaggznHrhO4jSbVqYXyIkGix6A1bI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631177447; h=Content-Type:Content-Transfer-Encoding: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=+TQeWUBVccsahfxfgaUSao8u3WAWn9KU7mLV+dipPJQ=; b=cUJ8TYMeK/Qg0EqSqyzebWQd+V+/O83AwhybdHRTUOOSKQKqUfxG8RbarKow8lrV4JvAXi9Hy6DahtiR/UNnMrAEnJDI+w6JDJSOS/JoqjHir4ek6sFMSEJwdoh0umQRjWWj0kc+HPwTDakkMzheympMH2xTWFKaZRGL2kpHZ+0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1631177447411889.387292714985; Thu, 9 Sep 2021 01:50:47 -0700 (PDT) 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-544-8FuPq0LRMcKgqPG3Y-rf-Q-1; Thu, 09 Sep 2021 04:50:44 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26489101AFAA; Thu, 9 Sep 2021 08:50:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C64926DF9; Thu, 9 Sep 2021 08:50:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 07B564EA2F; Thu, 9 Sep 2021 08:50:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1898oapB030742 for ; Thu, 9 Sep 2021 04:50:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 580CC26DFD; Thu, 9 Sep 2021 08:50:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B54319C79 for ; Thu, 9 Sep 2021 08:50:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631177446; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+TQeWUBVccsahfxfgaUSao8u3WAWn9KU7mLV+dipPJQ=; b=Mt3HD8U6wJmbegfDEYKNo5R1cc/NgYzPrPZ41bIb2mu8iDpdaUuYdN/XOV+GTmf5VxOO66 EccxT2okRzxl0wvxOmmdXv4KUHmlrEAF0T9vi/6YRLHS+cn40wCJrdJQ/gWBDiMvOMTJu1 MLG1HwC+tIYYm/M5L2J4fbGsi8LKiAs= X-MC-Unique: 8FuPq0LRMcKgqPG3Y-rf-Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 14/24] virstoragetest: Use preformatted qcow2 image for testing relative paths Date: Thu, 9 Sep 2021 10:49:14 +0200 Message-Id: <40405f44fd712fe5bb22173bbd20a1e5a56efbcd.1631177237.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631177447668100001 Content-Type: text/plain; charset="utf-8" More preparation for eliminating image rewriting. Signed-off-by: Peter Krempa --- tests/virstoragetest.c | 8 ++++++-- .../images/qcow2_raw-raw-relative.qcow2 | Bin 0 -> 196616 bytes .../out/qcow2-auto_raw-raw-relative | 2 +- .../out/qcow2-qcow2_raw-raw-relative | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 tests/virstoragetestdata/images/qcow2_raw-raw-relative.= qcow2 diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 15296cc14f..9af8795492 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -498,8 +498,12 @@ mymain(void) VIR_STORAGE_FILE_AUTO, EXP_PASS); /* Qcow2 file with relative raw backing, format provided */ - TEST_CHAIN("qcow2-qcow2_raw-raw-relative", absqcow2, VIR_STORAGE_FILE_= QCOW2, EXP_PASS); - TEST_CHAIN("qcow2-auto_raw-raw-relative", absqcow2, VIR_STORAGE_FILE_A= UTO, EXP_PASS); + TEST_CHAIN("qcow2-qcow2_raw-raw-relative", + abs_srcdir "/virstoragetestdata/images/qcow2_raw-raw-relati= ve.qcow2", + VIR_STORAGE_FILE_QCOW2, EXP_PASS); + TEST_CHAIN("qcow2-auto_raw-raw-relative", + abs_srcdir "/virstoragetestdata/images/qcow2_raw-raw-relati= ve.qcow2", + VIR_STORAGE_FILE_AUTO, EXP_PASS); /* Rewrite qcow2 file to use absolute backing name */ virCommandFree(cmd); diff --git a/tests/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 b= /tests/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 new file mode 100644 index 0000000000000000000000000000000000000000..492d9bca1902564ba0128fee271= 22f5beb0e9e32 GIT binary patch literal 196616 zcmeIuyAi@L3;K literal 0 HcmV?d00001 diff --git a/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative b/tes= ts/virstoragetestdata/out/qcow2-auto_raw-raw-relative index 4a01b24589..f9afc138f0 100644 --- a/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative +++ b/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative @@ -1,4 +1,4 @@ -path:ABS_BUILDDIR/virstoragedata/qcow2 +path:ABS_SRCDIR/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 backingStoreRaw: capacity: 0 encryption: 0 diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative b/te= sts/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative index a1fb142e98..6e3f7ab339 100644 --- a/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative +++ b/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative @@ -1,4 +1,4 @@ -path:ABS_BUILDDIR/virstoragedata/qcow2 +path:ABS_SRCDIR/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 backingStoreRaw: raw capacity: 1024 encryption: 0 @@ -8,7 +8,7 @@ format:14 protocol:none hostname: -path:ABS_BUILDDIR/virstoragedata/raw +path:ABS_SRCDIR/virstoragetestdata/images/raw backingStoreRaw: capacity: 0 encryption: 0 --=20 2.31.1