[Libguestfs] [PATCH 1/2] mllib: remove spurious check_SCRIPTS from Makefile.am

Pino Toscano ptoscano at redhat.com
Wed May 13 14:51:03 UTC 2015


On Tuesday 12 May 2015 19:54:32 Richard W.M. Jones wrote:
> On Tue, May 12, 2015 at 03:20:56PM +0200, Pino Toscano wrote:
> > Not actually useful, as TESTS defines the tests, and it breaks when
> > oUnit is not available (as it tries to build an oUnit-based unit test).
> > ---
> >  mllib/Makefile.am | 3 ---
> >  1 file changed, 3 deletions(-)
> > 
> > diff --git a/mllib/Makefile.am b/mllib/Makefile.am
> > index 0b43684..e363f27 100644
> > --- a/mllib/Makefile.am
> > +++ b/mllib/Makefile.am
> > @@ -132,9 +132,6 @@ libdir.ml: Makefile
> >  
> >  # Tests.
> >  
> > -check_SCRIPTS = \
> > -	common_utils_tests
> > -
> >  if HAVE_OCAMLOPT
> >  common_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS)
> >  common_utils_tests: config.cmx common_gettext.cmx common_utils.cmx common_utils_tests.cmx
> 
> I don't think this is spurious (although it doesn't do very much).
> Automake wants us to list all built scripts in a check_SCRIPTS rule,
> of which this is one.  See section 9.1 Executable Scripts in the
> automake info file.

This is somehow confusing, as check_SCRIPTS and check_PROGRAMS seem to
be defined as the scripts/programs needed by the tests (those in TESTS),
although it says they can be added to TESTS...
Add to that that common_utils_tests is not really a script (like a
shell/Python/etc would be), and it's somehow that due to not being built
with automake.

I've just sent a couple of patches which, in the end, link the two tests
in mllib using automake.

> It probably does need to be changed to:
> 
> check_SCRIPTS =
> if HAVE_OCAML_PKG_OUNIT
> check_SCRIPTS += common_utils_tests
> endif

Right, although with my patches this is now check_PROGRAMS.

Thanks,
-- 
Pino Toscano




More information about the Libguestfs mailing list