diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | ci/manylinux.sh | 4 | ||||
| -rw-r--r-- | coverage/env.py | 2 | ||||
| -rw-r--r-- | howto.txt | 4 | ||||
| -rw-r--r-- | metacov.ini | 1 |
5 files changed, 13 insertions, 5 deletions
@@ -73,13 +73,16 @@ DOCKER_RUN = docker run -it --init --rm -v `pwd`:/io RUN_MANYLINUX_X86 = $(DOCKER_RUN) quay.io/pypa/manylinux1_x86_64 /io/ci/manylinux.sh RUN_MANYLINUX_I686 = $(DOCKER_RUN) quay.io/pypa/manylinux1_i686 /io/ci/manylinux.sh -testmanylinux: +test_linux: # The Linux .pyc files clash with the host's because of file path # changes, so clean them before and after running tests. make clean_platform $(RUN_MANYLINUX_X86) test $(ARGS) make clean_platform +meta_linux: + ARGS="meta $(ARGS)" make test_linux + # Coverage measurement of coverage.py itself (meta-coverage). See metacov.ini # for details. @@ -97,7 +100,7 @@ kit: wheel: tox -c tox_wheels.ini $(ARGS) -manylinux: +kit_linux: $(RUN_MANYLINUX_X86) build $(RUN_MANYLINUX_I686) build diff --git a/ci/manylinux.sh b/ci/manylinux.sh index 31f3bed8..05d17948 100755 --- a/ci/manylinux.sh +++ b/ci/manylinux.sh @@ -40,6 +40,10 @@ elif [[ $action == "test" ]]; then cd /io export PYTHONPYCACHEPREFIX=/opt/pyc + if [[ $1 == "meta" ]]; then + shift + export COVERAGE_COVERAGE=yes + fi TOXWORKDIR=.tox_linux "$TOXBIN/tox" "$@" || true cd ~ diff --git a/coverage/env.py b/coverage/env.py index 03f76399..bb335ab3 100644 --- a/coverage/env.py +++ b/coverage/env.py @@ -9,7 +9,7 @@ import sys # Operating systems. WINDOWS = sys.platform == "win32" -LINUX = sys.platform == "linux2" +LINUX = sys.platform.startswith("linux") # Python implementations. PYPY = (platform.python_implementation() == 'PyPy') @@ -50,7 +50,7 @@ - Source kit and wheels: - $ make kit wheel - Linux wheels: - - $ make manylinux + - $ make kit_linux - Windows kits - wait for over an hour for Appveyor to build kits. - https://ci.appveyor.com/project/nedbat/coveragepy @@ -99,7 +99,7 @@ - $ tox - Testing on Linux: - - $ docker run -it --init --rm -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/ci/manylinux.sh test + - $ make test_linux - For complete coverage testing: diff --git a/metacov.ini b/metacov.ini index c9404612..52cb7200 100644 --- a/metacov.ini +++ b/metacov.ini @@ -84,3 +84,4 @@ source = *\coverage\trunk */coverage/trunk *\coveragepy + /io |