From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Wed, 7 Jan 2009 10:11:17 +0000 (+0000)
Subject: Merged revisions 68373 via svnmerge from
X-Git-Tag: v3.1a1~564
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1054f95b70abaa0353216c3c6ecd34dea92c5b5e;p=python

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.
........
---

diff --git a/Lib/distutils/tests/test_msvc9compiler.py b/Lib/distutils/tests/test_msvc9compiler.py
index 1659cea510..0c8bd6e042 100644
--- a/Lib/distutils/tests/test_msvc9compiler.py
+++ b/Lib/distutils/tests/test_msvc9compiler.py
@@ -13,6 +13,10 @@ class msvc9compilerTestCase(unittest.TestCase):
         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