From 7de1e8c3f56b71821d7e68636c10bec0e6bd12f3 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Fri, 19 Oct 2012 17:54:47 -0400 Subject: Fixed ICE-4897: replace novc6 by novc90 --- scripts/TestUtil.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/TestUtil.py') 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: -- cgit v1.2.3