From e39f5b99d14fcddbd295e2d792980a11b379b1f7 Mon Sep 17 00:00:00 2001 From: monsta Date: Tue, 29 Sep 2015 13:38:04 +0300 Subject: [PATCH] added --enable-tests option which will be off during distcheck as we have document-saver test failing always --- Makefile.am | 8 ++++++-- configure.ac | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1de33aa..acb0ea0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,11 @@ ## Process this file with automake to produce Makefile.in ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = pluma pixmaps po data plugin-loaders plugins docs tests help +SUBDIRS = pluma pixmaps po data plugin-loaders plugins docs help + +if ENABLE_TESTS + SUBDIRS += tests +endif distuninstallcheck_listfiles = find . -type f -print @@ -51,7 +55,7 @@ MAINTAINERCLEANFILES = \ m4/lt~obsolete.m4 \ `find "$(srcdir)" -type f -name Makefile.in -print` -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-tests dist-hook: @if test -d "$(srcdir)/.git"; \ diff --git a/configure.ac b/configure.ac index 641389a..b786a4f 100644 --- a/configure.ac +++ b/configure.ac @@ -353,6 +353,13 @@ if test "x$enable_deprecations" = "xyes"; then AC_SUBST(DISABLE_DEPRECATED_CFLAGS) fi +AC_ARG_ENABLE([tests], + AS_HELP_STRING([--enable-tests], [Enable the tests]), + [enable_tests=$enableval], + [enable_tests=yes]) + +AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes) + PLUGIN_LIBTOOL_FLAGS="-module -avoid-version" LOADER_LIBTOOL_FLAGS="-module -avoid-version" @@ -425,6 +432,7 @@ Configuration: Python Plugins Support: $enable_python Spell Plugin enabled: $enable_enchant Gvfs metadata enabled: $enable_gvfs_metadata + Tests enabled: $enable_tests " if expr ${PLUMA_MINOR_VERSION} % 2 > /dev/null; then