[folks] tests: Fix load path for a Telepathy test file
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] tests: Fix load path for a Telepathy test file
- Date: Fri, 23 Jan 2015 14:07:05 +0000 (UTC)
commit 98fe7836cd9cbb8bc3fd61e5c65df236dd9e5da2
Author: Philip Withnall <philip withnall collabora co uk>
Date: Fri Jan 23 12:57:15 2015 +0000
tests: Fix load path for a Telepathy test file
The path works fine when running the tests in the source directory, but
not for installed tests. Also, it seems a bit pointless to keep the file
in its own subdirectory; and this will cause problems when installing it
for installed-tests.
https://bugzilla.gnome.org/show_bug.cgi?id=743398
tests/lib/telepathy/test-case.vala | 2 +-
tests/telepathy/Makefile.am | 2 +-
tests/telepathy/{data => }/relationships-empty.ini | 0
3 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tests/lib/telepathy/test-case.vala b/tests/lib/telepathy/test-case.vala
index 2efb711..7256e63 100644
--- a/tests/lib/telepathy/test-case.vala
+++ b/tests/lib/telepathy/test-case.vala
@@ -131,7 +131,7 @@ public class TpfTest.TestCase : Folks.TestCase
{
/* Default key-file backend file to load. */
Environment.set_variable ("FOLKS_BACKEND_KEY_FILE_PATH",
- Folks.BuildConf.ABS_TOP_SRCDIR + "/data/relationships-empty.ini",
+ Folks.TestUtils.get_source_test_data ("telepathy/relationships-empty.ini"),
true);
if (use_keyfile_too)
diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index b65efd5..81be6d4 100644
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -81,7 +81,7 @@ persona_store_capabilities_SOURCES = \
$(NULL)
EXTRA_DIST = \
- $(srcdir)/data/relationships-empty.ini \
+ relationships-empty.ini \
$(NULL)
-include $(top_srcdir)/git.mk
diff --git a/tests/telepathy/data/relationships-empty.ini b/tests/telepathy/relationships-empty.ini
similarity index 100%
rename from tests/telepathy/data/relationships-empty.ini
rename to tests/telepathy/relationships-empty.ini
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]