2017-06-21 23:01:03 +02:00
|
|
|
From ee2d6609bce808ac72afdbf86db1a6e27c78171e Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
|
|
|
|
|
Date: Wed, 21 Jun 2017 16:37:54 -0400
|
|
|
|
|
Subject: [PATCH] disable tests
|
|
|
|
|
|
2015-10-21 00:40:55 +02:00
|
|
|
Disable tests, some of them need python and sometimes host-python
|
|
|
|
|
gets mixed with distro python leading to build failures.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
|
2017-06-21 23:01:03 +02:00
|
|
|
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
|
|
|
|
|
---
|
|
|
|
|
Makefile.am | 2 +-
|
|
|
|
|
gio/Makefile.am | 2 +-
|
|
|
|
|
glib/Makefile.am | 4 ++--
|
|
|
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
2015-10-21 00:40:55 +02:00
|
|
|
|
2017-06-21 23:01:03 +02:00
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
|
|
|
index 008ad58..007332d 100644
|
|
|
|
|
--- a/Makefile.am
|
|
|
|
|
+++ b/Makefile.am
|
|
|
|
|
@@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk
|
|
|
|
|
|
|
|
|
|
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
|
|
|
|
|
|
|
|
|
|
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
|
|
|
|
|
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
|
|
|
|
|
DIST_SUBDIRS = $(SUBDIRS) build win32
|
|
|
|
|
|
|
|
|
|
bin_SCRIPTS = glib-gettextize
|
|
|
|
|
diff --git a/gio/Makefile.am b/gio/Makefile.am
|
|
|
|
|
index 67db1b7..78309b5 100644
|
|
|
|
|
--- a/gio/Makefile.am
|
|
|
|
|
+++ b/gio/Makefile.am
|
|
|
|
|
@@ -244,7 +244,7 @@ platform_libadd += win32/libgiowin32.la
|
2015-10-21 00:40:55 +02:00
|
|
|
platform_deps += win32/libgiowin32.la
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
-SUBDIRS += . tests
|
|
|
|
|
+SUBDIRS += .
|
|
|
|
|
|
|
|
|
|
if HAVE_FAM
|
|
|
|
|
SUBDIRS += fam
|
2017-06-21 23:01:03 +02:00
|
|
|
diff --git a/glib/Makefile.am b/glib/Makefile.am
|
|
|
|
|
index d755853..61166e5 100644
|
|
|
|
|
--- a/glib/Makefile.am
|
|
|
|
|
+++ b/glib/Makefile.am
|
|
|
|
|
@@ -33,8 +33,8 @@ else
|
2015-10-21 00:40:55 +02:00
|
|
|
MAYBE_PCRE = pcre
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
|
|
|
|
|
-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
|
|
|
|
|
+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
|
|
|
|
|
+DIST_SUBDIRS = libcharset gnulib pcre update-pcre
|
|
|
|
|
|
|
|
|
|
AM_CPPFLAGS = \
|
|
|
|
|
$(glib_INCLUDES) \
|
2017-06-21 23:01:03 +02:00
|
|
|
--
|
|
|
|
|
2.9.4
|
|
|
|
|
|
