diff options
author | Éric Araujo <merwok@netwok.org> | 2011-08-21 15:02:07 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-08-21 15:02:07 (GMT) |
commit | 6e3ad8736ec4efcc471b3db38279ab56b7f12bef (patch) | |
tree | 54e12603ecf8a17467f6ddf4eca4f6ad9016ac6a /Lib/distutils | |
parent | 5fa8e7a559be10233c035ac2f29a9a87bf2c4eb7 (diff) | |
download | cpython-6e3ad8736ec4efcc471b3db38279ab56b7f12bef.zip cpython-6e3ad8736ec4efcc471b3db38279ab56b7f12bef.tar.gz cpython-6e3ad8736ec4efcc471b3db38279ab56b7f12bef.tar.bz2 |
Factor out the build_ext fixup for shared Python builds.
I need this to fix the failing test_install.
Diffstat (limited to 'Lib/distutils')
-rw-r--r-- | Lib/distutils/tests/support.py | 27 | ||||
-rw-r--r-- | Lib/distutils/tests/test_build_ext.py | 31 |
2 files changed, 33 insertions, 25 deletions
diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py index 4927711..ffef98b 100644 --- a/Lib/distutils/tests/support.py +++ b/Lib/distutils/tests/support.py @@ -1,5 +1,6 @@ """Support code for distutils test cases.""" import os +import sys import shutil import tempfile import unittest @@ -165,3 +166,29 @@ def _get_xxmodule_path(): for path in candidates: if os.path.exists(path): return path + + +def fixup_build_ext(cmd): + """Function needed to make build_ext tests pass on shared builds. + + When Python was build with --enable-shared, -L. is not good enough to find + the libpython<blah>.so. This is because regrtest runs it under a tempdir, + not in the top level where the .so lives. By the time we've gotten here, + Python's already been chdir'd to the tempdir. This function work arounds + that. Example use: + + cmd = build_ext(dist) + support.fixup_build_ext(cmd) + cmd.ensure_finalized() + """ + # To further add to the fun, we can't just add library_dirs to the + # Extension() instance because that doesn't get plumbed through to the + # final compiler command. + if (sysconfig.get_config_var('Py_ENABLE_SHARED') and + not sys.platform.startswith('win')): + runshared = sysconfig.get_config_var('RUNSHARED') + if runshared is None: + cmd.library_dirs = ['.'] + else: + name, equals, value = runshared.partition('=') + cmd.library_dirs = value.split(os.pathsep) diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index de53afb..8eb59b4 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -7,7 +7,7 @@ from distutils.core import Distribution from distutils.command.build_ext import build_ext from distutils import sysconfig from distutils.tests.support import (TempdirManager, LoggingSilencer, - copy_xxmodule_c) + copy_xxmodule_c, fixup_build_ext) from distutils.extension import Extension from distutils.errors import ( CompileError, DistutilsPlatformError, DistutilsSetupError, @@ -38,25 +38,6 @@ class BuildExtTestCase(TempdirManager, from distutils.command import build_ext build_ext.USER_BASE = site.USER_BASE - def _fixup_command(self, cmd): - # When Python was build with --enable-shared, -L. is not good enough - # to find the libpython<blah>.so. This is because regrtest runs it - # under a tempdir, not in the top level where the .so lives. By the - # time we've gotten here, Python's already been chdir'd to the - # tempdir. - # - # To further add to the fun, we can't just add library_dirs to the - # Extension() instance because that doesn't get plumbed through to the - # final compiler command. - if (sysconfig.get_config_var('Py_ENABLE_SHARED') and - not sys.platform.startswith('win')): - runshared = sysconfig.get_config_var('RUNSHARED') - if runshared is None: - cmd.library_dirs = ['.'] - else: - name, equals, value = runshared.partition('=') - cmd.library_dirs = value.split(os.pathsep) - def test_build_ext(self): global ALREADY_TESTED copy_xxmodule_c(self.tmp_dir) @@ -65,7 +46,7 @@ class BuildExtTestCase(TempdirManager, dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]}) dist.package_dir = self.tmp_dir cmd = build_ext(dist) - self._fixup_command(cmd) + fixup_build_ext(cmd) if os.name == "nt": # On Windows, we must build a debug version iff running # a debug build of Python @@ -162,9 +143,9 @@ class BuildExtTestCase(TempdirManager, # see if include_dirs and library_dirs # were set - self.assertTrue(lib in cmd.library_dirs) - self.assertTrue(lib in cmd.rpath) - self.assertTrue(incl in cmd.include_dirs) + self.assertIn(lib, cmd.library_dirs) + self.assertIn(lib, cmd.rpath) + self.assertIn(incl, cmd.include_dirs) def test_optional_extension(self): @@ -320,7 +301,7 @@ class BuildExtTestCase(TempdirManager, dist = Distribution({'name': 'xx', 'ext_modules': [ext]}) cmd = build_ext(dist) - self._fixup_command(cmd) + fixup_build_ext(cmd) cmd.ensure_finalized() self.assertEqual(len(cmd.get_outputs()), 1) |