From 2b31e3b74c03fa4e728f458485df4bdcc30b5d61 Mon Sep 17 00:00:00 2001 From: Kyle Brenneman Date: Tue, 18 May 2021 16:52:39 -0600 Subject: [PATCH] tests: Work around a bug in Meson 0.58. Meson 0.58 doesn't accept an array within an array for the environment parameter to test(). See: https://github.com/mesonbuild/meson/issues/8727 Work around that by using "+" to join environment lists instead. Fixes https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/218 --- tests/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 3509a57..a1c1a70 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -98,7 +98,7 @@ if with_glx foreach t : [['basic', ['-t', '1', '-i', '1'], env_glx], ['loop', ['-t', '1', '-i', '250'], env_glx], - ['threads', ['-t', '5', '-i', '20000'], [env_glx, 'LD_PRELOAD=libpthread.so.0']], + ['threads', ['-t', '5', '-i', '20000'], env_glx + ['LD_PRELOAD=libpthread.so.0']], ] test( 'glxmakecurrent (@0@)'.format(t[0]),