python2/00137-skip-distutils-tests-...

23 lines
1.4 KiB
Diff

diff -up Python-2.7.2/Lib/distutils/tests/test_bdist_rpm.py.mark-tests-that-fail-in-rpmbuild Python-2.7.2/Lib/distutils/tests/test_bdist_rpm.py
--- Python-2.7.2/Lib/distutils/tests/test_bdist_rpm.py.mark-tests-that-fail-in-rpmbuild 2011-09-08 17:28:19.170502386 -0400
+++ Python-2.7.2/Lib/distutils/tests/test_bdist_rpm.py 2011-09-08 17:48:40.608418864 -0400
@@ -24,6 +24,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.LoggingSilencer,
unittest.TestCase):
diff -up Python-2.7.2/Lib/distutils/tests/test_build_ext.py.mark-tests-that-fail-in-rpmbuild Python-2.7.2/Lib/distutils/tests/test_build_ext.py
--- Python-2.7.2/Lib/distutils/tests/test_build_ext.py.mark-tests-that-fail-in-rpmbuild 2011-09-08 16:07:25.033834312 -0400
+++ Python-2.7.2/Lib/distutils/tests/test_build_ext.py 2011-09-08 17:43:15.656441082 -0400
@@ -69,6 +69,7 @@ class BuildExtTestCase(support.TempdirMa
name, equals, value = runshared.partition('=')
cmd.library_dirs = value.split(os.pathsep)
+ @unittest._skipInRpmBuild('fails when run from build dir with /usr/bin/ld: cannot find -lpython2.7')
@unittest.skipIf(not os.path.exists(_XX_MODULE_PATH),
'xxmodule.c not found')
def test_build_ext(self):