summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2008-04-05 23:39:15 (GMT)
committerThomas Wouters <thomas@python.org>2008-04-05 23:39:15 (GMT)
commit2fab8f1abb1c5d51cfe3bbdc7a912e7c574ccf46 (patch)
treebece48e9859ee2f09b9d594d9b084e54d262d76e /Lib
parent9e0fa7a13ec3c4381ffa5d9b6f745415fc570d29 (diff)
downloadcpython-2fab8f1abb1c5d51cfe3bbdc7a912e7c574ccf46.zip
cpython-2fab8f1abb1c5d51cfe3bbdc7a912e7c574ccf46.tar.gz
cpython-2fab8f1abb1c5d51cfe3bbdc7a912e7c574ccf46.tar.bz2
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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/distutils/tests/test_sysconfig.py22
1 files changed, 21 insertions, 1 deletions
diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py
index d56f7e9..aa1187e 100644
--- a/Lib/distutils/tests/test_sysconfig.py
+++ b/Lib/distutils/tests/test_sysconfig.py
@@ -19,7 +19,27 @@ class SysconfigTestCase(unittest.TestCase):
# test for pythonxx.lib?
def test_get_python_inc(self):
- inc_dir = sysconfig.get_python_inc()
+ # The check for srcdir is copied from Python's setup.py,
+ # and is necessary to make this test pass when building
+ # Python in a directory other than the source directory.
+ (srcdir,) = sysconfig.get_config_vars('srcdir')
+ if not srcdir:
+ inc_dir = sysconfig.get_python_inc()
+ else:
+ # This test is not really a proper test: when building
+ # Python from source, even in the same directory,
+ # we won't be testing the same thing as when running
+ # distutils' tests on an installed Python. Nevertheless,
+ # let's try to do our best: if we are running Python's
+ # unittests from a build directory that is not the source
+ # directory, the normal inc_dir will exist, it will just not
+ # contain anything of interest.
+ inc_dir = sysconfig.get_python_inc()
+ self.assert_(os.path.isdir(inc_dir))
+ # Now test the source location, to make sure Python.h does
+ # exist.
+ inc_dir = os.path.join(os.getcwd(), srcdir, 'Include')
+ inc_dir = os.path.normpath(inc_dir)
self.assert_(os.path.isdir(inc_dir), inc_dir)
python_h = os.path.join(inc_dir, "Python.h")
self.assert_(os.path.isfile(python_h), python_h)