On Thu, Sep 26, 2019 at 05:35:46PM +0200, Ján Tomko wrote:
On Wed, Sep 25, 2019 at 03:17:10PM +0100, Daniel P. Berrangé wrote:
> On Wed, Sep 25, 2019 at 03:25:39PM +0200, Ján Tomko wrote:
> > On Tue, Sep 24, 2019 at 03:58:43PM +0100, Daniel P. Berrangé wrote:
> > > 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
> >
> > s/dependancy/dependency/
> >
> > > to be fixed, because this was assumed to be the filename of the
> > > script, but is in fact a full shell command line.
> > >
> >
> > This is the case regardless of the Perl->Python conversion
> > and can be done upfront to reduce the churn in this patch.
> > Introduced by commit fb59cf7a5824b9c876737dcbf6aac97c29b1444a
> >
> > > Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> > > ---
> > > Makefile.am | 2 +-
> > > build-aux/augeas-gentest.pl | 60 ---------------------------
> > > build-aux/augeas-gentest.py | 72 +++++++++++++++++++++++++++++++++
> > > src/Makefile.am | 3 +-
> > > src/bhyve/Makefile.inc.am | 4 +-
> > > src/interface/Makefile.inc.am | 2 +-
> > > src/libxl/Makefile.inc.am | 4 +-
> > > src/locking/Makefile.inc.am | 6 +--
> > > src/logging/Makefile.inc.am | 2 +-
> > > src/lxc/Makefile.inc.am | 4 +-
> > > src/network/Makefile.inc.am | 2 +-
> > > src/node_device/Makefile.inc.am | 2 +-
> > > src/nwfilter/Makefile.inc.am | 2 +-
> > > src/qemu/Makefile.inc.am | 4 +-
> > > src/remote/Makefile.inc.am | 4 +-
> > > src/secret/Makefile.inc.am | 2 +-
> > > src/storage/Makefile.inc.am | 2 +-
> > > src/vbox/Makefile.inc.am | 2 +-
> > > src/vz/Makefile.inc.am | 2 +-
> > > 19 files changed, 97 insertions(+), 84 deletions(-)
> > > delete mode 100755 build-aux/augeas-gentest.pl
> > > create mode 100755 build-aux/augeas-gentest.py
> >
> > Since this is a new file with clean history, it might actually deserve
> > a better location than build-aux and we can leave this directory to
> > Automake and gnulib to do whatever magic they do there.
> > Also note that the directory is in .gitignore. (I added the exception
> > for .pl files back when I added files here)
> >
> > Would 'scripts' be too vague? Could be a good place to put the helper
> > scripts for generating QEMU caps files since I never seem to remember
> > its name and tests/ is growing quite big.
>
> That's a good question. As you see from this series, we've got random
> scripts scattered all over the sub-dirs. build-aux/ was in some sense
> to avoid polluting the top level dir.
>
> If we create 'scripts/' should we put everything in there, or just
> stuff that's related to the top level, and keep everything else in
> their current subdirs ?
We put all the driver-specific tests into one tests/ directory, I think
doing it for scripts makes sense too.
I'd really like the move all the tests into their respective driver
directories at some point :-)
We don't have an enourmous number of scripts though, so having them
all in one place is fine.
Regards,
Daniel
--
|:
https://berrange.com -o-
https://www.flickr.com/photos/dberrange :|
|:
https://libvirt.org -o-
https://fstop138.berrange.com :|
|:
https://entangle-photo.org -o-
https://www.instagram.com/dberrange :|