From nobody Sun Feb 8 10:48:47 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1568219339; cv=none; d=zoho.com; s=zohoarc; b=kO5kl4SIMs/huKPtCy4QeTb0osXXrG5+ta0VW6T8JWoAqYHsU/rPc+Kor0sLVgbsDeyv8bedXh7FFgnjVGZ2s3xIW3wD9N8vw8RHc3k2Gbnx0Uqs6SHETj4xNQ6qSZJnjfm8vknPXNqlr/Utu3YQzKy99HII5xNEGVWduzocMKE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568219339; 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:ARC-Authentication-Results; bh=gOgZfxD8PnZbtJaFoLqMMl2sjMiySgUT0bq1+SX/51s=; b=c5d4wLXmBQCqPcqI+90zkVAJVwtoNGwIcC+HAyruNk9RKInWsmZ+9ZH7MP4Wfo2uSGYmb0o65z0ADchQNPFNVIFJJqV4qe7Pq51YTuZh3mGd+KTrJoiAGwbWOB9kNJ7S3I3Rd13KLH1WaELi9ysJDZl/rqRDDGffxL7cZygh9tU= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1568219339994854.3894928601281; Wed, 11 Sep 2019 09:28:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 737F17BDA5; Wed, 11 Sep 2019 16:28:58 +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 510E460A9F; Wed, 11 Sep 2019 16:28:58 +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 1DC261803B4D; Wed, 11 Sep 2019 16:28:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8BGSYA9013273 for ; Wed, 11 Sep 2019 12:28:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 40F896017E; Wed, 11 Sep 2019 16:28:34 +0000 (UTC) Received: from catbus.gsslab.fab.redhat.com (dhcp-32.gsslab.fab.redhat.com [10.33.9.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id A50E26012A; Wed, 11 Sep 2019 16:28:31 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 11 Sep 2019 17:23:30 +0100 Message-Id: <20190911162333.8668-22-berrange@redhat.com> In-Reply-To: <20190911162333.8668-1-berrange@redhat.com> References: <20190911162333.8668-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 21/24] tests: rewrite qemu capability grouper in Python 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 11 Sep 2019 16:28:58 +0000 (UTC) As part of an goal to eliminate Perl from libvirt build tools, rewrite the group-qemu-caps.pl tool in Python. This was a straight conversion, manually going line-by-line to change the syntax from Perl to Python. Thus the overall structure of the file and approach is the same. Signed-off-by: Daniel P. Berrang=C3=A9 --- cfg.mk | 3 +- tests/group-qemu-caps.pl | 124 --------------------------------------- tests/group-qemu-caps.py | 115 ++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 125 deletions(-) delete mode 100755 tests/group-qemu-caps.pl create mode 100755 tests/group-qemu-caps.py diff --git a/cfg.mk b/cfg.mk index a0fc7a4708..241fb4b9d7 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1170,7 +1170,8 @@ test-wrap-argv: $(PYTHON) $(top_srcdir)/tests/test-wrap-argv.py --check =20 group-qemu-caps: - $(AM_V_GEN)$(PERL) $(top_srcdir)/tests/group-qemu-caps.pl --check $(top_s= rcdir)/ + $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/tests/group-qemu-caps.py \ + --check --prefix $(top_srcdir)/ =20 # sc_po_check can fail if generated files are not built first sc_po_check: \ diff --git a/tests/group-qemu-caps.pl b/tests/group-qemu-caps.pl deleted file mode 100755 index 829e63a562..0000000000 --- a/tests/group-qemu-caps.pl +++ /dev/null @@ -1,124 +0,0 @@ -#!/usr/bin/env perl -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library. If not, see -# . -# -# -# Regroup array values into smaller groups separated by numbered comments. -# -# If --check is the first parameter, the script will return -# a non-zero value if a file is not grouped correctly. -# Otherwise the files are regrouped in place. - -use strict; -use warnings; - -my $check =3D 0; - -if (defined $ARGV[0] && $ARGV[0] eq "--check") { - $check =3D 1; - shift @ARGV; -} - -my $prefix =3D ''; -if (defined $ARGV[0]) { - $prefix =3D $ARGV[0]; - shift @ARGV; -} - -my $ret =3D 0; -if (®roup_caps($prefix . 'src/qemu/qemu_capabilities.c', - 'virQEMUCaps grouping marker', - '\);', - 0, - " ") < 0) { - $ret =3D 1; -} -if (®roup_caps($prefix . 'src/qemu/qemu_capabilities.h', - 'virQEMUCapsFlags grouping marker', - 'QEMU_CAPS_LAST \/\* this must', - 1, - " ") < 0) { - $ret =3D 1; -} - -exit $ret; - -sub regroup_caps { - my $filename =3D shift; - my $start_regex =3D shift; - my $end_regex =3D shift; - my $trailing_newline =3D shift; - my $counter_prefix =3D shift; - my $step =3D 5; - - open FILE, '<', $filename or die "cannot open $filename: $!"; - my @original =3D ; - close FILE; - - my @fixed; - my $game_on =3D 0; - my $counter =3D 0; - foreach (@original) { - if ($game_on) { - next if ($_ =3D~ '/\* [0-9]+ \*/'); - next if (/^\s+$/); - if ($counter % $step =3D=3D 0) { - if ($counter !=3D 0) { - push @fixed, "\n"; - } - push @fixed, "$counter_prefix/* $counter */\n"; - } - if (!($_ =3D~ '/\*' && !($_ =3D~ '\*/'))) { - # count two-line comments as one line - $counter++; - } - } - if (/$start_regex/) { - $game_on =3D 1; - } elsif ($game_on && $_ =3D~ /$end_regex/) { - if (($counter -1) % $step =3D=3D 0) { - pop @fixed; # /* $counter */ - if ($counter !=3D 1) { - pop @fixed; # \n - } - } - if ($trailing_newline) { - push @fixed, "\n"; - } - $game_on =3D 0; - } - push @fixed, $_; - } - - if ($check) { - my $nl =3D join('', @fixed); - my $ol =3D join('', @original); - unless ($nl eq $ol) { - open DIFF, "| diff -u $filename -" or die "cannot run diff: $!= "; - print DIFF $nl; - close DIFF; - - print STDERR "Incorrect array grouping in $filename\n"; - print STDERR "Use group-qemu-caps.pl to group long array membe= rs\n"; - return -1; - } - } else { - open FILE, '>', $filename or die "cannot open $filename: $!"; - foreach my $line (@fixed) { - print FILE $line; - } - close FILE; - } -} diff --git a/tests/group-qemu-caps.py b/tests/group-qemu-caps.py new file mode 100755 index 0000000000..35f317587c --- /dev/null +++ b/tests/group-qemu-caps.py @@ -0,0 +1,115 @@ +#!/usr/bin/env python +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# . +# +# +# Regroup array values into smaller groups separated by numbered comments. +# +# If --check is the first parameter, the script will return +# a non-zero value if a file is not grouped correctly. +# Otherwise the files are regrouped in place. + +from __future__ import print_function + +import argparse +import re +import subprocess +import sys + +def regroup_caps(check, filename, start_regex, end_regex, trailing_newline= , counter_prefix): + step =3D 5 + + original =3D [] + with open(filename, "r") as fh: + for line in fh: + original.append(line) + + fixed =3D [] + game_on =3D False + counter =3D 0 + for line in original: + line =3D line.rstrip("\n") + if game_on: + if re.match(r'''.*/\* [0-9]+ \*/.*''', line): + continue + if re.match(r'''^\s*$''', line): + continue + if counter % step =3D=3D 0: + if counter !=3D 0: + fixed.append("\n") + fixed.append("%s/* %d */\n" % (counter_prefix, counter)) + + if not (line.find("/*") !=3D -1 and line.find("*/") =3D=3D -1): + # count two-line comments as one line + counter =3D counter + 1 + + if re.match(start_regex, line): + game_on =3D True + elif game_on and re.match(end_regex, line): + if (counter - 1) % step =3D=3D 0: + fixed =3D fixed[:-1] # /* $counter */ + if counter !=3D 1: + fixed =3D fixed[:-1] # \n + + if trailing_newline: + fixed.append("\n") + + game_on =3D False + + fixed.append(line + "\n") + + if check: + orig =3D "".join(original) + new =3D "".join(fixed) + if new !=3D orig: + diff =3D subprocess.Popen(["diff", "-u", filename, "-"], stdin= =3Dsubprocess.PIPE) + diff.communicate(input=3Dnew.encode('utf-8')) + + print("Incorrect line wrapping in $file", file=3Dsys.stderr) + print("Use test-wrap-argv.py to wrap test data files", file=3D= sys.stderr) + return False + else: + with open(filename, "w") as fh: + for line in fixed: + print(line, file=3Dfh, end=3D'') + + return True + +parser =3D argparse.ArgumentParser(description=3D'Test arg line wrapper') +parser.add_argument('--check', action=3D"store_true", help=3D'check existi= ng files only') +parser.add_argument('--prefix', default=3D'', help=3D'source code tree pre= fix') +args =3D parser.parse_args() + +errs =3D False + +if not regroup_caps(args.check, + args.prefix + 'src/qemu/qemu_capabilities.c', + r'.*virQEMUCaps grouping marker.*', + r'.*\);.*', + 0, + " "): + errs =3D True + +if not regroup_caps(args.check, + args.prefix + 'src/qemu/qemu_capabilities.h', + r'.*virQEMUCapsFlags grouping marker.*', + r'.*QEMU_CAPS_LAST \/\* this must.*', + 1, + " "): + errs =3D True + +if errs: + sys.exit(1) +sys.exit(0) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list