Merged revisions 62179 via svnmerge from

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

........
  r62179 | thomas.wouters | 2008-04-06 01:39:15 +0200 (Sun, 06 Apr 2008) | 10 lines


  Fix test_distutils to not fail when running 'make test' from a Python build
  directory that is not the source directory (ie, one created using
  '/path/to/source/configure'.) Leaves this test very slightly degraded in
  that particular case, compared to the build-in-sourcedir case, but that case
  isn't a particularly strong test either: neither test the actual path that
  will be used after installing. There isn't a particularly good way to test
  this, and a poor test beats a failing test.
........
This commit is contained in:
Thomas Wouters 2008-04-07 00:25:59 +00:00
parent 5358434fd3
commit e9edcc4019
2 changed files with 23 additions and 1 deletions

View file

@ -119,6 +119,8 @@ class PyBuildExt(build_ext):
raise ValueError("No source directory; cannot proceed.")
# Figure out the location of the source code for extension modules
# (This logic is copied in distutils.test.test_sysconfig,
# so building in a separate directory does not break test_distutils.)
moddir = os.path.join(os.getcwd(), srcdir, 'Modules')
moddir = os.path.normpath(moddir)
srcdir, tail = os.path.split(moddir)