diff options
| author | Timm Bäder <mail@baedert.org> | 2017-10-22 16:58:53 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2017-10-23 08:02:57 +0200 |
| commit | 9f1716edaad4b6fd75bb0ef7d220543b351a84bc (patch) | |
| tree | c5f315c490e73bd479b5308c46528375f072d9ca /testsuite/gsk | |
| parent | f59e5b2b31af0a43a7e1ff56bd09fdaefb957a48 (diff) | |
| download | gtk+-9f1716edaad4b6fd75bb0ef7d220543b351a84bc.tar.gz | |
testsuite: Disable vulkan tests when vulkan isn't available
They are always going to fail in that case anyway.
Diffstat (limited to 'testsuite/gsk')
| -rw-r--r-- | testsuite/gsk/meson.build | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build index 1bba9332f8..61c2a04a3d 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build @@ -22,25 +22,27 @@ test('nodes (cairo)', test_render_nodes, ], 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') +if have_vulkan + 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: [ '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('nodes (vulkan)', test_render_nodes, + 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=vulkan' + ], + suite: 'gsk') +endif test_data = [ 'blendmode.node', |