xserver: Branch 'master'

[GitLab Mirror]

 test/meson.build |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f1790339d0c4cf09aa1b3f68c01d66eab1901718
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Sun Mar 31 16:35:16 2019 +0100

    tests: Always separate rendercheck -f and -o options with a space

diff --git a/test/meson.build b/test/meson.build
index 690298b77..80e299241 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -8,7 +8,7 @@ piglit_env = environment()
 piglit_env.set('XSERVER_DIR', meson.source_root())
 piglit_env.set('XSERVER_BUILDDIR', meson.build_root())
 
-some_ops = '-o clear,src,dst,over,xor,disjointover'
+some_ops = ' -o clear,src,dst,over,xor,disjointover'
 rendercheck_tests = [
     ['blend/All/a8r8g8b8', '-t blend -f a8r8g8b8'],
     ['blend/All/x8r8g8b8', '-t blend -f a8r8g8b8,x8r8g8b8'],
@@ -16,7 +16,7 @@ rendercheck_tests = [
     ['blend/Clear', '-t blend -o clear'],
     ['blend/Src', '-t blend -o src'],
     ['blend/Over', '-t blend -o over'],
-    ['composite/Some/a8r8g8b8', '-t composite -f a8r8g8b8 ' + some_ops],
+    ['composite/Some/a8r8g8b8', '-t composite -f a8r8g8b8' + some_ops],
     ['composite/Some/x8r8g8b8', '-t composite -f a8r8g8b8,x8r8g8b8' + some_ops],
     ['composite/Some/a2r10g10b10', '-t composite -f a8r8g8b8,a2r10g10b10' + some_ops],
     ['ca composite/Some/a8r8g8b8', '-t cacomposite -f a8r8g8b8' + some_ops],