From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 24 Jun 2018 15:53:42 +0000 (-0500)
Subject: [3.6] Enable GUI tests in VSTS Linux builds via xvfb-run (GH-7890)
X-Git-Tag: v3.6.7rc1~248
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36294d280af4b43638d65e5e916d54f173bb24bf;p=thirdparty%2FPython%2Fcpython.git

[3.6] Enable GUI tests in VSTS Linux builds via xvfb-run (GH-7890)

(cherry picked from commit 3f197f94d67be25d5489e14f2f06b4a00e818747)
---

diff --git a/.vsts/linux-buildbot.yml b/.vsts/linux-buildbot.yml
index 76222d10c48e..4c01bdd165d1 100644
--- a/.vsts/linux-buildbot.yml
+++ b/.vsts/linux-buildbot.yml
@@ -49,6 +49,7 @@ steps:
     liblzma-dev
     libffi-dev
     uuid-dev
+    xvfb
   displayName: 'Install dependencies'
 
 - script: ./configure --with-pydebug
@@ -60,5 +61,5 @@ steps:
 - script: make pythoninfo
   displayName: 'Display build info'
 
-- script: make buildbottest TESTOPTS="-j4 -uall,-cpu"
+- script: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu"
   displayName: 'Tests'
diff --git a/.vsts/linux-coverage.yml b/.vsts/linux-coverage.yml
index d16d9c9dfa20..1bf7ae737c5a 100644
--- a/.vsts/linux-coverage.yml
+++ b/.vsts/linux-coverage.yml
@@ -48,6 +48,7 @@ steps:
     liblzma-dev
     libffi-dev
     uuid-dev
+    xvfb
   displayName: 'Install dependencies'
 
 
@@ -63,7 +64,7 @@ steps:
 - script: ./venv/bin/python -m test.pythoninfo
   displayName: 'Display build info'
 
-- script: ./venv/bin/python -m coverage run --pylib -m test -uall,-cpu -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn -x test_concurrent_futures
+- script: xvfb-run./venv/bin/python -m coverage run --pylib -m test -uall,-cpu -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn -x test_concurrent_futures
   displayName: 'Tests with coverage'
 
 - script: source ./venv/bin/activate && bash <(curl -s https://codecov.io/bash)
diff --git a/.vsts/linux-deps.yml b/.vsts/linux-deps.yml
index 540b76ec54c3..d1922a7c3237 100644
--- a/.vsts/linux-deps.yml
+++ b/.vsts/linux-deps.yml
@@ -27,4 +27,5 @@ steps:
     liblzma-dev
     libffi-dev
     uuid-dev
+    xvfb
   displayName: 'Install dependencies'
diff --git a/.vsts/linux-pr.yml b/.vsts/linux-pr.yml
index 83df9b436881..110c188ab94f 100644
--- a/.vsts/linux-pr.yml
+++ b/.vsts/linux-pr.yml
@@ -48,6 +48,7 @@ steps:
     liblzma-dev
     libffi-dev
     uuid-dev
+    xvfb
   displayName: 'Install dependencies'
 
 
@@ -64,5 +65,5 @@ steps:
 - script: ./python Tools/scripts/patchcheck.py --travis true
   displayName: 'Run patchcheck.py'
 
-- script: make buildbottest TESTOPTS="-j4 -uall,-cpu"
+- script: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu"
   displayName: 'Tests'