summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-10-23 17:07:40 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2013-10-23 17:07:40 (GMT)
commitdde25c485158b652ed34581cb977eb5bd439ade0 (patch)
treec956128e7d928f28637db2397eaac690e18c5773
parent776b888071337401ca577d32e8d5c14bf16bd420 (diff)
downloadcpython-dde25c485158b652ed34581cb977eb5bd439ade0.zip
cpython-dde25c485158b652ed34581cb977eb5bd439ade0.tar.gz
cpython-dde25c485158b652ed34581cb977eb5bd439ade0.tar.bz2
Issue #19340: Fix test_sysconfig when Python is built with an empty prefix.
Patch by Sunny K.
-rw-r--r--Lib/test/test_sysconfig.py6
-rw-r--r--Misc/ACKS1
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 9219360..03f67fd 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -354,8 +354,10 @@ class TestSysConfig(unittest.TestCase):
self.assertTrue(os.path.exists(Python_h), Python_h)
self.assertTrue(sysconfig._is_python_source_dir(srcdir))
elif os.name == 'posix':
- self.assertEqual(os.path.dirname(sysconfig.get_makefile_filename()),
- srcdir)
+ makefile_dir = os.path.dirname(sysconfig.get_makefile_filename())
+ # Issue #19340: srcdir has been realpath'ed already
+ makefile_dir = os.path.realpath(makefile_dir)
+ self.assertEqual(makefile_dir, srcdir)
def test_srcdir_independent_of_cwd(self):
# srcdir should be independent of the current working directory
diff --git a/Misc/ACKS b/Misc/ACKS
index 7ac726e..d56d78e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -613,6 +613,7 @@ Sijin Joseph
Andreas Jung
Tattoo Mabonzo K.
Sarah K.
+Sunny K
Bohuslav Kabrda
Bob Kahn
Kurt B. Kaiser