Merged revisions 69304 via svnmerge from

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

........
  r69304 | neil.schemenauer | 2009-02-05 08:25:16 -0800 (Thu, 05 Feb 2009) | 4 lines

  Fix test_build_ext.py to work when building in a separate directory.
  Since "srcdir" should now be defined on all platforms, use it to
  find the module source.
........
This commit is contained in:
Collin Winter 2010-02-03 22:06:03 +00:00
parent 2905baff05
commit 54c45787e4
1 changed files with 9 additions and 6 deletions

View File

@ -13,11 +13,14 @@ from distutils.errors import DistutilsSetupError
import unittest import unittest
from test import test_support from test import test_support
# http://bugs.python.org/issue4373 # http://bugs.python.org/issue4373
# Don't load the xx module more than once. # Don't load the xx module more than once.
ALREADY_TESTED = False ALREADY_TESTED = False
def _get_source_filename():
srcdir = sysconfig.get_config_var('srcdir')
return os.path.join(srcdir, 'Modules', 'xxmodule.c')
class BuildExtTestCase(support.TempdirManager, class BuildExtTestCase(support.TempdirManager,
support.LoggingSilencer, support.LoggingSilencer,
unittest.TestCase): unittest.TestCase):
@ -28,9 +31,7 @@ class BuildExtTestCase(support.TempdirManager,
self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_") self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
self.sys_path = sys.path[:] self.sys_path = sys.path[:]
sys.path.append(self.tmp_dir) sys.path.append(self.tmp_dir)
shutil.copy(_get_source_filename(), self.tmp_dir)
xx_c = os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
shutil.copy(xx_c, self.tmp_dir)
def test_build_ext(self): def test_build_ext(self):
global ALREADY_TESTED global ALREADY_TESTED
@ -387,9 +388,11 @@ class BuildExtTestCase(support.TempdirManager,
self.assertEquals(ext_path, wanted) self.assertEquals(ext_path, wanted)
def test_suite(): def test_suite():
if not sysconfig.python_build: src = _get_source_filename()
if not os.path.exists(src):
if test_support.verbose: if test_support.verbose:
print 'test_build_ext: The test must be run in a python build dir' print ('test_build_ext: Cannot find source code (test'
' must run in python build dir)')
return unittest.TestSuite() return unittest.TestSuite()
else: return unittest.makeSuite(BuildExtTestCase) else: return unittest.makeSuite(BuildExtTestCase)