summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--setup.cfg2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 4512ad47..9ef522a0 100644
--- a/Makefile
+++ b/Makefile
@@ -48,13 +48,13 @@ pep8:
test:
tox -e py27,py35 $(ARGS)
-TOX_SMOKE_ARGS = -n 6 -m "not expensive" --maxfail=3 $(ARGS)
+PYTEST_SMOKE_ARGS = -n 6 -m "not expensive" --maxfail=3 $(ARGS)
smoke:
- COVERAGE_NO_PYTRACER=1 tox -e py27,py34 -- $(TOX_SMOKE_ARGS)
+ COVERAGE_NO_PYTRACER=1 tox -q -e py27,py34 -- $(PYTEST_SMOKE_ARGS)
pysmoke:
- COVERAGE_NO_CTRACER=1 tox -e py27,py34 -- $(TOX_SMOKE_ARGS)
+ COVERAGE_NO_CTRACER=1 tox -q -e py27,py34 -- $(PYTEST_SMOKE_ARGS)
metacov:
COVERAGE_COVERAGE=yes tox $(ARGS)
diff --git a/setup.cfg b/setup.cfg
index 69c64e7e..0ab65b0e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[tool:pytest]
-addopts = -q -n3 --strict --no-flaky-report -rfe
+addopts = -q -n3 --strict --no-flaky-report -rfe --failed-first
markers =
expensive: too slow to run during "make smoke"