diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-09-13 08:14:41 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-09-13 08:14:41 (GMT) |
| commit | 7968f26bcbad2ffc83e27afd4c165feb9f556aa4 (patch) | |
| tree | 737c9c510d3d32f0a4283bf1eac565ae857223b6 /Lib/distutils | |
| parent | cf6f7a08e3dfef4dc4879317dff2a20773f02c3d (diff) | |
| download | cpython-7968f26bcbad2ffc83e27afd4c165feb9f556aa4.zip cpython-7968f26bcbad2ffc83e27afd4c165feb9f556aa4.tar.gz cpython-7968f26bcbad2ffc83e27afd4c165feb9f556aa4.tar.bz2 | |
Merged revisions 84765 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84765 | hirokazu.yamamoto | 2010-09-13 16:18:30 +0900 | 2 lines
get_build_version() is needed even where sys.platform != "win32".
Try to fix buildbot error in other way.
........
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/tests/test_msvc9compiler.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Lib/distutils/tests/test_msvc9compiler.py b/Lib/distutils/tests/test_msvc9compiler.py index cd16251..c957954 100644 --- a/Lib/distutils/tests/test_msvc9compiler.py +++ b/Lib/distutils/tests/test_msvc9compiler.py @@ -62,10 +62,14 @@ _CLEANED_MANIFEST = """\ if sys.platform=="win32": from distutils.msvccompiler import get_build_version - -@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32") -@unittest.skipUnless(get_build_version()>=8.0, "These tests are only for" - " MSVC8.0 or above") + if get_build_version()>=8.0: + SKIP_MESSAGE = None + else: + SKIP_MESSAGE = "These tests are only for MSVC8.0 or above" +else: + SKIP_MESSAGE = "These tests are only for win32" + +@unittest.skipUnless(SKIP_MESSAGE is None, SKIP_MESSAGE) class msvc9compilerTestCase(support.TempdirManager, unittest.TestCase): |