Commit 0c03a817 authored by Tarek Ziadé's avatar Tarek Ziadé

Merged revisions 73923 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73923 | tarek.ziade | 2009-07-10 11:14:31 +0200 (Fri, 10 Jul 2009) | 9 lines

  Merged revisions 73921 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73921 | tarek.ziade | 2009-07-10 11:10:33 +0200 (Fri, 10 Jul 2009) | 1 line

    Fixed #6455 (the test shall use pyd files under win32, rather than so files)
  ........
................
parent 876d6d4f
...@@ -359,6 +359,7 @@ class BuildExtTestCase(TempdirManager, ...@@ -359,6 +359,7 @@ class BuildExtTestCase(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])
...@@ -369,14 +370,14 @@ class BuildExtTestCase(TempdirManager, ...@@ -369,14 +370,14 @@ class BuildExtTestCase(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)
...@@ -386,13 +387,13 @@ class BuildExtTestCase(TempdirManager, ...@@ -386,13 +387,13 @@ class BuildExtTestCase(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_suite(): def test_suite():
......
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