Skip test_distutils if bootstraping, use python3.X for regen-all

This commit is contained in:
Victor Stinner 2019-06-17 17:29:58 +02:00 committed by Miro Hrončok
parent 3a6f3f6941
commit 17d397670a

View File

@ -204,8 +204,8 @@ BuildRequires: python-pip-wheel
%endif %endif
%if %{without bootstrap} %if %{without bootstrap}
# for make regen-all # for make regen-all and distutils.tests.test_bdist_rpm
BuildRequires: python3 BuildRequires: python%{pyshortver}
%endif %endif
# ======================= # =======================
@ -625,7 +625,7 @@ BuildPython() {
%if %{without bootstrap} %if %{without bootstrap}
# Regenerate generated files (needs python3) # Regenerate generated files (needs python3)
%make_build regen-all PYTHON_FOR_REGEN="python3" %make_build regen-all PYTHON_FOR_REGEN="python%{pybasever}"
%endif %endif
@ -952,8 +952,14 @@ CheckPython() {
# https://bugzilla.redhat.com/show_bug.cgi?id=1678277 # https://bugzilla.redhat.com/show_bug.cgi?id=1678277
# test_asyncio skipped: # test_asyncio skipped:
# https://bugs.python.org/issue35998 # https://bugs.python.org/issue35998
# test_distutils
# distutils.tests.test_bdist_rpm tests fail when bootstraping the Python
# package: rpmbuild requires /usr/bin/pythonX.Y to be installed
LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \ LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \
-wW --slowest -j0 \ -wW --slowest -j0 \
%if %{with bootstrap}
-x test_distutils \
%endif
%ifarch %{arm} s390x %ifarch %{arm} s390x
-x test_gdb \ -x test_gdb \
%endif %endif