Kaydet (Commit) 8c400011 authored tarafından Tarek Ziadé's avatar Tarek Ziadé

Fixed #6455 (the test shall use pyd files under win32, rather than so files)

üst ce32eb74
...@@ -362,6 +362,7 @@ class BuildExtTestCase(support.TempdirManager, ...@@ -362,6 +362,7 @@ class BuildExtTestCase(support.TempdirManager,
self.assertEquals(lastdir, 'bar') self.assertEquals(lastdir, 'bar')
def test_ext_fullpath(self): def test_ext_fullpath(self):
ext = sysconfig.get_config_vars()['SO']
# building lxml.etree inplace # building lxml.etree inplace
#etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c') #etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
#etree_ext = Extension('lxml.etree', [etree_c]) #etree_ext = Extension('lxml.etree', [etree_c])
...@@ -372,14 +373,14 @@ class BuildExtTestCase(support.TempdirManager, ...@@ -372,14 +373,14 @@ class BuildExtTestCase(support.TempdirManager,
cmd.distribution.package_dir = {'': 'src'} cmd.distribution.package_dir = {'': 'src'}
cmd.distribution.packages = ['lxml', 'lxml.html'] cmd.distribution.packages = ['lxml', 'lxml.html']
curdir = os.getcwd() curdir = os.getcwd()
wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so') wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
path = cmd.get_ext_fullpath('lxml.etree') path = cmd.get_ext_fullpath('lxml.etree')
self.assertEquals(wanted, path) self.assertEquals(wanted, path)
# building lxml.etree not inplace # building lxml.etree not inplace
cmd.inplace = 0 cmd.inplace = 0
cmd.build_lib = os.path.join(curdir, 'tmpdir') cmd.build_lib = os.path.join(curdir, 'tmpdir')
wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree.so') wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext)
path = cmd.get_ext_fullpath('lxml.etree') path = cmd.get_ext_fullpath('lxml.etree')
self.assertEquals(wanted, path) self.assertEquals(wanted, path)
...@@ -389,13 +390,13 @@ class BuildExtTestCase(support.TempdirManager, ...@@ -389,13 +390,13 @@ class BuildExtTestCase(support.TempdirManager,
cmd.distribution.packages = ['twisted', 'twisted.runner.portmap'] cmd.distribution.packages = ['twisted', 'twisted.runner.portmap']
path = cmd.get_ext_fullpath('twisted.runner.portmap') path = cmd.get_ext_fullpath('twisted.runner.portmap')
wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner', wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
'portmap.so') 'portmap' + ext)
self.assertEquals(wanted, path) self.assertEquals(wanted, path)
# building twisted.runner.portmap inplace # building twisted.runner.portmap inplace
cmd.inplace = 1 cmd.inplace = 1
path = cmd.get_ext_fullpath('twisted.runner.portmap') path = cmd.get_ext_fullpath('twisted.runner.portmap')
wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so') wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
self.assertEquals(wanted, path) self.assertEquals(wanted, path)
def test_compiler_deprecation_warning(self): def test_compiler_deprecation_warning(self):
......
...@@ -350,6 +350,8 @@ Core and Builtins ...@@ -350,6 +350,8 @@ Core and Builtins
Library Library
------- -------
- Issue #6455: Fixed test_build_ext under win32.
- Issue #6377: Enabled the compiler option, and deprecate its usage as an - Issue #6377: Enabled the compiler option, and deprecate its usage as an
attribute. attribute.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment