mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Merged revisions 72585 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72585 | tarek.ziade | 2009-05-12 19:07:14 +0200 (Tue, 12 May 2009) | 1 line

  fixed #5977: distutils build_ext.get_outputs was not using the inplace option
........
This commit is contained in:
Tarek Ziadé 2009-05-12 17:14:01 +00:00
parent 20b50b1984
commit ff0e5002ba
3 changed files with 87 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Lib/distutils/tests/test_build_ext.py
View file

@ -113,7 +113,7 @@ class BuildExtTestCase(TempdirManager,
else:
_config_vars['Py_ENABLE_SHARED'] = old_var
# make sur we get some lobrary dirs under solaris
# make sure we get some library dirs under solaris
self.assert_(len(cmd.library_dirs) > 0)
def test_user_site(self):
@ -282,13 +282,50 @@ class BuildExtTestCase(TempdirManager,
cmd.ensure_finalized()
self.assertEquals(cmd.get_source_files(), ['xxx'])
def test_compiler_option(self):
# cmd.compiler is an option and
# should not be overriden by a compiler instance
# when the command is run
dist = Distribution()
cmd = build_ext(dist)
cmd.compiler = 'unix'
cmd.ensure_finalized()
cmd.run()
self.assertEquals(cmd.compiler, 'unix')
def test_get_outputs(self):
modules = [Extension('foo', ['xxx'], optional=False)]
dist = Distribution({'name': 'xx', 'ext_modules': modules})
tmp_dir = self.mkdtemp()
c_file = os.path.join(tmp_dir, 'foo.c')
self.write_file(c_file, '')
ext = Extension('foo', [c_file], optional=False)
dist = Distribution({'name': 'xx',
'ext_modules': [ext]})
cmd = build_ext(dist)
cmd.ensure_finalized()
self.assertEquals(len(cmd.get_outputs()), 1)
if os.name == "nt":
cmd.debug = sys.executable.endswith("_d.exe")
cmd.build_lib = os.path.join(self.tmp_dir, 'build')
cmd.build_temp = os.path.join(self.tmp_dir, 'tempt')
# issue #5977 : distutils build_ext.get_outputs
# returns wrong result with --inplace
cmd.inplace = 1
cmd.run()
so_file = cmd.get_outputs()[0]
self.assert_(os.path.exists(so_file))
so_dir = os.path.dirname(so_file)
self.assertEquals(so_dir, os.getcwd())
cmd.inplace = 0
cmd.run()
so_file = cmd.get_outputs()[0]
self.assert_(os.path.exists(so_file))
so_dir = os.path.dirname(so_file)
self.assertEquals(so_dir, cmd.build_lib)
def test_suite():
src = _get_source_filename()
if not os.path.exists(src):