[tracker-miners] Revert "functional-tests: Don't depend on GSettings schemas from the host"
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners] Revert "functional-tests: Don't depend on GSettings schemas from the host"
- Date: Wed, 1 May 2019 11:56:23 +0000 (UTC)
commit ecac3a1e8d97b76991e2d84d08a2fc24d07bbc32
Author: Sam Thursfield <sam afuera me uk>
Date: Wed May 1 13:55:19 2019 +0200
Revert "functional-tests: Don't depend on GSettings schemas from the host"
This reverts commit ad6640497c9d21d223567fb374028acdbb35d160.
I accidentally pushed this to master without review, when I pushed the
trivial Meson change.
The merge request is here:
https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/61/
data/meson.build | 27 +--------------------------
meson.build | 3 ---
tests/functional-tests/meson.build | 2 +-
3 files changed, 2 insertions(+), 30 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 9b4cd0aa4..246c3fa25 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -27,34 +27,9 @@ tracker_miners_settings_enums = custom_target('tracker-miners-common-settings-en
install: true,
install_dir: gsettings_schema_dir)
-
-# Compile schemas locally so that the functional-tests can use them without
-# them being installed into /usr.
-#
-if get_option('tracker_core') == 'subproject'
- # Here we do an ugly dance to place GSettings schemas from tracker
- # and tracker-miners into the same directory. The `glib-compile-schemas`
- # tool cannot combine schemas from multiple directories, and the
- # GSETTINGS_SCHEMA_DIR environment variable cannot point to multiple
- # directories, so this appears to be our only option.
-
- foreach schema : tracker_gsettings_schemas
- target = configure_file(
- input: schema,
- output: '@PLAINNAME@',
- copy: true)
- endforeach
-
- target = configure_file(
- input: tracker_store_settings_enums.full_path(),
- output: '@PLAINNAME@',
- copy: true)
-endif
-
+# for unit tests
custom_target('tracker-miners-compile-schemas',
output: 'gschemas.compiled',
command: [find_program('glib-compile-schemas'), meson.current_build_dir()],
build_by_default: true,
depends: tracker_miners_settings_enums)
-
-tracker_miners_uninstalled_gsettings_schema_dir = meson.current_build_dir()
diff --git a/meson.build b/meson.build
index 67346e1d4..bc2b2fe23 100644
--- a/meson.build
+++ b/meson.build
@@ -55,9 +55,6 @@ else
tracker_uninstalled_domain_rule = tracker_subproject.get_variable('tracker_uninstalled_domain_rule')
tracker_uninstalled_nepomuk_ontologies_dir =
tracker_subproject.get_variable('tracker_uninstalled_nepomuk_ontologies_dir')
tracker_uninstalled_stop_words_dir = tracker_subproject.get_variable('tracker_uninstalled_stop_words_dir')
-
- tracker_gsettings_schemas = tracker_subproject.get_variable('tracker_gsettings_schemas')
- tracker_store_settings_enums = tracker_subproject.get_variable('tracker_store_settings_enums')
endif
avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index 9e458552e..355d4bd66 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -69,7 +69,7 @@ tracker_extractors_dir = join_paths(meson.current_build_dir(), '..', '..', 'src'
test_env = environment()
test_env.set('DCONF_PROFILE', dconf_profile_full_path)
-test_env.set('GSETTINGS_SCHEMA_DIR', tracker_miners_uninstalled_gsettings_schema_dir)
+test_env.set('GSETTINGS_SCHEMA_DIR', join_paths(meson.build_root(), 'data'))
test_env.set('TRACKER_DB_ONTOLOGIES_DIR', tracker_uninstalled_nepomuk_ontologies_dir)
test_env.set('TRACKER_EXTRACTORS_DIR', tracker_extractors_dir)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]