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/gsk | |
| parent | f8f94ab329b1deb8d315cdb8689203c7bb4d1906 (diff) | |
| download | gtk+-4a22704d82d5245cec9321b906941282fc714595.tar.gz | |
Fix test environments
Diffstat (limited to 'testsuite/gsk')
| -rw-r--r-- | testsuite/gsk/meson.build | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build index 7b932d3f7b..8e4e39754c 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build @@ -10,28 +10,36 @@ test_render_nodes = executable( install_dir: testexecdir ) -cairo_test_env = environment() -cairo_test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) -cairo_test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -cairo_test_env.set('GSETTINGS_BACKEND', 'memory') -cairo_test_env.set('G_ENABLE_DIAGNOSTIC', '0') -cairo_test_env.set('GSK_RENDERER', 'cairo') - test('nodes (cairo)', test_render_nodes, - args: [ '--tap', '-k' ], - env: cairo_test_env, - suite: 'gsk') + args: [ '--tap', '-k' ], + 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()), + 'GSK_RENDERER=cairo' + ], + suite: 'gsk') vulkan_test_env = environment() vulkan_test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) vulkan_test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) vulkan_test_env.set('GSETTINGS_BACKEND', 'memory') +vulkan_test_env.set('GTK_CSD', '1') vulkan_test_env.set('G_ENABLE_DIAGNOSTIC', '0') vulkan_test_env.set('GSK_RENDERER', 'vulkan') test('nodes (vulkan)', test_render_nodes, args: [ '--tap', '-k' ], - env: vulkan_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()), + 'GSK_RENDERER=vulkan' + ], suite: 'gsk') test_data = [ |