mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gh-93584: Make all install+tests targets depends on all (GH-93589)

Browse source 
All install targets use the "all" target as synchronization point to
prevent race conditions with PGO builds. PGO builds use recursive make,
which can lead to two parallel `./python setup.py build` processes that
step on each others toes.

"test" targets now correctly compile PGO build in a clean repo.
This commit is contained in:
Christian Heimes 2022-06-08 15:16:20 +02:00 • committed by GitHub
parent 875de61c29
commit 243ed5439c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Makefile.pre.in
View file

@ -580,8 +580,8 @@ LIBEXPAT_HEADERS= \
# Default target # Default target
all: @DEF_MAKE_ALL_RULE@ all: @DEF_MAKE_ALL_RULE@
build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks \ build_all: check-clean-src $(BUILDPYTHON) platform oldsharedmods sharedmods \
Programs/_testembed python-config gdbhooks Programs/_testembed python-config
build_wasm: check-clean-src $(BUILDPYTHON) platform oldsharedmods python-config build_wasm: check-clean-src $(BUILDPYTHON) platform oldsharedmods python-config
# Check that the source is clean when building out of source. # Check that the source is clean when building out of source.
@ -1663,7 +1663,7 @@ cleantest: all
# Run a basic set of regression tests. # Run a basic set of regression tests.
# This excludes some tests that are particularly resource-intensive. # This excludes some tests that are particularly resource-intensive.
test: @DEF_MAKE_RULE@ platform test: all
$(TESTRUNNER) $(TESTOPTS) $(TESTRUNNER) $(TESTOPTS)
# Run the full test suite twice - once without .pyc files, and once with. # Run the full test suite twice - once without .pyc files, and once with.
@ -1673,7 +1673,7 @@ test: @DEF_MAKE_RULE@ platform
# the bytecode read from a .pyc file had the bug, sometimes the directly # 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 # generated bytecode. This is sometimes a very shy bug needing a lot of
# sample data. # sample data.
testall: @DEF_MAKE_RULE@ platform testall: all
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
$(TESTPYTHON) -E $(srcdir)/Lib/compileall.py $(TESTPYTHON) -E $(srcdir)/Lib/compileall.py
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
@ -1682,7 +1682,7 @@ testall: @DEF_MAKE_RULE@ platform
# Run the test suite for both architectures in a Universal build on OSX. # Run the test suite for both architectures in a Universal build on OSX.
# Must be run on an Intel box. # Must be run on an Intel box.
testuniversal: @DEF_MAKE_RULE@ platform testuniversal: all
@if [ `arch` != 'i386' ]; then \ @if [ `arch` != 'i386' ]; then \
echo "This can only be used on OSX/i386" ;\ echo "This can only be used on OSX/i386" ;\
exit 1 ;\ exit 1 ;\
@ -1693,7 +1693,7 @@ testuniversal: @DEF_MAKE_RULE@ platform
# Like testall, but with only one pass and without multiple processes. # Like testall, but with only one pass and without multiple processes.
# Run an optional script to include information about the build environment. # Run an optional script to include information about the build environment.
buildbottest: all platform buildbottest: all
-@if which pybuildbot.identify >/dev/null 2>&1; then \ -@if which pybuildbot.identify >/dev/null 2>&1; then \
pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \ pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \
fi fi
@ -1708,7 +1708,7 @@ QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \
test_multiprocessing_forkserver \ test_multiprocessing_forkserver \
test_mailbox test_nntplib test_socket test_poll \ test_mailbox test_nntplib test_socket test_poll \
test_select test_zipfile test_concurrent_futures test_select test_zipfile test_concurrent_futures
quicktest: @DEF_MAKE_RULE@ platform quicktest: all
$(TESTRUNNER) $(QUICKTESTOPTS) $(TESTRUNNER) $(QUICKTESTOPTS)
# SSL tests # SSL tests
@ -1719,6 +1719,10 @@ multisslcompile: all
multissltest: all multissltest: all
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/ssl/multissltests.py $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/ssl/multissltests.py
# All install targets use the "all" target as synchronization point to
# prevent race conditions with PGO builds. PGO builds use recursive make,
# which can lead to two parallel `./python setup.py build` processes that
# step on each others toes.
install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKINSTALLLAST@ install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKINSTALLLAST@
if test "x$(ENSUREPIP)" != "xno" ; then \ if test "x$(ENSUREPIP)" != "xno" ; then \
case $(ENSUREPIP) in \ case $(ENSUREPIP) in \
@ -1747,7 +1751,7 @@ commoninstall: check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
# Install shared libraries enabled by Setup # Install shared libraries enabled by Setup
DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED) DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
oldsharedinstall: $(DESTSHARED) $(SHAREDMODS) oldsharedinstall: $(DESTSHARED) all
@for i in X $(SHAREDMODS); do \ @for i in X $(SHAREDMODS); do \
if test $$i != X; then \ if test $$i != X; then \
echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \ echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
@ -2153,7 +2157,7 @@ LIBPL= @LIBPL@
# pkgconfig directory # pkgconfig directory
LIBPC= $(LIBDIR)/pkgconfig LIBPC= $(LIBDIR)/pkgconfig
libainstall: @DEF_MAKE_RULE@ python-config libainstall: all python-config
@for i in $(LIBDIR) $(LIBPL) $(LIBPC) $(BINDIR); \ @for i in $(LIBDIR) $(LIBPL) $(LIBPC) $(BINDIR); \
do \ do \
if test ! -d $(DESTDIR)$$i; then \ if test ! -d $(DESTDIR)$$i; then \
@ -2207,7 +2211,7 @@ libainstall: @DEF_MAKE_RULE@ python-config
# Install the dynamically loadable modules # Install the dynamically loadable modules
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
sharedinstall: sharedmods sharedinstall: all
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
--prefix=$(prefix) \ --prefix=$(prefix) \
--install-scripts=$(BINDIR) \ --install-scripts=$(BINDIR) \
@ -2437,7 +2441,7 @@ distclean: clobber
-exec rm -f {} ';' -exec rm -f {} ';'
# Check that all symbols exported by libpython start with "Py" or "_Py" # Check that all symbols exported by libpython start with "Py" or "_Py"
smelly: @DEF_MAKE_RULE@ smelly: all
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/smelly.py $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/smelly.py
# Find files with funny names # Find files with funny names
@ -2472,7 +2476,7 @@ funny:
-o -print -o -print
# Perform some verification checks on any modified files. # Perform some verification checks on any modified files.
patchcheck: @DEF_MAKE_RULE@ patchcheck: all
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
check-limited-abi: all check-limited-abi: all

2
Misc/NEWS.d/next/Build/2022-06-08-14-28-03.gh-issue-93584.0xfHOK.rst Normal file
View file

@ -0,0 +1,2 @@
Address race condition in ``Makefile`` when installing a PGO build. All
``test`` and ``install`` targets now depend on ``all`` target.