[pygobject/pygobject-2-28] Run gio tests separately when enabled

[Martin Pitt <martinpitt src gnome org>]

commit 5ec107f805e32d4183b3c1a015d411992fc46a48
Author: Martin Pitt <martin pitt ubuntu com>
Date:   Wed Feb 9 18:00:34 2011 +0100

    Run gio tests separately when enabled
    
    As we can't load both gio and gi.repository.Gio at the same time, run the gio
    tests separately when gio is enabled.

 tests/Makefile.am |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7e2ccd9..fb3d8e7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -81,7 +81,7 @@ TEST_FILES = \
 	test_uris.py
 
 if BUILD_GIO
-TEST_FILES += \
+GIO_TEST_FILES = \
 	test_gio.py \
 	test_gresolver.py \
 	test_gsocket.py \
@@ -113,6 +113,8 @@ clean-local:
 
 DBUS_LAUNCH=$(shell which dbus-launch)
 
+# need to run the gio tests separately to avoid loading gi.repository.Gio and
+# gio at the same time
 check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
 	TEST_FILES="$(TEST_FILES)" \
 	PYTHONPATH=$(top_builddir):$(top_builddir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} \
@@ -121,6 +123,15 @@ check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.t
 	XDG_DATA_DIRS=$$XDG_DATA_DIRS:/usr/share \
 	$(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
 
+if BUILD_GIO
+	TEST_FILES="$(GIO_TEST_FILES)" \
+	PYTHONPATH=$(top_builddir):$(top_builddir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} \
+	LD_LIBRARY_PATH=$(builddir)/.libs:$$LD_LIBRARY_PATH \
+	GI_TYPELIB_PATH=$(builddir):$$GI_TYPELIB_PATH \
+	XDG_DATA_DIRS=$$XDG_DATA_DIRS:/usr/share \
+	$(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
+endif 
+
 check.gdb:
 	EXEC_NAME="gdb --args" $(MAKE) check