From 7e6460098a0c50f99c73b751c0b6d7941df46547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 10 Jul 2009 09:16:07 +0000
Subject: 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)
........
................
---
Lib/distutils/tests/test_build_ext.py | 9 +++++----
Misc/NEWS | 2 ++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index f0580c1..c671483 100644
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -359,6 +359,7 @@ class BuildExtTestCase(TempdirManager,
self.assertEquals(lastdir, 'bar')
def test_ext_fullpath(self):
+ ext = sysconfig.get_config_vars()['SO']
# building lxml.etree inplace
#etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
#etree_ext = Extension('lxml.etree', [etree_c])
@@ -369,14 +370,14 @@ class BuildExtTestCase(TempdirManager,
cmd.distribution.package_dir = {'': 'src'}
cmd.distribution.packages = ['lxml', 'lxml.html']
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')
self.assertEquals(wanted, path)
# building lxml.etree not inplace
cmd.inplace = 0
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')
self.assertEquals(wanted, path)
@@ -386,13 +387,13 @@ class BuildExtTestCase(TempdirManager,
cmd.distribution.packages = ['twisted', 'twisted.runner.portmap']
path = cmd.get_ext_fullpath('twisted.runner.portmap')
wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
- 'portmap.so')
+ 'portmap' + ext)
self.assertEquals(wanted, path)
# building twisted.runner.portmap inplace
cmd.inplace = 1
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)
def test_suite():
diff --git a/Misc/NEWS b/Misc/NEWS
index e650b33..e1dba94 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -866,6 +866,8 @@ Core and Builtins
Library
-------
+- Issue #6455: Fixed test_build_ext under win32.
+
- Issue #6413: Fixed the log level in distutils.dist for announce.
- Issue #6403: Fixed package path usage in build_ext.
--
cgit v0.12