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 5b3f3e19fd140a950f8bc245f1aa287c6157f951..10fe02072539f42bafed40a0bf4b723169ca6b06 100644 (file)
--- 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__":