diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/IceGridAdmin.py | 4 | ||||
| -rw-r--r-- | scripts/IceStormUtil.py | 2 | ||||
| -rwxr-xr-x | scripts/TestUtil.py | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index cbb63dd222f..a00bf81bf53 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -71,7 +71,7 @@ def getDefaultLocatorProperty(): def startIceGridRegistry(testdir, dynamicRegistration = False): iceGrid = "" - if TestUtil.isVC6(): + if TestUtil.isVC90(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") @@ -156,7 +156,7 @@ def iceGridNodePropertiesOverride(): def startIceGridNode(testdir): iceGrid = "" - if TestUtil.isVC6(): + if TestUtil.isVC90(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridnode") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridnode") diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index 439611f4666..c55250987a3 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.py @@ -35,7 +35,7 @@ class IceStormUtil(object): self.toplevel = toplevel self.testdir = testdir self.iceBox = TestUtil.getIceBox() - if TestUtil.isVC6(): + if TestUtil.isVC90(): self.iceBoxAdmin = os.path.join(TestUtil.getServiceDir(), "iceboxadmin") self.iceStormAdmin = os.path.join(TestUtil.getServiceDir(), "icestormadmin") else: diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 3d59e01be4a..95a92d1e0c6 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -97,10 +97,10 @@ def isMINGW(): return False return getCppCompiler() == "MINGW" -def isVC6(): +def isVC90(): if not isWin32(): return False - return getCppCompiler() == "VC60" + return getCppCompiler() == "VC90" def isVS2010(): if not isWin32(): @@ -704,7 +704,7 @@ def getGlacier2Router(): return getIceExe("glacier2router") def getIceExe(name): - if isVC6() or isMINGW(): + if isVC90() or isMINGW(): return os.path.join(getServiceDir(), name) else: return os.path.join(getCppBinDir(), name) @@ -1730,8 +1730,8 @@ def runTests(start, expanded, num = 0, script = False): print("%s*** test only supported under Win32%s" % (prefix, suffix)) continue - if isVC6() and "novc6" in config: - print("%s*** test not supported with VC++ 6.0%s" % (prefix, suffix)) + if isVC90() and "novc90" in config: + print("%s*** test not supported with VC++ 9.0%s" % (prefix, suffix)) continue if isMINGW() and "nomingw" in config: |