From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Wed, 4 Mar 2009 22:58:06 +0000 (+0000)
Subject: Merged revisions 70179 via svnmerge from
X-Git-Tag: 3.0~341
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=860d94dea7fc78bab8644feaea5535fb5e0e8512;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 70179 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r70179 | ronald.oussoren | 2009-03-04 23:57:10 +0100 (Wed, 04 Mar 2009) | 4 lines

  Fix for issue #5408. This only enables test_osx_env when the current build
  is actually a framework build on OSX (the only environment where this test
  is valid).
........
---

diff --git a/Lib/test/test_osx_env.py b/Lib/test/test_osx_env.py
index 5b3f3e19fd14..10fe02072539 100644
--- a/Lib/test/test_osx_env.py
+++ b/Lib/test/test_osx_env.py
@@ -27,7 +27,9 @@ class OSXEnvironmentVariableTestCase(unittest.TestCase):
         self._check_sys('PYTHONEXECUTABLE', '==', 'sys.executable')
 
 def test_main():
-    if sys.platform == 'darwin':
+    from distutils import sysconfig
+
+    if sys.platform == 'darwin' and sysconfig.get_config_var('WITH_NEXT_FRAMEWORK'):
         run_unittest(OSXEnvironmentVariableTestCase)
 
 if __name__ == "__main__":