From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 23 Oct 2013 17:07:40 +0000 (+0200)
Subject: Issue #19340: Fix test_sysconfig when Python is built with an empty prefix.
X-Git-Tag: v3.3.3rc1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dde25c485158b652ed34581cb977eb5bd439ade0;p=thirdparty%2FPython%2Fcpython.git

Issue #19340: Fix test_sysconfig when Python is built with an empty prefix.
Patch by Sunny K.
---

diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 92193602f98a..03f67fd47667 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 7ac726e5cbf9..d56d78ee8557 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