From nobody Fri May 3 03:55:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152940936196132.00983540794596; Tue, 19 Jun 2018 04:56:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 477F3307D861; Tue, 19 Jun 2018 11:56:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 827D730012A6; Tue, 19 Jun 2018 11:55:59 +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 6E0851800538; Tue, 19 Jun 2018 11:55:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5JBttCZ000833 for ; Tue, 19 Jun 2018 07:55:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9BC232026D6A; Tue, 19 Jun 2018 11:55:55 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3FC3E2026D68 for ; Tue, 19 Jun 2018 11:55:55 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 19 Jun 2018 13:55:51 +0200 Message-Id: <20180619115551.27964-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] tests: Fix qemucapsfixreplies 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 19 Jun 2018 11:56:01 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Since e6be524508d5 we include the executed command along with the reply in *.replies files, which breaks the renumbering logic implemented in qemucapsfixreplies. Adapt the script so that it works with the new format. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- tests/qemucapsfixreplies | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/qemucapsfixreplies b/tests/qemucapsfixreplies index 4e3371a1f7..597f9ecd6e 100755 --- a/tests/qemucapsfixreplies +++ b/tests/qemucapsfixreplies @@ -8,7 +8,7 @@ if [ "$#" -ne 1 ] || [ "$1" =3D "--help" ] || [ ! -f "$1" ]= ; then fi =20 awk -i inplace \ - 'BEGIN {count=3D1; pattern=3D"libvirt-[0-9]+"} + 'BEGIN {last=3D0; pattern=3D"libvirt-[0-9]+"} { if (match($0, "libvirt-1[^0-9]")) { count=3D1; @@ -16,7 +16,11 @@ awk -i inplace \ if (match($0, pattern)) { str=3D"libvirt-" count; sub(pattern, str, $0); - count++; + if (last !=3D count) { + last=3Dcount; + } else { + count++; + } } print }' "$1" --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list