From: Timm Bäder <mail@baedert.org>
Date: Wed, 14 Mar 2018 16:24:28 +0000 (+0100)
Subject: testsuite: Simplify GL test definition
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~986
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8b800fa775fa4d247e8202d227decb38c85f7ebb;p=gtk4.git

testsuite: Simplify GL test definition
---

diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 2bce64968e..b6347b83ff 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -32,27 +32,27 @@ test('nodes (cairo)', test_render_nodes,
 
 # Interesting render nodes proven to be rendered 'correctly' by the GL renderer.
 gl_tests = [
-  ['outset shadow simple', 'outset_shadow_simple.node', 'outset_shadow_simple.gl.png'],
-  ['outset shadow offset x', 'outset_shadow_offsetx.node', 'outset_shadow_offsetx.gl.png'],
-  ['outset shadow offset y', 'outset_shadow_offsety.node', 'outset_shadow_offsety.gl.png'],
-  ['outset shadow offset both', 'outset_shadow_offset_both.node', 'outset_shadow_offset_both.gl.png'],
-  ['outset shadow rounded1', 'outset_shadow_rounded1.node', 'outset_shadow_rounded1.gl.png'],
-  ['outset shadow rounded2', 'outset_shadow_rounded2.node', 'outset_shadow_rounded2.gl.png'],
-  ['outset shadow rounded top', 'outset_shadow_rounded_top.node', 'outset_shadow_rounded_top.gl.png'],
-  ['outset shadow blurred simple', 'outset_shadow_blurred_simple.node', 'outset_shadow_blurred_simple.gl.png'],
-  ['outset shadow blurred small', 'outset_shadow_blurred_small.node', 'outset_shadow_blurred_small.gl.png'],
-  ['outset shadow blurred offset', 'outset_shadow_blurred_offset.node', 'outset_shadow_blurred_offset.gl.png'],
-  ['outset shadow transformed', 'outset_shadow_translated.node', 'outset_shadow_translated.gl.png'],
-  ['Transform in Shadow', 'shadow_transform1.node', 'shadow_transform1.gl.png'],
-  ['Clipped crossfade', 'clipped_cross_fade.node', 'clipped_cross_fade.gl.png'],
-  ['Clipped rounded clip', 'clipped_rounded_clip.node', 'clipped_rounded_clip.gl.png'],
-  ['Transformed clipped rounded clip', 'transformed_clipped_rounded_clip.node', 'transformed_clipped_rounded_clip.gl.png'],
+  ['outset shadow simple',         'outset_shadow_simple'],
+  ['outset shadow offset x',       'outset_shadow_offsetx'],
+  ['outset shadow offset y',       'outset_shadow_offsety'],
+  ['outset shadow offset both',    'outset_shadow_offset_both'],
+  ['outset shadow rounded1',       'outset_shadow_rounded1'],
+  ['outset shadow rounded2',       'outset_shadow_rounded2'],
+  ['outset shadow rounded top',    'outset_shadow_rounded_top'],
+  ['outset shadow blurred simple', 'outset_shadow_blurred_simple'],
+  ['outset shadow blurred small',  'outset_shadow_blurred_small'],
+  ['outset shadow blurred offset', 'outset_shadow_blurred_offset'],
+  ['outset shadow transformed',    'outset_shadow_translated'],
+  ['Transform in Shadow',          'shadow_transform1'],
+  ['Clipped crossfade',            'clipped_cross_fade'],
+  ['Clipped rounded clip',         'clipped_rounded_clip'],
+  ['clipped rounded clip2',        'transformed_clipped_rounded_clip'],
 ]
 
 foreach gl_test : gl_tests
   test('GL ' + gl_test[0], compare_render,
-       args: [join_paths(meson.current_source_dir(), 'gl', gl_test[1]),
-              join_paths(meson.current_source_dir(), 'gl', gl_test[2])],
+       args: [join_paths(meson.current_source_dir(), 'gl', gl_test[1] + '.node'),
+              join_paths(meson.current_source_dir(), 'gl', gl_test[1] + '.gl.png')],
        env: [ 'GIO_USE_VOLUME_MONITOR=unix',
               'GSETTINGS_BACKEND=memory',
               'GTK_CSD=1',