From 8725c0148e08bf6a6b5edd6b4e883dac17643179 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 29 Sep 2023 21:00:41 +0200 Subject: [PATCH] gh-109566: Remove make testall Remove "make testall" target: use "make buildbottest" instead. --- Makefile.pre.in | 22 ++++--------------- ...-09-29-21-01-48.gh-issue-109566._enldb.rst | 2 ++ README.rst | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2023-09-29-21-01-48.gh-issue-109566._enldb.rst diff --git a/Makefile.pre.in b/Makefile.pre.in index d62b4d24b3e183..fa5b9e6654c26c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1853,21 +1853,6 @@ cleantest: all test: all $(TESTRUNNER) --fast-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS) -# Run the full test suite twice - once without .pyc files, and once with. -# In the past, we've had problems where bugs in the marshalling or -# elsewhere caused bytecode read from .pyc files to behave differently -# than bytecode generated directly from a .py source file. Sometimes -# the bytecode read from a .pyc file had the bug, sometimes the directly -# generated bytecode. This is sometimes a very shy bug needing a lot of -# sample data. -.PHONY: testall -testall: all - -find $(srcdir)/Lib -name '*.py[co]' -exec rm -f {} ';' || true - $(TESTPYTHON) -E $(srcdir)/Lib/compileall.py - -find $(srcdir)/Lib -name '*.py[co]' -exec rm -f {} ';' || true - $(TESTRUNNER) --slow-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS) - $(TESTRUNNER) --slow-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS) - # Run the test suite for both architectures in a Universal build on OSX. # Must be run on an Intel box. .PHONY: testuniversal @@ -1880,8 +1865,9 @@ testuniversal: all $(RUNSHARED) /usr/libexec/oah/translate \ ./$(BUILDPYTHON) -E -m test -j 0 -u all $(TESTOPTS) -# Like testall, but with only one pass and without multiple processes. -# Run an optional script to include information about the build environment. +# Like test, but using --slow-ci which enables all test resources and use +# longer timeout. Run an optional pybuildbot.identify script to include +# information about the build environment. .PHONY: buildbottest buildbottest: all -@if which pybuildbot.identify >/dev/null 2>&1; then \ @@ -1889,7 +1875,7 @@ buildbottest: all fi $(TESTRUNNER) --slow-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS) -# Like testall, but run Python tests with HOSTRUNNER directly. +# Like buildbottest, but run Python tests with HOSTRUNNER directly. .PHONY: hostrunnertest hostrunnertest: all $(RUNSHARED) $(HOSTRUNNER) ./$(BUILDPYTHON) -m test --slow-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS) diff --git a/Misc/NEWS.d/next/Build/2023-09-29-21-01-48.gh-issue-109566._enldb.rst b/Misc/NEWS.d/next/Build/2023-09-29-21-01-48.gh-issue-109566._enldb.rst new file mode 100644 index 00000000000000..1141a4738b3151 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2023-09-29-21-01-48.gh-issue-109566._enldb.rst @@ -0,0 +1,2 @@ +Remove ``make testall`` target: use ``make buildbottest`` instead. Patch by +Victor Stinner. diff --git a/README.rst b/README.rst index 208bf8cec444a3..921da30a920168 100644 --- a/README.rst +++ b/README.rst @@ -177,7 +177,7 @@ is printed about a failed test or a traceback or core dump is produced, something is wrong. By default, tests are prevented from overusing resources like disk space and -memory. To enable these tests, run ``make testall``. +memory. To enable these tests, run ``make buildbottest``. If any tests fail, you can re-run the failing test(s) in verbose mode. For example, if ``test_os`` and ``test_gdb`` failed, you can run::