From 79f832f2f50b441cccf617954cdd51f411c68677 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sat, 30 Oct 2021 16:48:27 -0400
Subject: [PATCH] build: clean up the Makefile a bit

---
 Makefile  | 18 +++++-------------
 howto.txt |  3 ---
 setup.cfg |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 5f3d9596d..b1cc84968 100644
--- a/Makefile
+++ b/Makefile
@@ -44,24 +44,13 @@ $(CSS): $(SCSS)
 	pysassc --style=compact $(SCSS) $@
 	cp $@ tests/gold/html/styled
 
-LINTABLE = coverage tests igor.py setup.py __main__.py
-
 lint:					## Run linters and checkers.
 	tox -q -e lint
 
-test:
-	tox -q -e py39 $(ARGS)
-
-PYTEST_SMOKE_ARGS = -n 6 -m "not expensive" --maxfail=3 $(ARGS)
+PYTEST_SMOKE_ARGS = -n auto -m "not expensive" --maxfail=3 $(ARGS)
 
 smoke: 					## Run tests quickly with the C tracer in the lowest supported Python versions.
-	COVERAGE_NO_PYTRACER=1 tox -q -e py39 -- $(PYTEST_SMOKE_ARGS)
-
-pysmoke: 				## Run tests quickly with the Python tracer in the lowest supported Python versions.
-	COVERAGE_NO_CTRACER=1 tox -q -e py39 -- $(PYTEST_SMOKE_ARGS)
-
-metasmoke:
-	COVERAGE_NO_PYTRACER=1 ARGS="-e py39" make clean metacov metahtml
+	COVERAGE_NO_PYTRACER=1 tox -q -e py36 -- $(PYTEST_SMOKE_ARGS)
 
 # Coverage measurement of coverage.py itself (meta-coverage). See metacov.ini
 # for details.
@@ -72,6 +61,9 @@ metacov:				## Run meta-coverage, measuring ourself.
 metahtml:				## Produce meta-coverage HTML reports.
 	python igor.py combine_html
 
+metasmoke:
+	COVERAGE_NO_PYTRACER=1 ARGS="-e py39" make clean metacov metahtml
+
 PIP_COMPILE = pip-compile --upgrade --allow-unsafe
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: 				## update the *.pip files with the latest packages satisfying *.in files
diff --git a/howto.txt b/howto.txt
index 2ffd794ec..282bbda92 100644
--- a/howto.txt
+++ b/howto.txt
@@ -96,9 +96,6 @@
     - pip install -r requirements/dev.pip
     - $ tox
 
-- Testing on Linux:
-    - $ make test_linux
-
 - For complete coverage testing:
 
     $ make metacov
diff --git a/setup.cfg b/setup.cfg
index 47192429b..e8cd85514 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
 
 [tool:pytest]
-addopts = -q -n3 --strict-markers --force-flaky --no-flaky-report -rfeX --failed-first
+addopts = -q -n auto --strict-markers --force-flaky --no-flaky-report -rfeX --failed-first
 python_classes = *Test
 markers =
     expensive: too slow to run during "make smoke"