提交 17bbdef5 编写于 作者: D Daniel P. Berrangé

build-aux: rewrite augeas test generator in Python

As part of an goal to eliminate Perl from libvirt build tools,
rewrite the augeas-gentest.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.

The use of $(AUG_GENTEST) as a dependancy in the makefiles needed
to be fixed, because this was assumed to be the filename of the
script, but is in fact a full shell command line.
Reviewed-by: NJán Tomko <jtomko@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 b36b20a1
......@@ -45,7 +45,7 @@ EXTRA_DIST = \
run.in \
README.md \
AUTHORS.in \
build-aux/augeas-gentest.pl \
scripts/augeas-gentest.py \
build-aux/check-spacing.pl \
build-aux/header-ifdef.pl \
build-aux/minimize-po.pl \
......
#!/usr/bin/env perl
#!/usr/bin/env python
#
# augeas-gentest.pl: Generate an augeas test file, from an
# Copyright (C) 2012-2019 Red Hat, Inc.
#
# augeas-gentest.py: Generate an augeas test file, from an
# example config file + test file template
#
# This library is free software; you can redistribute it and/or
......@@ -17,44 +19,49 @@
# License along with this library. If not, see
# <http://www.gnu.org/licenses/>.
use strict;
use warnings;
die "syntax: $0 CONFIG TEMPLATE\n" unless @ARGV == 2;
my $config = shift @ARGV;
my $template = shift @ARGV;
open CONFIG, "<", $config or die "cannot read $config: $!";
open TEMPLATE, "<", $template or die "cannot read $template: $!";
my $group = 0;
while (<TEMPLATE>) {
if (/\@CONFIG\@/) {
my $group = 0;
print " let conf = \"";
while (<CONFIG>) {
if (/^#\w/) {
s/^#//;
s/\"/\\\"/g;
print $_;
$group = /\[\s$/;
} elsif ($group) {
s/\"/\\\"/g;
if (/#\s*\]/) {
$group = 0;
}
if (/^#/) {
s/^#//;
print $_;
}
}
}
print "\"\n";
} else {
print $_;
}
}
close TEMPLATE;
close CONFIG;
from __future__ import print_function
import re
import sys
if len(sys.argv) != 3:
print("syntax: %s CONFIG TEMPLATE" % sys.argv[0], file=sys.stderr)
sys.exit(1)
config = sys.argv[1]
template = sys.argv[2]
def expand_config(config):
with open(config) as fh:
group = False
for line in fh:
if re.search(r'''^#\w''', line) is not None:
line = line[1:]
line = line.replace('"', '\\"')
print(line, end='')
if re.search(r'''\[\s$''', line):
group = True
elif group:
line = line.replace('"', '\\"')
if re.search(r'''#\s*\]''', line):
group = False
if line[0] == '#':
line = line[1:]
print(line, end='')
def expand_template(template, config):
with open(template) as fh:
for line in fh:
if '@CONFIG@' in line:
print(' let conf = "', end='')
expand_config(config)
print('"')
else:
print(line, end='')
expand_template(template, config)
......@@ -421,8 +421,8 @@ check-augeas: $(augeas_DATA) $(augeastest_DATA)
fi
.PHONY: check-augeas
AUG_GENTEST_SCRIPT = $(top_srcdir)/build-aux/augeas-gentest.pl
AUG_GENTEST = $(PERL) $(AUG_GENTEST_SCRIPT)
AUG_GENTEST_SCRIPT = $(top_srcdir)/scripts/augeas-gentest.py
AUG_GENTEST = $(RUNUTF8) $(PYTHON) $(AUG_GENTEST_SCRIPT)
#
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册