Hi Rich, thanks for the patch. Committed as 63c3148f
David On Tue, Nov 1, 2016 at 7:23 AM, Richard W.M. Jones <[email protected]> wrote: > gnulib tests sometimes fail for reasons which are everything to do > with gnulib and nothing to do with Augeas. Allow them to be skipped. > > Signed-off-by: Richard W.M. Jones <[email protected]> > --- > Makefile.am | 6 +++++- > configure.ac | 10 ++++++++++ > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/Makefile.am b/Makefile.am > index 87d511a..c89e21e 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -1,4 +1,8 @@ > -SUBDIRS=gnulib/lib src gnulib/tests tests man doc examples > +SUBDIRS = gnulib/lib src > +if ENABLE_GNULIB_TESTS > +SUBDIRS += gnulib/tests > +endif > +SUBDIRS += tests man doc examples > > ACLOCAL_AMFLAGS = -I gnulib/m4 > > diff --git a/configure.ac b/configure.ac > index ce1ff70..5230efe 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -107,6 +107,16 @@ AM_CONDITIONAL([USE_VERSION_SCRIPT], [test > "$VERSION_SCRIPT_FLAGS" != none]) > > gl_INIT > > +dnl Should we run the gnulib tests? > +AC_MSG_CHECKING([if we should run the GNUlib tests]) > +AC_ARG_ENABLE([gnulib-tests], > + [AS_HELP_STRING([--disable-gnulib-tests], > + [disable running GNU Portability library tests @<:@default=yes@ > :>@])], > + [ENABLE_GNULIB_TESTS="$enableval"], > + [ENABLE_GNULIB_TESTS=yes]) > +AM_CONDITIONAL([ENABLE_GNULIB_TESTS],[test "x$ENABLE_GNULIB_TESTS" = > "xyes"]) > +AC_MSG_RESULT([$ENABLE_GNULIB_TESTS]) > + > PKG_PROG_PKG_CONFIG > PKG_CHECK_MODULES([LIBXML], [libxml-2.0]) > > -- > 2.7.4 > >
_______________________________________________ augeas-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/augeas-devel
