summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaul Gutierrez Segales <rgs@collabora.co.uk>2011-06-05 11:49:20 +0100
committerRaul Gutierrez Segales <rgs@collabora.co.uk>2011-06-05 11:49:20 +0100
commit394fe118bbe5d4040d9fb7170d9302e4b3c81c83 (patch)
tree7d5cf7acc30d9d21459681144a90ccbfe5ce74c0
parentff841e27e776573de7ccdf886cf923cf202a77a9 (diff)
Move tracker's test image to a common location
Moving this to tests/data so it can be shared by other backends.
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/data/avatar-01.jpg (renamed from tests/tracker/data/avatar-01.jpg)bin1157 -> 1157 bytes
-rw-r--r--tests/tracker/Makefile.am3
3 files changed, 5 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9fcd77b..0c29f1e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,4 +33,8 @@ TESTS_ENVIRONMENT = \
G_DEBUG=fatal_warnings,fatal_criticals \
PYTHONPATH=@abs_top_srcdir@/tools
+EXTRA_DIST = \
+ $(srcdir)/data/avatar-01.jpg \
+ $(NULL)
+
-include $(top_srcdir)/git.mk
diff --git a/tests/tracker/data/avatar-01.jpg b/tests/data/avatar-01.jpg
index 36e5465..36e5465 100644
--- a/tests/tracker/data/avatar-01.jpg
+++ b/tests/data/avatar-01.jpg
Binary files differ
diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am
index 90419f1..dba97aa 100644
--- a/tests/tracker/Makefile.am
+++ b/tests/tracker/Makefile.am
@@ -104,7 +104,7 @@ noinst_PROGRAMS = \
$(NULL)
backend_store_key_file=$(srcdir)/data/backend-tracker-only.ini
-avatar_file=$(srcdir)/data/avatar-01.jpg
+avatar_file=@abs_top_srcdir@/tests/data/avatar-01.jpg
TESTS_ENVIRONMENT = \
GCONF_DEFAULT_SOURCE_PATH=@abs_top_srcdir@/tests/data/gconf.path \
FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \
@@ -418,7 +418,6 @@ MAINTAINERCLEANFILES = \
EXTRA_DIST = \
$(MAINTAINERCLEANFILES) \
$(backend_store_key_file) \
- $(srcdir)/data/avatar-01.jpg \
$(NULL)
-include $(top_srcdir)/git.mk