projects / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| ee14ee66 MT |
1 | 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 |
| 2 | --- 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 | |
| 3 | +++ Python-2.7.2/Lib/distutils/tests/test_build_ext.py 2011-09-08 17:43:15.656441082 -0400 | |
| 4 | @@ -330,6 +332,7 @@ class BuildExtTestCase(support.TempdirMa | |
| 5 | self.assertEqual(lastdir, 'bar') | |
| 6 | ||
| 7 | def test_ext_fullpath(self): | |
| 8 | + debug_ext = sysconfig.get_config_var("DEBUG_EXT") | |
| 9 | ext = sysconfig.get_config_vars()['SO'] | |
| 10 | dist = Distribution() | |
| 11 | cmd = build_ext(dist) | |
| 12 | @@ -337,14 +340,14 @@ class BuildExtTestCase(support.TempdirMa | |
| 13 | cmd.distribution.package_dir = {'': 'src'} | |
| 14 | cmd.distribution.packages = ['lxml', 'lxml.html'] | |
| 15 | curdir = os.getcwd() | |
| 16 | - wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext) | |
| 17 | + wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + debug_ext + ext) | |
| 18 | path = cmd.get_ext_fullpath('lxml.etree') | |
| 19 | self.assertEqual(wanted, path) | |
| 20 | ||
| 21 | # building lxml.etree not inplace | |
| 22 | cmd.inplace = 0 | |
| 23 | cmd.build_lib = os.path.join(curdir, 'tmpdir') | |
| 24 | - wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext) | |
| 25 | + wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + debug_ext + ext) | |
| 26 | path = cmd.get_ext_fullpath('lxml.etree') | |
| 27 | self.assertEqual(wanted, path) | |
| 28 | ||
| 29 | @@ -354,13 +357,13 @@ class BuildExtTestCase(support.TempdirMa | |
| 30 | cmd.distribution.packages = ['twisted', 'twisted.runner.portmap'] | |
| 31 | path = cmd.get_ext_fullpath('twisted.runner.portmap') | |
| 32 | wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner', | |
| 33 | - 'portmap' + ext) | |
| 34 | + 'portmap' + debug_ext + ext) | |
| 35 | self.assertEqual(wanted, path) | |
| 36 | ||
| 37 | # building twisted.runner.portmap inplace | |
| 38 | cmd.inplace = 1 | |
| 39 | path = cmd.get_ext_fullpath('twisted.runner.portmap') | |
| 40 | - wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext) | |
| 41 | + wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + debug_ext + ext) | |
| 42 | self.assertEqual(wanted, path) | |
| 43 | ||
| 44 | def test_build_ext_inplace(self): | |
| 45 | @@ -373,8 +376,9 @@ class BuildExtTestCase(support.TempdirMa | |
| 46 | cmd.distribution.package_dir = {'': 'src'} | |
| 47 | cmd.distribution.packages = ['lxml', 'lxml.html'] | |
| 48 | curdir = os.getcwd() | |
| 49 | + debug_ext = sysconfig.get_config_var("DEBUG_EXT") | |
| 50 | ext = sysconfig.get_config_var("SO") | |
| 51 | - wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext) | |
| 52 | + wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + debug_ext + ext) | |
| 53 | path = cmd.get_ext_fullpath('lxml.etree') | |
| 54 | self.assertEqual(wanted, path) | |
| 55 | ||
| 56 | @@ -412,10 +416,11 @@ class BuildExtTestCase(support.TempdirMa | |
| 57 | dist = Distribution({'name': 'UpdateManager'}) | |
| 58 | cmd = build_ext(dist) | |
| 59 | cmd.ensure_finalized() | |
| 60 | + debug_ext = sysconfig.get_config_var("DEBUG_EXT") | |
| 61 | ext = sysconfig.get_config_var("SO") | |
| 62 | ext_name = os.path.join('UpdateManager', 'fdsend') | |
| 63 | ext_path = cmd.get_ext_fullpath(ext_name) | |
| 64 | - wanted = os.path.join(cmd.build_lib, 'UpdateManager', 'fdsend' + ext) | |
| 65 | + wanted = os.path.join(cmd.build_lib, 'UpdateManager', 'fdsend' + debug_ext + ext) | |
| 66 | self.assertEqual(ext_path, wanted) | |
| 67 | ||
| 68 | @unittest.skipUnless(sys.platform == 'win32', 'these tests require Windows') |