summaryrefslogtreecommitdiff
path: root/patches/xserver-meson/0001-Ensure-tests-don-t-get-run-in-parallel.patch
blob: 5f41f249b4d836b860b02c4c0c1b58062a04d80f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
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 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/meson.build b/test/meson.build
index 690298b77..401225b52 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -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 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,
         )
 
         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