summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/functional-tests/ipc/meson.build15
-rw-r--r--tests/functional-tests/ipc/test-bus-query-cancellation.c (renamed from tests/libtracker-sparql/tracker-gb-737023-test.c)0
-rw-r--r--tests/libtracker-sparql/Makefile.am3
-rw-r--r--tests/libtracker-sparql/meson.build1
4 files changed, 16 insertions, 3 deletions
diff --git a/tests/functional-tests/ipc/meson.build b/tests/functional-tests/ipc/meson.build
index 07d02f603..e0bbe4da6 100644
--- a/tests/functional-tests/ipc/meson.build
+++ b/tests/functional-tests/ipc/meson.build
@@ -1,3 +1,8 @@
+functional_ipc_test_c_args = [
+ '-DTEST_DOMAIN_ONTOLOGY_RULE="@0@/src/tracker-store/default.rule"'.format(source_root),
+ '-DTEST_ONTOLOGIES_DIR="@0@/src/ontologies/nepomuk"'.format(source_root),
+]
+
insert_or_replace_test = executable('test-insert-or-replace',
'test-insert-or-replace.vala',
dependencies: [tracker_common_dep, tracker_sparql_dep])
@@ -53,3 +58,13 @@ update_array_performance_test = executable('test-update-array-performance',
dependencies: [tracker_common_dep, tracker_sparql_dep])
test('functional-ipc-update-array-performance', update_array_performance_test,
env: test_env)
+
+bus_query_cancellation_test = executable('test-bus-query-cancellation',
+ 'test-bus-query-cancellation.c',
+ c_args: functional_ipc_test_c_args,
+ dependencies: [tracker_common_dep, tracker_sparql_dep])
+
+test('functional-ipc-bus-query-cancellation',
+ test_runner,
+ args: bus_query_cancellation_test,
+ env: test_env)
diff --git a/tests/libtracker-sparql/tracker-gb-737023-test.c b/tests/functional-tests/ipc/test-bus-query-cancellation.c
index 0955ffc25..0955ffc25 100644
--- a/tests/libtracker-sparql/tracker-gb-737023-test.c
+++ b/tests/functional-tests/ipc/test-bus-query-cancellation.c
diff --git a/tests/libtracker-sparql/Makefile.am b/tests/libtracker-sparql/Makefile.am
index 21ecca866..56f9349b5 100644
--- a/tests/libtracker-sparql/Makefile.am
+++ b/tests/libtracker-sparql/Makefile.am
@@ -4,8 +4,7 @@ noinst_PROGRAMS += $(test_programs)
test_programs = \
tracker-resource-test \
- tracker-sparql-test \
- tracker-gb-737023-test
+ tracker-sparql-test
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
diff --git a/tests/libtracker-sparql/meson.build b/tests/libtracker-sparql/meson.build
index 00a92dd25..49b28bc98 100644
--- a/tests/libtracker-sparql/meson.build
+++ b/tests/libtracker-sparql/meson.build
@@ -1,5 +1,4 @@
libtracker_sparql_tests = [
- 'gb-737023',
'resource',
'sparql',
]