aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-11-28 10:24:08 +0100
committerGitHub <noreply@github.com>2018-11-28 10:24:08 +0100
commita22df4896f6b83c8741203118790ae281716bca5 (patch)
tree9345580710742192f0fb6b53467ddcbb6a00ada9 /.travis.yml
parentbpo-33676: Fix dangling thread in _test_multiprocessing (GH-10755) (diff)
downloadcpython-a22df4896f6b83c8741203118790ae281716bca5.tar.gz
cpython-a22df4896f6b83c8741203118790ae281716bca5.tar.bz2
cpython-a22df4896f6b83c8741203118790ae281716bca5.zip
bpo-35240: Add "doctest" job to Travis CI (GH-10753)
Create a new "doctest" job in Travis CI to run "make doctest".
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml20
1 files changed, 16 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index ef3c2be5e58..c6e009291a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,20 @@ matrix:
- python -m pip install sphinx==1.8.2 blurb python-docs-theme
script:
- make check suspicious html SPHINXOPTS="-q -W -j4"
+ - os: linux
+ language: c
+ compiler: clang
+ env: TESTING=doctest
+ addons:
+ apt:
+ packages:
+ - xvfb
+ before_script:
+ - ./configure
+ - make -j4
+ - make -C Doc/ PYTHON=../python venv
+ script:
+ xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W -j4" doctest
- os: osx
language: c
compiler: clang
@@ -96,7 +110,7 @@ before_install:
- set -e
- |
# Check short-circuit conditions
- if [[ "${TESTING}" != "docs" ]]
+ if [[ "${TESTING}" != "docs" && "${TESTING}" != "doctest" ]]
then
if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]
then
@@ -121,6 +135,7 @@ before_install:
install:
- |
# Install OpenSSL as necessary
+ # Note: doctest needs OpenSSL
if [[ "${TESTING}" != "docs" ]]
then
# clang complains about unused-parameter a lot, redirect stderr
@@ -160,9 +175,6 @@ script:
XVFB_RUN=xvfb-run;
fi
$XVFB_RUN make buildbottest TESTOPTS="-j4 -uall,-cpu"
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
- $XVFB_RUN make PYTHON=../python SPHINXOPTS="-q -W -j4" -C Doc/ venv doctest
- fi
notifications:
email: false
irc: