[next] telepathy-glib: Read logs from @abs_top_srcdir@/tests/logger/logs

Simon McVittie smcv at kemper.freedesktop.org
Thu Mar 20 10:25:43 PDT 2014


Module: telepathy-glib
Branch: next
Commit: 030a69937412c54b13ccb924f4585f6995ab4545
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=030a69937412c54b13ccb924f4585f6995ab4545

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Mar 20 17:09:42 2014 +0000

Read logs from @abs_top_srcdir@/tests/logger/logs

The tests are currently only reading, not writing, so using the srcdir
is fine; tests that write logs copy them first.

---

 tests/logger/Makefile.am      |    1 +
 tests/logger/dbus/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/logger/Makefile.am b/tests/logger/Makefile.am
index 7f8e0e9..48079b1 100644
--- a/tests/logger/Makefile.am
+++ b/tests/logger/Makefile.am
@@ -29,6 +29,7 @@ AM_CFLAGS = \
 AM_TESTS_ENVIRONMENT = \
 	G_DEBUG=fatal-warnings,fatal-criticals		\
 	TPL_TEST_MODE=true 				\
+	XDG_DATA_HOME=@abs_top_srcdir@/tests/logger/logs \
 	TEST_LOG_DIR=@abs_top_srcdir@/tests/logger/logs	\
 	$(NULL)
 
diff --git a/tests/logger/dbus/Makefile.am b/tests/logger/dbus/Makefile.am
index cac1470..35ddb53 100644
--- a/tests/logger/dbus/Makefile.am
+++ b/tests/logger/dbus/Makefile.am
@@ -45,7 +45,7 @@ AM_TESTS_ENVIRONMENT = \
     TPL_TEST_LOG_DIR=@abs_top_srcdir@/tests/logger/logs		\
     HOME=@abs_top_srcdir@/tests/logger/logs		\
     GSETTINGS_SCHEMA_DIR=@abs_srcdir@/data			\
-    XDG_DATA_HOME=@abs_top_builddir@/tests/logger/logs		\
+    XDG_DATA_HOME=@abs_top_srcdir@/tests/logger/logs		\
     XDG_DATA_DIRS=@abs_srcdir@					\
     G_SLICE=debug-blocks					\
     TPL_DEBUG=all						\



More information about the telepathy-commits mailing list