diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-10-18 16:55:02 +0800 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-10-18 17:30:20 +0200 |
| commit | 4a22704d82d5245cec9321b906941282fc714595 (patch) | |
| tree | 81005273e0f39d19d23e7e0d8a08f0b16d525a43 /testsuite/tools | |
| parent | f8f94ab329b1deb8d315cdb8689203c7bb4d1906 (diff) | |
| download | gtk+-4a22704d82d5245cec9321b906941282fc714595.tar.gz | |
Fix test environments
Diffstat (limited to 'testsuite/tools')
| -rw-r--r-- | testsuite/tools/meson.build | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build index 64724d292b..cfce7a3a1c 100644 --- a/testsuite/tools/meson.build +++ b/testsuite/tools/meson.build @@ -4,8 +4,6 @@ testdatadir = join_paths(installed_test_datadir, 'tools') bash = find_program('bash', required : false) if bash.found() test_env = environment() - test_env.set('GTK_BUILDER_TOOL', get_variable('gtk4_builder_tool').full_path()) - test_env.set('GTK_QUERY_SETTINGS', get_variable('gtk4_query_settings').full_path()) foreach t : ['simplify', 'settings'] configure_file(output: t, @@ -16,7 +14,15 @@ if bash.found() test(t, bash, args: 'test-@0@'.format(t), workdir: meson.current_build_dir(), - env: test_env, + env: [ 'GIO_USE_VOLUME_MONITOR=unix', + 'GSETTINGS_BACKEND=memory', + 'GTK_CSD=1', + 'G_ENABLE_DIAGNOSTIC=0', + 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), + 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), + 'GTK_BUILDER_TOOL=@0@'.format(get_variable('gtk4_builder_tool').full_path()), + 'GTK_QUERY_SETTINGS=@0@'.format(get_variable('gtk4_query_settings').full_path()) + ], suite: 'tools') endforeach endif |