Commit ecac3a1e authored by Sam Thursfield's avatar Sam Thursfield

Revert "functional-tests: Don't depend on GSettings schemas from the host"

This reverts commit ad664049.

I accidentally pushed this to master without review, when I pushed the
trivial Meson change.

The merge request is here:
!61/
parent 60145ddd
Pipeline #78870 failed with stage
in 2 minutes and 23 seconds
......@@ -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()
......@@ -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)
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment