diff options
| author | dirkbaechle <devnull@localhost> | 2012-09-04 23:23:13 (GMT) |
|---|---|---|
| committer | dirkbaechle <devnull@localhost> | 2012-09-04 23:23:13 (GMT) |
| commit | 1c8744b6d4ec8812746415d1aae4f13e634809ca (patch) | |
| tree | 5d422a83251e4afe9a3941b3bb97a79fdb38765f /src/engine/SCons/Tool/msvsTests.py | |
| parent | a54670d821ac18abc3880ef9ca03c2f84edd5ae6 (diff) | |
| download | SCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.zip SCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.tar.gz SCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.tar.bz2 | |
- first swoop of changes for getting all Buildbot slaves to run successfully again
Diffstat (limited to 'src/engine/SCons/Tool/msvsTests.py')
| -rw-r--r-- | src/engine/SCons/Tool/msvsTests.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/SCons/Tool/msvsTests.py b/src/engine/SCons/Tool/msvsTests.py index 495fc24..232963c 100644 --- a/src/engine/SCons/Tool/msvsTests.py +++ b/src/engine/SCons/Tool/msvsTests.py @@ -551,11 +551,12 @@ class msvsTestCase(unittest.TestCase): debug("Testing for default version %s"%self.default_version) env = DummyEnv() v1 = get_default_version(env) - assert env['MSVS_VERSION'] == self.default_version, \ - ("env['MSVS_VERSION'] != self.default_version",self.default_version, env['MSVS_VERSION']) - assert env['MSVS']['VERSION'] == self.default_version, \ - ("env['MSVS']['VERSION'] != self.default_version",self.default_version, env['MSVS']['VERSION']) - assert v1 == self.default_version, (self.default_version, v1) + if v1: + assert env['MSVS_VERSION'] == self.default_version, \ + ("env['MSVS_VERSION'] != self.default_version",self.default_version, env['MSVS_VERSION']) + assert env['MSVS']['VERSION'] == self.default_version, \ + ("env['MSVS']['VERSION'] != self.default_version",self.default_version, env['MSVS']['VERSION']) + assert v1 == self.default_version, (self.default_version, v1) env = DummyEnv({'MSVS_VERSION':'7.0'}) v2 = get_default_version(env) |