From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9ACD1C4360C for ; Fri, 27 Sep 2019 09:59:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 676B2217D7 for ; Fri, 27 Sep 2019 09:59:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 676B2217D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDn2N-0004O9-5j for qemu-devel@archiver.kernel.org; Fri, 27 Sep 2019 05:59:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33657) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDmmk-0003xO-W0 for qemu-devel@nongnu.org; Fri, 27 Sep 2019 05:43:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDmmj-0008LL-QC for qemu-devel@nongnu.org; Fri, 27 Sep 2019 05:43:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35232) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDmmf-0008CI-9T; Fri, 27 Sep 2019 05:43:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 84E00C065119; Fri, 27 Sep 2019 09:43:28 +0000 (UTC) Received: from localhost (ovpn-204-76.brq.redhat.com [10.40.204.76]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DDAC5D6B0; Fri, 27 Sep 2019 09:43:27 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 18/18] iotests: Allow check -o data_file Date: Fri, 27 Sep 2019 11:42:42 +0200 Message-Id: <20190927094242.11152-19-mreitz@redhat.com> In-Reply-To: <20190927094242.11152-1-mreitz@redhat.com> References: <20190927094242.11152-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 27 Sep 2019 09:43:28 +0000 (UTC) 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: 209.132.183.28 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: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The problem with allowing the data_file option is that you want to use a different data file per image used in the test. Therefore, we need to allow patterns like -o data_file=3D'$TEST_IMG.data_file'. Then, we need to filter it out from qemu-img map, qemu-img create, and remove the data file in _rm_test_img. Signed-off-by: Max Reitz --- tests/qemu-iotests/common.filter | 21 +++++++++++++++++++-- tests/qemu-iotests/common.rc | 10 +++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common= .filter index 841f7642af..a11f9a8972 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -115,7 +115,15 @@ _filter_actual_image_size() # replace driver-specific options in the "Formatting..." line _filter_img_create() { - $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ + data_file_filter=3D() + if echo "$IMGOPTS" | grep -q 'data_file=3D'; then + data_file=3D$(echo "$IMGOPTS" | sed -e 's/.*\(data_file=3D[^,]*\= ).*/\1/' \ + -e "s#\\\$TEST_IMG#$TEST_IMG#"= ) + data_file_filter=3D(-e "s# $data_file##") + fi + + $SED "${data_file_filter[@]}" \ + -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ -e "s#$TEST_DIR#TEST_DIR#g" \ -e "s#$IMGFMT#IMGFMT#g" \ @@ -198,9 +206,18 @@ _filter_img_info() # human and json output _filter_qemu_img_map() { + data_file_filter=3D() + if echo "$IMGOPTS" | grep -q 'data_file=3D'; then + data_file_pattern=3D$(echo "$IMGOPTS" | sed -e 's/.*data_file=3D= \([^,]*\).*/\1/' \ + -e 's#\$TEST_IMG#\\(.*= \\)#') + data_file_filter=3D(-e "s#$data_file_pattern#\\1#") + fi + $SED -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \ -e 's/"offset": [0-9]\+/"offset": OFFSET/g' \ - -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt + -e 's/Mapped to *//' \ + "${data_file_filter[@]}" \ + | _filter_testdir | _filter_imgfmt } =20 _filter_nbd() diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index f3784077de..834ece12e4 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -297,7 +297,8 @@ _make_test_img() fi =20 if [ -n "$IMGOPTS" ]; then - optstr=3D$(_optstr_add "$optstr" "$IMGOPTS") + imgopts_expanded=3D$(echo "$IMGOPTS" | sed -e "s#\\\$TEST_IMG#$i= mg_name#") + optstr=3D$(_optstr_add "$optstr" "$imgopts_expanded") fi if [ -n "$IMGKEYSECRET" ]; then object_options=3D"--object secret,id=3Dkeysec0,data=3D$IMGKEYSEC= RET" @@ -376,6 +377,13 @@ _rm_test_img() # Remove all the extents for vmdk "$QEMU_IMG" info "$img" 2>/dev/null | grep 'filename:' | cut -f = 2 -d: \ | xargs -I {} rm -f "{}" + elif [ "$IMGFMT" =3D "qcow2" ]; then + # Remove external data file + if echo "$IMGOPTS" | grep -q 'data_file=3D'; then + data_file=3D$(echo "$IMGOPTS" | sed -e 's/.*data_file=3D\([^= ,]*\).*/\1/' \ + -e "s#\\\$TEST_IMG#$img#") + rm -f "$data_file" + fi fi rm -f "$img" } --=20 2.21.0