From 7545bdad3c97a759c533562850cf2afc166d87f6 Mon Sep 17 00:00:00 2001 From: Buildbot system user Date: Wed, 17 Apr 2019 13:34:17 +0000 Subject: Update patches --- .../0001-Disable-some-rendercheck-tests.patch | 41 ++++++++++++++++++++++ .../0001-meson-Increase-timeout-for-tests.patch | 41 ++++++++++++++++++++++ ...0001-meson-Increase-timeout-for-unit-test.patch | 33 ----------------- ...s-separate-rendercheck-f-and-o-options-wi.patch | 36 ------------------- 4 files changed, 82 insertions(+), 69 deletions(-) create mode 100644 patches/xserver-meson/0001-Disable-some-rendercheck-tests.patch create mode 100644 patches/xserver-meson/0001-meson-Increase-timeout-for-tests.patch delete mode 100644 patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch delete mode 100644 patches/xserver-meson/0001-tests-Always-separate-rendercheck-f-and-o-options-wi.patch diff --git a/patches/xserver-meson/0001-Disable-some-rendercheck-tests.patch b/patches/xserver-meson/0001-Disable-some-rendercheck-tests.patch new file mode 100644 index 0000000..70f5c9e --- /dev/null +++ b/patches/xserver-meson/0001-Disable-some-rendercheck-tests.patch @@ -0,0 +1,41 @@ +From 6f350a5e5c15aa777471335b0b0b9a84ef4142ff Mon Sep 17 00:00:00 2001 +From: Jon Turney +Date: Tue, 16 Apr 2019 22:32:03 +0100 +Subject: [PATCH xserver] Disable some rendercheck tests + +Disable some rendercheck tests which fail on Cygwin x86 +(some kind of maths/rounding issue, perhaps) +--- + test/meson.build | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/test/meson.build b/test/meson.build +index 35c77bfea..434e281c4 100644 +--- a/test/meson.build ++++ b/test/meson.build +@@ -11,17 +11,17 @@ piglit_env.set('XSERVER_BUILDDIR', meson.build_root()) + 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'], ++# ['blend/All/x8r8g8b8', '-t blend -f a8r8g8b8,x8r8g8b8'], + ['blend/All/a2r10g10b10', '-t blend -f a8r8g8b8,a2r10g10b10'], + ['blend/Clear', '-t blend -o clear'], +- ['blend/Src', '-t blend -o src'], +- ['blend/Over', '-t blend -o over'], ++# ['blend/Src', '-t blend -o src'], ++# ['blend/Over', '-t blend -o over'], + ['composite/Some/a8r8g8b8', '-t composite -f a8r8g8b8' + some_ops], +- ['composite/Some/x8r8g8b8', '-t composite -f a8r8g8b8,x8r8g8b8' + 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], + ['ca composite/Some/a8', '-t cacomposite -f a8r8g8b8,a8' + some_ops], +- ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8' + some_ops], ++# ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8' + some_ops], + ['ca composite/Some/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10' + some_ops], + ['fill', '-t fill'], + ['bug7366', '-t bug7366'], +-- +2.17.0 + diff --git a/patches/xserver-meson/0001-meson-Increase-timeout-for-tests.patch b/patches/xserver-meson/0001-meson-Increase-timeout-for-tests.patch new file mode 100644 index 0000000..0544f79 --- /dev/null +++ b/patches/xserver-meson/0001-meson-Increase-timeout-for-tests.patch @@ -0,0 +1,41 @@ +From 15e82789e7320584db64794cc305fc548a030f78 Mon Sep 17 00:00:00 2001 +From: Jon Turney +Date: Thu, 14 Mar 2019 22:48:36 +0000 +Subject: [PATCH xserver] meson: Increase timeout for tests + +Increase timeout for various tests +--- + test/meson.build | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/test/meson.build b/test/meson.build +index 213938311..35c77bfea 100644 +--- a/test/meson.build ++++ b/test/meson.build +@@ -66,6 +66,7 @@ if get_option('xvfb') + xvfb_args, + ], + suite: 'xvfb', ++ timeout: 1200, + is_parallel: false, + ) + endforeach +@@ -96,7 +97,7 @@ if get_option('xvfb') + xvfb_args, + ], + suite: 'xephr-glamor', +- timeout: 300, ++ timeout: 1200, + is_parallel: false, + ) + endforeach +@@ -175,5 +176,5 @@ if build_xorg + link_with: xorg_link, + ) + +- test('unit', unit, is_parallel: false) ++ test('unit', unit, is_parallel: false, timeout: 240) + endif +-- +2.17.0 + diff --git a/patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch b/patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch deleted file mode 100644 index 1426316..0000000 --- a/patches/xserver-meson/0001-meson-Increase-timeout-for-unit-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f700aa6c5cec22b22f02c3cdc5a2f209f7a32265 Mon Sep 17 00:00:00 2001 -From: Jon Turney -Date: Thu, 14 Mar 2019 22:48:36 +0000 -Subject: [PATCH xserver] meson: Increase timeout for tests - -Increase timeout for various tests ---- - test/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/meson.build b/test/meson.build -index 401225b52..c16eb434b 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -95,7 +95,7 @@ if get_option('xvfb') - xvfb_args, - ], - suite: 'xephr-glamor', -- timeout: 300, -+ timeout: 1200, - is_parallel: false, - ) - endforeach -@@ -174,5 +174,5 @@ if build_xorg - link_with: xorg_link, - ) - -- test('unit', unit, is_parallel: false) -+ test('unit', unit, is_parallel: false, timeout: 240) - endif --- -2.17.0 - diff --git a/patches/xserver-meson/0001-tests-Always-separate-rendercheck-f-and-o-options-wi.patch b/patches/xserver-meson/0001-tests-Always-separate-rendercheck-f-and-o-options-wi.patch deleted file mode 100644 index 5cca9d1..0000000 --- a/patches/xserver-meson/0001-tests-Always-separate-rendercheck-f-and-o-options-wi.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cdfc399788e56ec2a1943a88f53d00534704fb96 Mon Sep 17 00:00:00 2001 -From: Jon Turney -Date: Sun, 31 Mar 2019 16:35:16 +0100 -Subject: [PATCH xserver] tests: Always separate rendercheck -f and -o options - with a space - ---- - test/meson.build | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/test/meson.build b/test/meson.build -index c16eb434b..4f0711b08 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -17,12 +17,12 @@ rendercheck_tests = [ - ['blend/Src', '-t blend -o src'], - ['blend/Over', '-t blend -o over'], - ['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], -- ['ca composite/Some/a8', '-t cacomposite -f a8r8g8b8,a8' + some_ops], -- ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8' + some_ops], -- ['ca composite/Some/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10' + 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], -+ ['ca composite/Some/a8', '-t cacomposite -f a8r8g8b8,a8 ' + some_ops], -+ ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8 ' + some_ops], -+ ['ca composite/Some/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10 ' + some_ops], - ['fill', '-t fill'], - ['bug7366', '-t bug7366'], - ['destination coordinates', '-t dcoords'], --- -2.17.0 - -- cgit v1.2.3