[folks] Don't hard-code the Tracker major version for tests



commit e19a4daa4600c7d01178be5a5e18057e5ef2db6d
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Fri Apr 18 12:12:50 2014 -0700

    Don't hard-code the Tracker major version for tests

 configure.ac                     |    1 +
 folks/build-conf.vapi            |    3 +++
 tests/lib/tracker/Makefile.am    |    1 +
 tests/lib/tracker/test-case.vala |    3 ++-
 4 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f1ae847..b018548 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,6 +324,7 @@ AS_IF([test x$enable_tracker_backend = xyes], [
                           [tracker-sparql-$TRACKER_SPARQL_MAJOR >= \
                            $TRACKER_SPARQL_REQUIRED])
 ])
+AC_DEFINE_UNQUOTED(TRACKER_SPARQL_MAJOR, ["$TRACKER_SPARQL_MAJOR"], [Tracker major version])
 
 AS_IF([test x$enable_bluez_backend = xyes], [EBOOK_REQUIRED=$EBOOK_REQUIRED_FOR_BLUEZ])
 
diff --git a/folks/build-conf.vapi b/folks/build-conf.vapi
index 5dbb4d1..5458a7b 100644
--- a/folks/build-conf.vapi
+++ b/folks/build-conf.vapi
@@ -63,6 +63,9 @@ public class Folks.BuildConf
   [CCode (cname = "HAVE_TRACKER")]
   public static bool HAVE_TRACKER;
 
+  [CCode (cname = "TRACKER_SPARQL_MAJOR")]
+  public static const string TRACKER_SPARQL_MAJOR;
+
   [CCode (cname = "ABS_TOP_BUILDDIR")]
   public static const string ABS_TOP_BUILDDIR;
 
diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am
index 639efb2..ab71ff5 100644
--- a/tests/lib/tracker/Makefile.am
+++ b/tests/lib/tracker/Makefile.am
@@ -15,6 +15,7 @@ libtracker_test_la_VALAFLAGS = \
        --pkg gobject-2.0 \
        --pkg gio-2.0 \
        --pkg gee-0.8 \
+       --pkg build-conf \
        --pkg folks \
        --pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
        --pkg folks-tracker \
diff --git a/tests/lib/tracker/test-case.vala b/tests/lib/tracker/test-case.vala
index 664cc8a..3f84c5f 100644
--- a/tests/lib/tracker/test-case.vala
+++ b/tests/lib/tracker/test-case.vala
@@ -66,7 +66,8 @@ public class TrackerTest.TestCase : Folks.TestCase
       try
         {
           Process.spawn_sync (null /* cwd */,
-              { "pkg-config", "--variable=prefix", "tracker-miner-1.0" },
+              { "pkg-config", "--variable=prefix",
+              "tracker-miner-%s".printf(Folks.BuildConf.TRACKER_SPARQL_MAJOR)},
               null /* envp */,
               SpawnFlags.SEARCH_PATH /* flags */,
               null /* child setup */,


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