[evolution-data-server/openismus-work-master: 21/23] test-server-utils: Use in tree backend modules to test addressbook and calendar

[Tristan Van Berkom <tvb src gnome org>]

commit 4532dfe3ec90872065cc7c2eda5201a70abcc520
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Thu Dec 13 15:48:33 2012 +0900

    test-server-utils: Use in tree backend modules to test addressbook and calendar
    
    Sets the EDS_ADDRESS_BOOK_MODULES & EDS_CALENDAR_MODULES environments.

 tests/test-server-utils/Makefile.am           |    2 ++
 tests/test-server-utils/e-test-server-utils.c |    4 +++-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/tests/test-server-utils/Makefile.am b/tests/test-server-utils/Makefile.am
index 8f95f4f..34fe539 100644
--- a/tests/test-server-utils/Makefile.am
+++ b/tests/test-server-utils/Makefile.am
@@ -14,6 +14,8 @@ common_cflags = \
 	-DEDS_TEST_DBUS_SERVICE_DIR=\""$(abs_top_builddir)/tests/test-server-utils/services"\" \
 	-DEDS_TEST_WORK_DIR=\""$(abs_top_builddir)/tests/test-server-utils/cache"\" \
 	-DEDS_TEST_SCHEMA_DIR=\""$(abs_top_builddir)/data"\" \
+	-DEDS_TEST_ADDRESS_BOOK_DIR=\""$(abs_top_builddir)/addressbook/backends/file/.libs"\" \
+	-DEDS_TEST_CALENDAR_DIR=\""$(abs_top_builddir)/calendar/backends/file/.libs"\" \
 	$(E_DATA_SERVER_CFLAGS) \
 	$(GIO_UNIX_CFLAGS) \
 	$(NULL)
diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c
index de70ffb..8c573af 100644
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -27,10 +27,12 @@ typedef struct {
 static void
 setup_environment (void)
 {
-	g_assert (g_setenv ("GSETTINGS_SCHEMA_DIR", EDS_TEST_SCHEMA_DIR, TRUE));
 	g_assert (g_setenv ("XDG_DATA_HOME", EDS_TEST_WORK_DIR, TRUE));
 	g_assert (g_setenv ("XDG_CACHE_HOME", EDS_TEST_WORK_DIR, TRUE));
 	g_assert (g_setenv ("XDG_CONFIG_HOME", EDS_TEST_WORK_DIR, TRUE));
+	g_assert (g_setenv ("GSETTINGS_SCHEMA_DIR", EDS_TEST_SCHEMA_DIR, TRUE));
+	g_assert (g_setenv ("EDS_CALENDAR_MODULES", EDS_TEST_CALENDAR_DIR, TRUE));
+	g_assert (g_setenv ("EDS_ADDRESS_BOOK_MODULES", EDS_TEST_ADDRESS_BOOK_DIR, TRUE));
 }
 
 static void