Fabio Erculiani
85 lines
2.9 KiB
Diff
85 lines
2.9 KiB
Diff
From d0885d5757f02f53dbc8036054a1ced7f727eb08 Mon Sep 17 00:00:00 2001
|
|
From: Gilles Dartiguelongue <eva@gentoo.org>
|
|
Date: Fri, 5 Nov 2010 23:39:08 +0100
|
|
Subject: [PATCH] Do not build tests unless needed
|
|
|
|
[Alexandre Rostovtsev <tetromino@gmail.com>: port to 2.90.1]
|
|
---
|
|
tests/Makefile.am | 12 ++++++------
|
|
tests/runtests.py | 3 +++
|
|
2 files changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
index 7a619bf..a3cbf57 100644
|
|
--- a/tests/Makefile.am
|
|
+++ b/tests/Makefile.am
|
|
@@ -1,5 +1,5 @@
|
|
CLEANFILES =
|
|
-noinst_LTLIBRARIES = libgimarshallingtests.la
|
|
+check_LTLIBRARIES = libgimarshallingtests.la
|
|
test_typelibs = GIMarshallingTests-1.0.typelib
|
|
|
|
nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
|
|
@@ -23,7 +23,7 @@ GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
|
|
|
|
# regress.c needs cairo
|
|
if ENABLE_CAIRO
|
|
-noinst_LTLIBRARIES += libregress.la
|
|
+check_LTLIBRARIES += libregress.la
|
|
test_typelibs += Regress-1.0.typelib
|
|
nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
|
|
libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
|
|
@@ -52,7 +52,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
|
|
|
|
CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib gschemas.compiled
|
|
|
|
-noinst_LTLIBRARIES += testhelper.la
|
|
+check_LTLIBRARIES += testhelper.la
|
|
|
|
testhelper_la_CFLAGS = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
|
|
testhelper_la_LDFLAGS = -module -avoid-version
|
|
@@ -72,7 +72,7 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
|
|
test -L $@ || $(LN_S) .libs/$@ $@
|
|
|
|
|
|
-all: $(LTLIBRARIES:.la=.so)
|
|
+all: $(check_LTLIBRARIES:.la=.so)
|
|
|
|
EXTRA_DIST = \
|
|
compathelper.py \
|
|
@@ -112,7 +112,7 @@ EXTRA_DIST = \
|
|
$(NULL)
|
|
|
|
clean-local:
|
|
- rm -f $(LTLIBRARIES:.la=.so) file.txt~
|
|
+ rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
|
|
|
|
DBUS_LAUNCH=$(shell which dbus-launch)
|
|
RUN_TESTS_ENV_VARS= \
|
|
@@ -123,7 +123,7 @@ RUN_TESTS_ENV_VARS= \
|
|
MALLOC_PERTURB_=85 \
|
|
TESTS_BUILDDIR=$(builddir)
|
|
|
|
-check-local: $(LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
|
|
+check-local: $(check_LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
|
|
@echo " CHECK Pyflakes"
|
|
@if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
|
|
@echo " CHECK PEP8"
|
|
diff --git a/tests/runtests.py b/tests/runtests.py
|
|
index c518fcc..35bb5c4 100755
|
|
--- a/tests/runtests.py
|
|
+++ b/tests/runtests.py
|
|
@@ -34,6 +34,9 @@ if sys.version_info[:2] == (2, 6):
|
|
unittest.TestCase.assertGreater = assertGreater
|
|
unittest.TestCase.assertIsInstance = assertIsInstance
|
|
|
|
+# Some tests fail with translated messages.
|
|
+os.environ["LC_ALL"] = "C"
|
|
+
|
|
if '--help' in sys.argv:
|
|
print("Usage: ./runtests.py <testfiles>")
|
|
sys.exit(0)
|
|
--
|
|
1.7.12.4
|
|
|