[Python-checkins] r68376 - in python/branches/release30-maint: Lib/distutils/tests/test_msvc9compiler.py

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Wed Jan  7 11:31:11 2009
New Revision: 68376

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

................
  r68375 | hirokazu.yamamoto | 2009-01-07 19:11:17 +0900 | 10 lines
  
  Merged revisions 68373 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r68373 | hirokazu.yamamoto | 2009-01-07 18:42:28 +0900 | 2 lines
    
    Issue #4864: test_msvc9compiler failed on VC6/7.
    Reviewed by Amaury Forgeot d'Arc.
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/distutils/tests/test_msvc9compiler.py

Modified: python/branches/release30-maint/Lib/distutils/tests/test_msvc9compiler.py
==============================================================================
--- python/branches/release30-maint/Lib/distutils/tests/test_msvc9compiler.py	(original)
+++ python/branches/release30-maint/Lib/distutils/tests/test_msvc9compiler.py	Wed Jan  7 11:31:11 2009
@@ -13,6 +13,10 @@
         if sys.platform != 'win32':
             # this test is only for win32
             return
+        from distutils.msvccompiler import get_build_version
+        if get_build_version() < 8.0:
+            # this test is only for MSVC8.0 or above
+            return
         from distutils.msvc9compiler import query_vcvarsall
         def _find_vcvarsall(version):
             return None