[Python-checkins] cpython (merge 3.3 -> default): Issue #19340: Fix test_sysconfig when Python is built with an empty prefix.

[antoine.pitrou]

http://hg.python.org/cpython/rev/f797a14cbcfd
changeset:   86586:f797a14cbcfd
parent:      86584:5e606f093d8f
parent:      86585:ef6eb5ce4f8e
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Oct 23 19:08:07 2013 +0200
summary:
  Issue #19340: Fix test_sysconfig when Python is built with an empty prefix.
Patch by Sunny K.

files:
  Lib/test/test_sysconfig.py |  6 ++++--
  Misc/ACKS                  |  1 +
  2 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -352,8 +352,10 @@
             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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -630,6 +630,7 @@
 Andreas Jung
 Tattoo Mabonzo K.
 Sarah K.
+Sunny K
 Bohuslav Kabrda
 Alexey Kachayev
 Bob Kahn

-- 
Repository URL: http://hg.python.org/cpython