summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-09-13 07:48:22 (GMT)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-09-13 07:48:22 (GMT)
commit67af7f4eee2dafe205dfe9c899e8c335a1405d7e (patch)
tree8d8c3c925df799c7c31fa71968c44a903d9ef2fd /Lib
parent10f4f76b285f1972b1a84198b6d601c51bfc0d14 (diff)
downloadcpython-67af7f4eee2dafe205dfe9c899e8c335a1405d7e.zip
cpython-67af7f4eee2dafe205dfe9c899e8c335a1405d7e.tar.gz
cpython-67af7f4eee2dafe205dfe9c899e8c335a1405d7e.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')
-rw-r--r--Lib/distutils/tests/test_msvc9compiler.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/Lib/distutils/tests/test_msvc9compiler.py b/Lib/distutils/tests/test_msvc9compiler.py
index ec2b2e3..f1da843 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):