mirror of https://github.com/python/cpython
#6263 fixed syntax error in distutils.cygwinccompiler
This commit is contained in:
parent
2d36afd15e
commit
c7498f5aab
|
@ -81,7 +81,7 @@ def get_msvcr():
|
|||
# VS2008 / MSVC 9.0
|
||||
return ['msvcr90']
|
||||
else:
|
||||
raise ValueError("Unknown MS Compiler version %i " % msc_Ver)
|
||||
raise ValueError("Unknown MS Compiler version %s " % msc_ver)
|
||||
|
||||
|
||||
class CygwinCCompiler (UnixCCompiler):
|
||||
|
|
|
@ -8,7 +8,8 @@ import subprocess
|
|||
from distutils import cygwinccompiler
|
||||
from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
|
||||
CONFIG_H_OK, CONFIG_H_NOTOK,
|
||||
CONFIG_H_UNCERTAIN, get_versions)
|
||||
CONFIG_H_UNCERTAIN, get_versions,
|
||||
get_msvcr)
|
||||
from distutils.tests import support
|
||||
|
||||
class FakePopen(object):
|
||||
|
@ -113,6 +114,38 @@ class CygwinCCompilerTestCase(support.TempdirManager,
|
|||
res = get_versions()
|
||||
self.assertEquals(res[2], None)
|
||||
|
||||
def test_get_msvcr(self):
|
||||
|
||||
# none
|
||||
sys.version = ('2.6.1 (r261:67515, Dec 6 2008, 16:42:21) '
|
||||
'\n[GCC 4.0.1 (Apple Computer, Inc. build 5370)]')
|
||||
self.assertEquals(get_msvcr(), None)
|
||||
|
||||
# MSVC 7.0
|
||||
sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
|
||||
'[MSC v.1300 32 bits (Intel)]')
|
||||
self.assertEquals(get_msvcr(), ['msvcr70'])
|
||||
|
||||
# MSVC 7.1
|
||||
sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
|
||||
'[MSC v.1310 32 bits (Intel)]')
|
||||
self.assertEquals(get_msvcr(), ['msvcr71'])
|
||||
|
||||
# VS2005 / MSVC 8.0
|
||||
sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
|
||||
'[MSC v.1400 32 bits (Intel)]')
|
||||
self.assertEquals(get_msvcr(), ['msvcr80'])
|
||||
|
||||
# VS2008 / MSVC 9.0
|
||||
sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
|
||||
'[MSC v.1500 32 bits (Intel)]')
|
||||
self.assertEquals(get_msvcr(), ['msvcr90'])
|
||||
|
||||
# unknown
|
||||
sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
|
||||
'[MSC v.1999 32 bits (Intel)]')
|
||||
self.assertRaises(ValueError, get_msvcr)
|
||||
|
||||
def test_suite():
|
||||
return unittest.makeSuite(CygwinCCompilerTestCase)
|
||||
|
||||
|
|
|
@ -317,6 +317,8 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #6263: Fixed syntax error in distutils.cygwincompiler.
|
||||
|
||||
- Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$`
|
||||
in Makefiles. This prevents compile errors when using syntax like:
|
||||
`LDFLAGS='-rpath=\$$LIB:/some/other/path'`. Patch by Floris Bruynooghe.
|
||||
|
|
Loading…
Reference in New Issue