diff options
Diffstat (limited to 'patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch')
| -rw-r--r-- | patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch | 47 |
1 files changed, 37 insertions, 10 deletions
diff --git a/patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch b/patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch index c9c42c1..5f41f24 100644 --- a/patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch +++ b/patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch @@ -1,31 +1,58 @@ -From f6843f4c9707fa098edded26004d2c8d969b27ca Mon Sep 17 00:00:00 2001 +From c6cdbc4e6a2067e1289785a01de46428097ef5a4 Mon Sep 17 00:00:00 2001 From: Jon Turney <jon.turney@dronecode.org.uk> Date: Thu, 27 Sep 2018 17:15:49 +0100 Subject: [PATCH xserver] Ensure tests don't get run in parallel --- - test/meson.build | 2 ++ - 1 file changed, 2 insertions(+) + test/meson.build | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/meson.build b/test/meson.build -index 33b7941e0..a59cde782 100644 +index 690298b77..401225b52 100644 --- a/test/meson.build +++ b/test/meson.build -@@ -12,6 +12,7 @@ if get_option('xvfb') - test('xvfb-piglit', find_program('scripts/xvfb-piglit.sh'), +@@ -48,7 +48,8 @@ if get_option('xvfb') + find_program('scripts/xvfb-piglit.sh'), env: piglit_env, timeout: 1200, +- suite: 'xvfb' ++ suite: 'xvfb', + is_parallel: false, ) - if get_option('xephyr') and build_glamor -@@ -19,6 +20,7 @@ if get_option('xvfb') - find_program('scripts/xephyr-glamor-piglit.sh'), + if rendercheck.found() +@@ -63,7 +64,8 @@ if get_option('xvfb') + '--', + xvfb_args, + ], +- suite: 'xvfb' ++ suite: 'xvfb', ++ is_parallel: false, + ) + endforeach + endif +@@ -74,6 +76,7 @@ if get_option('xvfb') env: piglit_env, timeout: 1200, + suite: 'xephr-glamor', + is_parallel: false, ) - endif + + if rendercheck.found() +@@ -93,6 +96,7 @@ if get_option('xvfb') + ], + suite: 'xephr-glamor', + timeout: 300, ++ is_parallel: false, + ) + endforeach + endif +@@ -170,5 +174,5 @@ if build_xorg + link_with: xorg_link, + ) + +- test('unit', unit) ++ test('unit', unit, is_parallel: false) endif -- 2.17.0 |