xserver: Branch 'master'

[GitLab Mirror]

 test/meson.build |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 0a005c4fe4fccc9bb6c3a5266065f8437621fdb9
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Apr 4 16:26:26 2019 -0700

    test: Fix meson build with xvfb disabled.
    
    Fixes #678
    
    Signed-off-by: Eric Anholt <eric at anholt.net>

diff --git a/test/meson.build b/test/meson.build
index 80e299241..344784734 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -36,14 +36,15 @@ rendercheck_tests = [
 ]
 
 rendercheck = find_program('rendercheck', required:false)
-xvfb_args = [
-    xvfb_server.full_path(),
-    '-screen',
-    'scrn',
-    '1280x1024x24',
-  ]
 
 if get_option('xvfb')
+    xvfb_args = [
+        xvfb_server.full_path(),
+        '-screen',
+        'scrn',
+        '1280x1024x24',
+    ]
+
     test('XTS',
         find_program('scripts/xvfb-piglit.sh'),
         env: piglit_env,