From: Hirokazu Yamamoto Date: Wed, 7 Jan 2009 10:31:11 +0000 (+0000) Subject: Merged revisions 68375 via svnmerge from X-Git-Tag: v3.0.1~157 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ec47825c78e1f2cc476b27d040dbe341fc5de52;p=thirdparty%2FPython%2Fcpython.git 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. ........ ................ --- diff --git a/Lib/distutils/tests/test_msvc9compiler.py b/Lib/distutils/tests/test_msvc9compiler.py index 1659cea51033..0c8bd6e0423b 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