diff options
| author | Jürg Billeter <j@bitron.ch> | 2010-10-25 14:36:09 +0200 |
|---|---|---|
| committer | Martyn Russell <martyn@lanedo.com> | 2010-11-10 15:09:56 +0000 |
| commit | 753621ca63687bba28e59107b8c4c4da06a4b183 (patch) | |
| tree | a12d8186f5e2ac6ac3b11e630358838872db44b8 | |
| parent | 11fc29f4611c0c96183332c7e040069e2304e8cd (diff) | |
| download | tracker-753621ca63687bba28e59107b8c4c4da06a4b183.tar.gz | |
functional-tests: Do not use dbus-glib where not necessary
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | examples/class-signal/Makefile.am | 14 | ||||
| -rw-r--r-- | src/libtracker-bus/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/functional-tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/functional-tests/ipc/Makefile.am | 2 |
5 files changed, 21 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index a609eee36..6c8c5f67e 100644 --- a/configure.ac +++ b/configure.ac @@ -477,6 +477,14 @@ PKG_CHECK_MODULES(TRACKER_NAUTILUS_EXTENSION, [$TRACKER_NAUTILUS_EXTENSION_REQUI [have_tracker_nautilus_extension=yes], [have_tracker_nautilus_extension=no]) +# Check for D-Bus requirements (for tests/examples only) +PKG_CHECK_MODULES(TRACKER_DBUS, + [gio-unix-2.0 >= $GLIB_REQUIRED + dbus-1 >= $DBUS_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED], + [have_tracker_dbus=yes], + [have_tracker_dbus=no]) + # General VALAFLAGS/CFLAGS/LIBS BUILD_VALAFLAGS="-g" BUILD_CFLAGS="${WARN_CFLAGS} ${GCOV_CFLAGS} -DG_LOG_DOMAIN=\\\"Tracker\\\" -DTRACKER_COMPILATION" diff --git a/examples/class-signal/Makefile.am b/examples/class-signal/Makefile.am index 6657faadc..313b8fdaf 100644 --- a/examples/class-signal/Makefile.am +++ b/examples/class-signal/Makefile.am @@ -5,12 +5,20 @@ noinst_PROGRAMS = class-signal AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ - $(LIBTRACKER_SPARQL_CFLAGS) + $(LIBTRACKER_SPARQL_CFLAGS) \ + $(TRACKER_DBUS_CFLAGS) LDADD = \ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \ $(BUILD_LIBS) \ - $(LIBTRACKER_SPARQL_LIBS) + $(LIBTRACKER_SPARQL_LIBS) \ + $(TRACKER_DBUS_LIBS) -class_signal_SOURCES = class-signal.c +# NOTE: class-signal needed to have gio/dbus/dbus-glib-1 CFLAGS/LIBS +# added. The reason for this is that the +# LIBTRACKER_SPARQL_{CFLAGS|LIBS} no longer include dbus/dbus-glib-1 +# so these tests fail without that. The fix is to update the test +# cases to use gdbus. For now this is a temporary fix for these tests, +# -mr. +class_signal_SOURCES = class-signal.c diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am index 176ab7575..05af4f81b 100644 --- a/src/libtracker-bus/Makefile.am +++ b/src/libtracker-bus/Makefile.am @@ -35,10 +35,7 @@ libtracker_bus_la_LDFLAGS = \ -module -avoid-version -no-undefined noinst_HEADERS = \ - tracker-bus.h \ - tracker-bus-fd-cursor.h \ - tracker-bus-fd-update.h \ - tracker-bus-shared.h + tracker-bus.h BUILT_SOURCES = \ libtracker_bus_la_vala.stamp diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am index b4b94cf50..1feab96fa 100644 --- a/tests/functional-tests/Makefile.am +++ b/tests/functional-tests/Makefile.am @@ -23,7 +23,6 @@ config_SCRIPTS += \ tracker-tests.aegis endif - standard_tests = \ 01-insertion.py if HAVE_TRACKER_FTS diff --git a/tests/functional-tests/ipc/Makefile.am b/tests/functional-tests/ipc/Makefile.am index 19eb97bad..8da9f8e96 100644 --- a/tests/functional-tests/ipc/Makefile.am +++ b/tests/functional-tests/ipc/Makefile.am @@ -11,7 +11,7 @@ noinst_PROGRAMS = \ test-update-array-performance AM_VALAFLAGS = \ - --pkg gio-2.0 --pkg dbus-glib-1 \ + --pkg gio-2.0 \ $(BUILD_VALAFLAGS) \ $(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \ $(top_srcdir)/src/libtracker-bus/tracker-bus.vapi |