[tracker] Fix qname-test with srcdir != builddir



commit 9c669e41897bcf38f0e40c7439f54d37ad67cc3a
Author: Jürg Billeter <j bitron ch>
Date:   Fri Nov 20 16:57:56 2009 +0100

    Fix qname-test with srcdir != builddir

 utils/services/Makefile.am  |    4 ++++
 utils/services/qname-test.c |   20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/utils/services/Makefile.am b/utils/services/Makefile.am
index ad6b9d2..b99a29e 100644
--- a/utils/services/Makefile.am
+++ b/utils/services/Makefile.am
@@ -7,6 +7,7 @@ TEST_PROGS += qname-test
 INCLUDES = 								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
+	-DTOP_SRCDIR=\"$(top_srcdir)\"					\
 	-I$(top_srcdir)/src						\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
@@ -73,3 +74,6 @@ qname_test_SOURCES = qname-test.c qname.c
 qname_test_LDADD = 	$(DBUS_LIBS)					\
 			$(GLIB2_LIBS)					\
 			$(GIO_LIBS)
+
+EXTRA_DIST = file-class.cache.test
+
diff --git a/utils/services/qname-test.c b/utils/services/qname-test.c
index caf4ce2..7b279c6 100644
--- a/utils/services/qname-test.c
+++ b/utils/services/qname-test.c
@@ -3,11 +3,23 @@
 
 
 static void
+srcdir_qname_init (const gchar *luri, const gchar *lprefix)
+{
+        gchar *class_location;
+
+        class_location = g_build_filename (TOP_SRCDIR, "utils", "services", "file-class.cache.test", NULL);
+
+        qname_init (luri, lprefix, class_location);
+
+         g_free (class_location);
+}
+
+static void
 test_qname_to_shortname (void) 
 {
         gchar *result = NULL;
 
-        qname_init ("test://local_uri#", "local", "./file-class.cache.test");
+        srcdir_qname_init ("test://local_uri#", "local");
 
         result = qname_to_shortname ("http://purl.org/dc/elements/1.1/source";);
         g_assert_cmpstr (result, ==, "dc:source");
@@ -33,7 +45,7 @@ test_qname_to_classname (void)
 {
         gchar *result = NULL;
 
-        qname_init ("test://local_uri#", "local", "./file-class.cache.test");
+        srcdir_qname_init ("test://local_uri#", "local");
 
         result = qname_to_classname ("http://purl.org/dc/elements/1.1/source";);
         g_assert_cmpstr (result, ==, "source");
@@ -59,7 +71,7 @@ test_qname_to_link (void)
 {
         gchar *result = NULL;
 
-        qname_init ("test://local_uri#", "local", "./file-class.cache.test");
+        srcdir_qname_init ("test://local_uri#", "local");
 
         result = qname_to_link ("test://local_uri#Class");
         g_assert_cmpstr (result, ==, "#Class");
@@ -88,7 +100,7 @@ test_process_dc (void)
 
         gchar *result = NULL;
 
-        qname_init ("test://dc_style/", "local", "./file-class.cache.test");
+        srcdir_qname_init ("test://dc_style/", "local");
 
         /* local */
         result = qname_to_link ("test://dc_style/Class");



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