rpms/python39
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skip test_bdist_rpm using test config rather than a patch

Browse Source 
Remove patch 137
This commit is contained in:
Petr Viktorin 2017-08-28 15:09:16 +02:00
parent 2c6abcc9a3
commit bbf2225353
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
00137-skip-distutils-tests-that-fail-in-rpmbuild.patch
View File

@ -1,12 +0,0 @@
diff -up Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py.skip-distutils-tests-that-fail-in-rpmbuild Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py
--- Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py.skip-distutils-tests-that-fail-in-rpmbuild 2011-09-03 12:16:40.000000000 -0400
+++ Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py 2011-09-10 05:04:56.328852558 -0400
@@ -23,6 +23,7 @@ setup(name='foo', version='0.1', py_modu
"""
+@unittest._skipInRpmBuild("don't try to nest one rpm build inside another rpm build")
class BuildRpmTestCase(support.TempdirManager,
support.EnvironGuard,
support.LoggingSilencer,
diff -up Python-3.2.2/Lib/distutils/tests/test_build_ext.py.skip-distutils-tests-that-fail-in-rpmbuild Python-3.2.2/Lib/distutils/tests/test_build_ext.py

7
python3.spec
View File

@ -285,10 +285,6 @@ Patch111: 00111-no-static-lib.patch
# these unittest hooks in their own "check" phases) # these unittest hooks in their own "check" phases)
Patch132: 00132-add-rpmbuild-hooks-to-unittest.patch Patch132: 00132-add-rpmbuild-hooks-to-unittest.patch
# 00137 #
# Some tests within distutils fail when run in an rpmbuild:
Patch137: 00137-skip-distutils-tests-that-fail-in-rpmbuild.patch
# 00155 # # 00155 #
# Avoid allocating thunks in ctypes unless absolutely necessary, to avoid # Avoid allocating thunks in ctypes unless absolutely necessary, to avoid
# generating SELinux denials on "import ctypes" and "import uuid" when # generating SELinux denials on "import ctypes" and "import uuid" when
@ -689,7 +685,6 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en
%endif %endif
%patch111 -p1 %patch111 -p1
%patch132 -p1 %patch132 -p1
%patch137 -p1
%patch155 -p1 %patch155 -p1
%patch157 -p1 %patch157 -p1
%patch160 -p1 %patch160 -p1
@ -1185,6 +1180,7 @@ CheckPython() {
LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \ LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \
-wW --slowest --findleaks \ -wW --slowest --findleaks \
-x test_distutils \ -x test_distutils \
-x test_bdist_rpm \
%ifarch ppc64le aarch64 %ifarch ppc64le aarch64
-x test_faulthandler \ -x test_faulthandler \
%endif %endif
@ -1679,6 +1675,7 @@ fi
- Rename patch files to be consistent - Rename patch files to be consistent
- Run autotools to generate the configure script before building - Run autotools to generate the configure script before building
- Merge lib64 patches (104 into 102) - Merge lib64 patches (104 into 102)
- Skip test_bdist_rpm using test config rather than a patch (removes patch 137)
* Mon Aug 28 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.2-12 * Mon Aug 28 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.2-12
- Use python3 style of calling super() without arguments in rpath - Use python3 style of calling super() without arguments in rpath