Fixed ICE-4897: replace novc6 by novc90

4 files changed, 47 insertions, 47 deletions

diff --git a/cpp/allTests.py b/cpp/allTests.py
index 7ce520ca015..b320e81271e 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -35,11 +35,11 @@ tests = [
     ("Slice/errorDetection", ["once"]),
     ("Slice/keyword", ["once"]),
     ("Slice/structure", ["once"]),
-    ("Ice/properties", ["once", "novc6", "nomingw"]),
+    ("Ice/properties", ["once", "nomingw"]),
     ("Ice/proxy", ["core"]),
     ("Ice/operations", ["core"]),
     ("Ice/exceptions", ["core"]),
-    ("Ice/ami", ["core", "novc6"]),
+    ("Ice/ami", ["core"]),
     ("Ice/info", ["core", "noipv6", "nocompress"]),
     ("Ice/inheritance", ["core"]),
     ("Ice/facets", ["core"]),
@@ -56,7 +56,7 @@ tests = [
     ("Ice/checksum", ["core"]),
     ("Ice/stream", ["core"]),
     ("Ice/hold", ["core"]),
-    ("Ice/custom", ["core", "novc6", "nossl"]),
+    ("Ice/custom", ["core", "nossl"]),
     ("Ice/retry", ["core"]),
     ("Ice/timeout", ["core"]),
     ("Ice/background", ["core", "nomingw"]),
@@ -66,48 +66,48 @@ tests = [
     ("Ice/udp", ["core"]),
     ("Ice/defaultServant", ["core"]),
     ("Ice/defaultValue", ["core"]),
-    ("Ice/invoke", ["core", "novc6"]),
+    ("Ice/invoke", ["core"]),
     ("Ice/plugin", ["core"]),
     ("Ice/hash", ["once"]),
     ("Ice/admin", ["core"]),
     ("Ice/metrics", ["core", "nossl", "noipv6"]),
     ("Ice/enums", ["once"]),
     ("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl
-    ("IceBox/configuration", ["core", "noipv6", "novc6", "nomingw", "nomx"]),
-    ("IceBox/admin", ["core", "noipv6", "novc6", "nomingw", "nomx"]),
-    ("Freeze/dbmap", ["once", "novc6", "nomingw"]),
-    ("Freeze/complex", ["once", "novc6", "nomingw"]),
-    ("Freeze/evictor", ["core", "novc6", "nomingw"]),
-    ("Freeze/fileLock", ["core", "novc6", "nomingw"]),
-    ("IceStorm/single", ["service", "novc6", "noappverifier", "nomingw"]),  # This test doesn't work with appverifier is sensitive to timeouts.
-    ("IceStorm/federation", ["service", "novc6", "nomingw"]),
-    ("IceStorm/federation2", ["service", "novc6", "nomingw"]),
-    ("IceStorm/stress", ["service", "stress", "novc6", "noappverifier", "nomingw"]), # This test is very slow with appverifier.
-    ("IceStorm/rep1", ["service", "novc6", "nomingw"]),
-    ("IceStorm/repgrid", ["service", "novc6", "nomingw"]),
-    ("IceStorm/repstress", ["service", "noipv6", "stress", "novc6", "nomingw"]),
-    ("FreezeScript/dbmap", ["once", "novc6", "nomingw"]),
-    ("FreezeScript/evictor", ["once", "novc6", "nomingw"]),
-    ("IceGrid/simple", ["service", "novc6", "nomingw"]),
-    ("IceGrid/fileLock", ["service", "novc6", "nomingw"]),
-    ("IceGrid/deployer", ["service", "novc6", "nomingw"]),
-    ("IceGrid/session", ["service", "novc6", "nomingw"]),
-    ("IceGrid/update", ["service", "novc6", "nomingw"]),
-    ("IceGrid/noRestartUpdate", ["service", "novc6", "nomingw"]),
-    ("IceGrid/activation", ["service", "novc6", "nomingw"]),
-    ("IceGrid/replicaGroup", ["service", "novc6", "nomingw"]),
-    ("IceGrid/replication", ["service", "novc6", "nomingw", "nomx"]),
-    ("IceGrid/allocation", ["service", "novc6", "nomingw"]),
-    ("IceGrid/distribution", ["service", "novc6", "nomingw"]),
-    ("IceGrid/admin", ["service", "novc6", "nomingw"]),
-    ("Glacier2/router", ["service", "novc6", "nomingw"]),
-    ("Glacier2/attack", ["service", "novc6", "nomingw", "nomx"]),
-    ("Glacier2/override", ["service", "novc6", "nomingw"]),
-    ("Glacier2/sessionControl", ["service", "novc6", "nomingw"]),
-    ("Glacier2/ssl", ["service", "novalgrind", "novc6", "nomingw"]), # valgrind doesn't work well with openssl
-    ("Glacier2/dynamicFiltering", ["service", "novc6", "nomingw"]),
-    ("Glacier2/staticFiltering", ["service", "noipv6", "novc6", "nomingw", "nomx"]),
-    ("Glacier2/sessionHelper", ["service", "novc6", "nomingw"]),
+    ("IceBox/configuration", ["core", "noipv6", "novc90", "nomingw", "nomx"]),
+    ("IceBox/admin", ["core", "noipv6", "novc90", "nomingw", "nomx"]),
+    ("Freeze/dbmap", ["once", "novc90", "nomingw"]),
+    ("Freeze/complex", ["once", "novc90", "nomingw"]),
+    ("Freeze/evictor", ["core", "novc90", "nomingw"]),
+    ("Freeze/fileLock", ["core", "novc90", "nomingw"]),
+    ("IceStorm/single", ["service", "novc90", "noappverifier", "nomingw"]),  # This test doesn't work with appverifier is sensitive to timeouts.
+    ("IceStorm/federation", ["service", "novc90", "nomingw"]),
+    ("IceStorm/federation2", ["service", "novc90", "nomingw"]),
+    ("IceStorm/stress", ["service", "stress", "novc90", "noappverifier", "nomingw"]), # This test is very slow with appverifier.
+    ("IceStorm/rep1", ["service", "novc90", "nomingw"]),
+    ("IceStorm/repgrid", ["service", "novc90", "nomingw"]),
+    ("IceStorm/repstress", ["service", "noipv6", "stress", "novc90", "nomingw"]),
+    ("FreezeScript/dbmap", ["once", "novc90", "nomingw"]),
+    ("FreezeScript/evictor", ["once", "novc90", "nomingw"]),
+    ("IceGrid/simple", ["service", "novc90", "nomingw"]),
+    ("IceGrid/fileLock", ["service", "novc90", "nomingw"]),
+    ("IceGrid/deployer", ["service", "novc90", "nomingw"]),
+    ("IceGrid/session", ["service", "novc90", "nomingw"]),
+    ("IceGrid/update", ["service", "novc90", "nomingw"]),
+    ("IceGrid/noRestartUpdate", ["service", "novc90", "nomingw"]),
+    ("IceGrid/activation", ["service", "novc90", "nomingw"]),
+    ("IceGrid/replicaGroup", ["service", "novc90", "nomingw"]),
+    ("IceGrid/replication", ["service", "novc90", "nomingw", "nomx"]),
+    ("IceGrid/allocation", ["service", "novc90", "nomingw"]),
+    ("IceGrid/distribution", ["service", "novc90", "nomingw"]),
+    ("IceGrid/admin", ["service", "novc90", "nomingw"]),
+    ("Glacier2/router", ["service", "novc90", "nomingw"]),
+    ("Glacier2/attack", ["service", "novc90", "nomingw", "nomx"]),
+    ("Glacier2/override", ["service", "novc90", "nomingw"]),
+    ("Glacier2/sessionControl", ["service", "novc90", "nomingw"]),
+    ("Glacier2/ssl", ["service", "novalgrind", "novc90", "nomingw"]), # valgrind doesn't work well with openssl
+    ("Glacier2/dynamicFiltering", ["service", "novc90", "nomingw"]),
+    ("Glacier2/staticFiltering", ["service", "noipv6", "novc90", "nomingw", "nomx"]),
+    ("Glacier2/sessionHelper", ["service", "novc90", "nomingw"]),
     ]
 
 #
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: