[Python-checkins] [3.6] Enable GUI testing on Travis Linux builds via Xvfb (GH-7887)

Thu Jul 19 22:51:21 EDT 2018

https://github.com/python/cpython/commit/226f064551330e2d78de7b873e37863f1621aa1d
commit: 226f064551330e2d78de7b873e37863f1621aa1d
branch: 3.6
author: Zachary Ware <zachary.ware at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018年07月19日T21:51:18-05:00
summary:
[3.6] Enable GUI testing on Travis Linux builds via Xvfb (GH-7887)
(cherry picked from commit b12112b5ba608cdd7a0962a6b18cad4fe58b46e6)
files:
M .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 2ced4d0b97f6..ed4e46c782f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,10 @@ matrix:
 # compiler here and the other to run the coverage build. Clang is preferred
 # in this instance for its better error messages.
 env: TESTING=cpython
+ addons:
+ apt:
+ packages:
+ - xvfb
 - os: linux
 language: python
 python: 3.6
@@ -46,6 +50,10 @@ matrix:
 language: c
 compiler: gcc
 env: OPTIONAL=true
+ addons:
+ apt:
+ packages:
+ - xvfb
 before_script:
 - ./configure PYTHON_FOR_REGEN=python3
 - make -s -j4
@@ -55,7 +63,7 @@ matrix:
 - ./venv/bin/python -m test.pythoninfo
 script:
 # Skip tests that re-run the entire test suite.
- - ./venv/bin/python -m coverage run --pylib -m test -uall,-cpu -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn
+ - 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
 after_script: # Probably should be after_success once test suite updated to run under coverage.py.
 # Make the `coverage` command available to Codecov w/ a version of Python that can parse all source files.
 - source ./venv/bin/activate
@@ -113,7 +121,7 @@ script:
 # Check that all symbols exported by libpython start with "Py" or "_Py"
 - make smelly
 # `-r -w` implicitly provided through `make buildbottest`.
- - make buildbottest TESTOPTS="-j4 -uall,-cpu"
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then XVFB_RUN=xvfb-run; fi; $XVFB_RUN make buildbottest TESTOPTS="-j4 -uall,-cpu"
 
 notifications:
 email: false
