]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #19340: Fix test_sysconfig when Python is built with an empty prefix.
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 23 Oct 2013 17:07:40 +0000 (19:07 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 23 Oct 2013 17:07:40 +0000 (19:07 +0200)
Patch by Sunny K.

Lib/test/test_sysconfig.py
Misc/ACKS

index 92193602f98ae072633f78702b24a84b91b17252..03f67fd476673e3007ea0466c13a1052e3965c9a 100644 (file)
@@ -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
index 7ac726e5cbf9769993e86c363a81266c8606c671..d56d78ee85571976a273e01a23c6c546518a5cb7 100644 (file)
--- 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