diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2018-07-22 13:37:21 +0200 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2018-07-22 19:08:19 +0200 |
commit | 30b3c98e607a34c3cd78a2da20fd312bc1337c8a (patch) | |
tree | 2adc9de6852dd0aa559799381a24724d085ae1ec | |
parent | 2bcf53a209c5bfc413af177cfd783f87d82d3e76 (diff) | |
download | tracker-30b3c98e607a34c3cd78a2da20fd312bc1337c8a.tar.gz |
configure: Various distcheck fixes
Hook up properly the test-bus-query-cancellation functional test in
autotools, and add missing files to be able to build from tarballs with
meson.
-rw-r--r-- | src/libtracker-direct/Makefile.am | 2 | ||||
-rw-r--r-- | src/ontologies/Makefile.am | 1 | ||||
-rw-r--r-- | tests/functional-tests/ipc/Makefile.am | 6 | ||||
-rw-r--r-- | tests/functional-tests/ttl/Makefile.am | 1 | ||||
-rw-r--r-- | tests/libtracker-data/tracker-ontology-test.c | 4 | ||||
-rw-r--r-- | tests/libtracker-data/tracker-sparql-blank-test.c | 4 | ||||
-rw-r--r-- | tests/libtracker-data/tracker-sparql-test.c | 4 |
7 files changed, 9 insertions, 13 deletions
diff --git a/src/libtracker-direct/Makefile.am b/src/libtracker-direct/Makefile.am index 7960bae6c..80e7d9a9a 100644 --- a/src/libtracker-direct/Makefile.am +++ b/src/libtracker-direct/Makefile.am @@ -18,4 +18,4 @@ libtracker_direct_la_LIBADD = \ noinst_HEADERS = \ tracker-direct.h -EXTRA_DIST = meson.build +EXTRA_DIST = meson.build tracker-direct.vapi diff --git a/src/ontologies/Makefile.am b/src/ontologies/Makefile.am index eb97557f0..4416669f4 100644 --- a/src/ontologies/Makefile.am +++ b/src/ontologies/Makefile.am @@ -37,4 +37,5 @@ BUILT_SOURCES = tracker-gresources.c tracker-gresources.h EXTRA_DIST = \ $(internal_config) \ builtin-ontology.gresource.xml \ + meson.build \ $(nepomuk_DATA) diff --git a/tests/functional-tests/ipc/Makefile.am b/tests/functional-tests/ipc/Makefile.am index a8fa049db..6d39da2d5 100644 --- a/tests/functional-tests/ipc/Makefile.am +++ b/tests/functional-tests/ipc/Makefile.am @@ -3,6 +3,7 @@ noinst_PROGRAMS = \ test-busy-handling \ test-direct-query \ test-bus-query \ + test-bus-query-cancellation \ test-default-update \ test-bus-update \ test-class-signal \ @@ -20,6 +21,8 @@ AM_CPPFLAGS =\ $(BUILD_VALACFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ + -DTEST_DOMAIN_ONTOLOGY_RULE=\""$(abs_top_srcdir)/src/tracker-store/default.rule"\" \ + -DTEST_ONTOLOGIES_DIR=\""$(abs_top_srcdir)/src/ontologies/nepomuk"\" \ $(LIBTRACKER_SPARQL_CFLAGS) LDADD =\ @@ -49,6 +52,9 @@ test_bus_query_SOURCES = \ test-shared-query.vala \ test-bus-query.vala +test_bus_query_cancellation_SOURCES = \ + test-bus-query-cancellation.c + test_update_array_performance_SOURCES = \ test-update-array-performance.c diff --git a/tests/functional-tests/ttl/Makefile.am b/tests/functional-tests/ttl/Makefile.am index 0c4d60e50..1105e0b80 100644 --- a/tests/functional-tests/ttl/Makefile.am +++ b/tests/functional-tests/ttl/Makefile.am @@ -57,3 +57,4 @@ DISTCLEANFILES = \ $(ttl_DATA) \ source-data.pkl +EXTRA_DIST = meson.build diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c index 9ff9beb1e..294e4b7e6 100644 --- a/tests/libtracker-data/tracker-ontology-test.c +++ b/tests/libtracker-data/tracker-ontology-test.c @@ -26,11 +26,7 @@ #include <gio/gio.h> #include <glib/gstdio.h> -#include <libtracker-data/tracker-data-manager.h> -#include <libtracker-data/tracker-data-query.h> -#include <libtracker-data/tracker-data-update.h> #include <libtracker-data/tracker-data.h> -#include <libtracker-data/tracker-sparql-query.h> static gchar *tests_data_dir = NULL; diff --git a/tests/libtracker-data/tracker-sparql-blank-test.c b/tests/libtracker-data/tracker-sparql-blank-test.c index 2c22d4f24..1da731f5c 100644 --- a/tests/libtracker-data/tracker-sparql-blank-test.c +++ b/tests/libtracker-data/tracker-sparql-blank-test.c @@ -26,11 +26,7 @@ #include <glib/gstdio.h> #include <gio/gio.h> -#include <libtracker-data/tracker-data-manager.h> -#include <libtracker-data/tracker-data-query.h> -#include <libtracker-data/tracker-data-update.h> #include <libtracker-data/tracker-data.h> -#include <libtracker-data/tracker-sparql-query.h> static gchar *tests_data_dir = NULL; diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c index 8744c8c93..d127e67b3 100644 --- a/tests/libtracker-data/tracker-sparql-test.c +++ b/tests/libtracker-data/tracker-sparql-test.c @@ -27,11 +27,7 @@ #include <libtracker-common/tracker-common.h> -#include <libtracker-data/tracker-data-manager.h> -#include <libtracker-data/tracker-data-query.h> -#include <libtracker-data/tracker-data-update.h> #include <libtracker-data/tracker-data.h> -#include <libtracker-data/tracker-sparql-query.h> static gchar *tests_data_dir = NULL; |