diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-07-08 21:24:30 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-07-09 22:38:30 +0300 |
| commit | 706ebc37f87508a02c547a0fd27a59f31c7a7663 (patch) | |
| tree | 93f86b4fd1ff96cfac188dff6576dc5a18ab123f | |
| parent | b1fbbde0b097496b5113b50124b31f56fd4f76bb (diff) | |
| download | meson-706ebc37f87508a02c547a0fd27a59f31c7a7663.zip meson-706ebc37f87508a02c547a0fd27a59f31c7a7663.tar.gz meson-706ebc37f87508a02c547a0fd27a59f31c7a7663.tar.bz2 | |
Use pytest-xdist in Azure and Linux on Travis.
| -rw-r--r-- | ci/azure-steps.yml | 4 | ||||
| -rw-r--r-- | ciimage/Dockerfile | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml index 77f61fe..36e6fb4 100644 --- a/ci/azure-steps.yml +++ b/ci/azure-steps.yml @@ -154,6 +154,10 @@ steps: where.exe python python --version + # Needed for running unit tests in parallel. + python -m pip install --upgrade pytest-xdist + + echo "" echo "Locating cl, rc:" where.exe cl diff --git a/ciimage/Dockerfile b/ciimage/Dockerfile index d5f4816..dc66854 100644 --- a/ciimage/Dockerfile +++ b/ciimage/Dockerfile @@ -7,6 +7,7 @@ ENV DC=gdc RUN sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list" \ && apt-get -y update && apt-get -y upgrade \ && apt-get -y build-dep meson \ +&& apt-get -y install python3-pytest-xdist \ && apt-get -y install python3-pip libxml2-dev libxslt1-dev cmake libyaml-dev \ && python3 -m pip install hotdoc codecov \ && apt-get -y install wget unzip \ |