added --enable-tests option which will be off during distcheck

as we have document-saver test failing always
This commit is contained in:
monsta 2015-09-29 13:38:04 +03:00
parent ab4da31e08
commit e39f5b99d1
2 changed files with 14 additions and 2 deletions

View File

@ -1,7 +1,11 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} 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 distuninstallcheck_listfiles = find . -type f -print
@ -51,7 +55,7 @@ MAINTAINERCLEANFILES = \
m4/lt~obsolete.m4 \ m4/lt~obsolete.m4 \
`find "$(srcdir)" -type f -name Makefile.in -print` `find "$(srcdir)" -type f -name Makefile.in -print`
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-tests
dist-hook: dist-hook:
@if test -d "$(srcdir)/.git"; \ @if test -d "$(srcdir)/.git"; \

View File

@ -353,6 +353,13 @@ if test "x$enable_deprecations" = "xyes"; then
AC_SUBST(DISABLE_DEPRECATED_CFLAGS) AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
fi 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" PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
LOADER_LIBTOOL_FLAGS="-module -avoid-version" LOADER_LIBTOOL_FLAGS="-module -avoid-version"
@ -425,6 +432,7 @@ Configuration:
Python Plugins Support: $enable_python Python Plugins Support: $enable_python
Spell Plugin enabled: $enable_enchant Spell Plugin enabled: $enable_enchant
Gvfs metadata enabled: $enable_gvfs_metadata Gvfs metadata enabled: $enable_gvfs_metadata
Tests enabled: $enable_tests
" "
if expr ${PLUMA_MINOR_VERSION} % 2 > /dev/null; then if expr ${PLUMA_MINOR_VERSION} % 2 > /dev/null; then