[folks] Point the tests at the uninstalled backends.



commit e5d8d8c05b8726fd6788013c01fb3a0f8a37c0cf
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Mon Nov 8 15:48:20 2010 -0800

    Point the tests at the uninstalled backends.

 configure.ac                |    9 +++++++++
 tests/folks/Makefile.am     |    1 +
 tests/key-file/Makefile.am  |    1 +
 tests/telepathy/Makefile.am |    1 +
 4 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7dc8135..4fdfd3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,6 +118,15 @@ AC_DEFINE([MODULE_VERSION], "folks_module_version", [Module interface version])
 BACKEND_DIR='$(libdir)/folks/$(FOLKS_MODULE_VERSION)/backends'
 AC_SUBST([BACKEND_DIR])
 
+BACKEND_KF='$(top_builddir)/backends/key-file/.libs/libfolks-backend-key-file.so'
+AC_SUBST([BACKEND_KF])
+BACKEND_TP='$(top_builddir)/backends/telepathy/.libs/libfolks-backend-telepathy.so'
+AC_SUBST([BACKEND_TP])
+
+# All of the backend libraries in our tree; to be used by the tests
+BACKEND_UNINST_PATH='$(BACKEND_KF):$(BACKEND_TP)'
+AC_SUBST([BACKEND_UNINST_PATH])
+
 # -----------------------------------------------------------
 # Tools
 # -----------------------------------------------------------
diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am
index 27f821a..8214473 100644
--- a/tests/folks/Makefile.am
+++ b/tests/folks/Makefile.am
@@ -32,6 +32,7 @@ noinst_PROGRAMS = \
 
 backend_store_key_file=$(top_srcdir)/tests/data/backend-store-all.ini
 TESTS_ENVIRONMENT = \
+	FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \
 	FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \
 	$(NULL)
 
diff --git a/tests/key-file/Makefile.am b/tests/key-file/Makefile.am
index 7b9397f..ac10913 100644
--- a/tests/key-file/Makefile.am
+++ b/tests/key-file/Makefile.am
@@ -35,6 +35,7 @@ noinst_PROGRAMS = \
 
 backend_store_key_file=$(srcdir)/data/backend-store-key-file-only.ini
 TESTS_ENVIRONMENT = \
+	FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \
         FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \
         $(NULL)
 
diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index 611e0c9..513fbbb 100644
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -51,6 +51,7 @@ noinst_PROGRAMS = \
 SESSION_CONF = $(top_builddir)/tests/lib/telepathy/contactlist/session.conf
 backend_store_key_file=$(srcdir)/data/backend-store-telepathy-only.ini
 TESTS_ENVIRONMENT = \
+	FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \
 	FOLKS_BACKEND_KEY_FILE_PATH=$(srcdir)/data/relationships-empty.ini \
 	FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \
 	$(RUN_WITH_PRIVATE_BUS) \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]