[glib-networking/glib-2-30] tls/tests: set GIO_EXTRA_MODULES from within the test program

[Dan Winship <danw src gnome org>]

commit cbdddf8741aca0c78890a92843bcc2d5d39aced8
Author: Dan Winship <danw gnome org>
Date:   Thu Sep 22 08:45:37 2011 -0400

    tls/tests: set GIO_EXTRA_MODULES from within the test program
    
    Set GIO_EXTRA_MODULES to point to the uninstalled module from within
    the test program, rather than doing it via TEST_ENVIRONMENT in the
    Makefile, so that you get the uninstalled module when you run the test
    program by hand too.

 tls/tests/Makefile.am |   13 +++++--------
 tls/tests/tls.c       |    2 ++
 2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
index 6fd538b..3fe34ed 100644
--- a/tls/tests/Makefile.am
+++ b/tls/tests/Makefile.am
@@ -2,20 +2,17 @@ NULL =
 
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =              \
-	-g                  \
-	$(GLIB_CFLAGS)      \
-	-I$(top_srcdir)/tls \
-	-DSRCDIR=\""$(srcdir)"\"
+INCLUDES =					\
+	$(GLIB_CFLAGS)				\
+	-I$(top_srcdir)/tls			\
+	-DSRCDIR=\""$(srcdir)"\"		\
+	-DGNUTLS_MODULE_DIR=\""$(top_builddir)/tls/gnutls/.libs"\"
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
 LDADD  = \
 	$(GLIB_LIBS)
 
-TEST_ENVIRONMENT =   \
-	GIO_EXTRA_MODULES=$(top_builddir)/tls/gnutls/.libs
-
 TEST_PROGS +=         \
 	tls           \
 	$(NULL)
diff --git a/tls/tests/tls.c b/tls/tests/tls.c
index 5261304..c84b5dc 100644
--- a/tls/tests/tls.c
+++ b/tls/tests/tls.c
@@ -1088,6 +1088,8 @@ main (int   argc,
   g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
+  g_setenv ("GIO_EXTRA_MODULES", GNUTLS_MODULE_DIR, TRUE);
+
   /* Use the gnutls database */
   if (!g_getenv ("GIO_USE_TLS"))
       g_setenv ("GIO_USE_TLS", "gnutls", TRUE);