summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2017-01-14 00:26:03 +0900
committerGitHub <noreply@github.com>2017-01-14 00:26:03 +0900
commitc03da8fdf4d785d93bd9b52fb9eb5ea89bd7ca99 (patch)
tree12a2f24bffef977444b25f14f2b643c242b098e4 /Makefile
parented6742fe2a19260857f23a70059d2b7838bf8bd3 (diff)
parent234379be9ee9479c407c7ccc644ecf70fa7078ba (diff)
downloadsphinx-git-c03da8fdf4d785d93bd9b52fb9eb5ea89bd7ca99.tar.gz
Merge branch 'stable' into 3256_update_release_script
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c515ce6eb..0b1a43435 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ PYTHON ?= python
DONT_CHECK = -i build -i dist -i sphinx/style/jquery.js \
-i sphinx/pycode/pgen2 -i sphinx/util/smartypants.py \
-i .ropeproject -i doc/_build -i tests/path.py \
- -i tests/coverage.py -i utils/convert.py \
+ -i utils/convert.py \
-i tests/typing_test_data.py \
-i tests/test_autodoc_py35.py \
-i tests/roots/test-warnings/undecodable.rst \
@@ -65,6 +65,7 @@ clean-testfiles:
rm -rf tests/.coverage
rm -rf tests/build
rm -rf .tox/
+ rm -rf .cache/
clean-buildfiles:
rm -rf build
@@ -79,14 +80,13 @@ reindent:
@$(PYTHON) utils/reindent.py -r -n .
test:
- @cd tests; $(PYTHON) run.py -I py35 -d -m '^[tT]est' $(TEST)
+ @cd tests; $(PYTHON) run.py --ignore py35 -v $(TEST)
test-async:
- @cd tests; $(PYTHON) run.py -d -m '^[tT]est' $(TEST)
+ @cd tests; $(PYTHON) run.py -v $(TEST)
covertest:
- @cd tests; $(PYTHON) run.py -d -m '^[tT]est' --with-coverage \
- --cover-package=sphinx $(TEST)
+ @cd tests; $(PYTHON) run.py -v --cov=sphinx --junitxml=.junit.xml $(TEST)
build:
@$(PYTHON) setup.py build