1 files changed, 61 insertions, 61 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py
index d05cb856291..fefa82f46c2 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -24,66 +24,66 @@ import TestUtil
 # List of all basic tests.
 #
 tests = [ 
-    "IceUtil/thread", 
-    "IceUtil/unicode",
-    "IceUtil/inputUtil", 
-    "IceUtil/uuid",
-    "IceUtil/timer",
-    "Slice/errorDetection",
-    "Slice/keyword",
-    "Ice/proxy",
-    "Ice/operations",
-    "Ice/exceptions",
-    "Ice/inheritance",
-    "Ice/facets",
-    "Ice/objects",
-    "Ice/binding",
-    "Ice/faultTolerance",
-    "Ice/location",
-    "Ice/adapterDeactivation",
-    "Ice/slicing/exceptions",
-    "Ice/slicing/objects",
-    "Ice/gc",
-    "Ice/checksum",
-    "Ice/stream",
-    "Ice/hold",
-    "Ice/custom",
-    "Ice/retry",
-    "Ice/timeout",
-    "Ice/background",
-    "Ice/servantLocator",
-    "Ice/interceptor",
-    "Ice/stringConverter",
-    "IceSSL/configuration",
-    "IceBox/configuration",
-    "Freeze/dbmap",
-    "Freeze/complex",
-    "Freeze/evictor",
-    "Freeze/oldevictor",
-    "IceStorm/single",
-    "IceStorm/federation",
-    "IceStorm/federation2",
-    "IceStorm/stress",
-    "IceStorm/rep1",
-    "IceStorm/repgrid",
-    "IceStorm/repstress",
-    "FreezeScript/dbmap",
-    "FreezeScript/evictor",
-    "IceGrid/simple",
-    "IceGrid/deployer",
-    "IceGrid/session",
-    "IceGrid/update",
-    "IceGrid/activation",
-    "IceGrid/replicaGroup",
-    "IceGrid/replication",
-    "IceGrid/allocation",
-    "IceGrid/distribution",
-    "Glacier2/router",
-    "Glacier2/attack",
-    "Glacier2/sessionControl",
-    "Glacier2/ssl",
-    "Glacier2/dynamicFiltering",
-    "Glacier2/staticFiltering",
+    ("IceUtil/thread",  ["once"]),
+    ("IceUtil/unicode", ["once"]),
+    ("IceUtil/inputUtil",  ["once"]),
+    ("IceUtil/uuid", ["once"]),
+    ("IceUtil/timer", ["once"]),
+    ("Slice/errorDetection", ["once"]),
+    ("Slice/keyword", ["once"]),
+    ("Ice/proxy", ["core"]),
+    ("Ice/operations", ["core"]),
+    ("Ice/exceptions", ["core"]),
+    ("Ice/inheritance", ["core"]),
+    ("Ice/facets", ["core"]),
+    ("Ice/objects", ["core"]),
+    ("Ice/binding", ["core"]),
+    ("Ice/faultTolerance", ["core"]),
+    ("Ice/location", ["core"]),
+    ("Ice/adapterDeactivation", ["core"]),
+    ("Ice/slicing/exceptions", ["core"]),
+    ("Ice/slicing/objects", ["core"]),
+    ("Ice/gc", ["once"]),
+    ("Ice/checksum", ["core"]),
+    ("Ice/stream", ["core"]),
+    ("Ice/hold", ["core"]),
+    ("Ice/custom", ["core"]),
+    ("Ice/retry", ["core"]),
+    ("Ice/timeout", ["core"]),
+    ("Ice/background", ["core"]),
+    ("Ice/servantLocator", ["core"]),
+    ("Ice/interceptor", ["core"]),
+    ("Ice/stringConverter", ["core"]),
+    ("IceSSL/configuration", ["core"]),
+    ("IceBox/configuration", ["core", "noipv6"]),
+    ("Freeze/dbmap", ["once"]),
+    ("Freeze/complex", ["once"]),
+    ("Freeze/evictor", ["core"]),
+    ("Freeze/oldevictor", ["core"]),
+    ("IceStorm/single", ["service"]),
+    ("IceStorm/federation", ["service"]),
+    ("IceStorm/federation2", ["service"]),
+    ("IceStorm/stress", ["service", "stress"]),
+    ("IceStorm/rep1", ["service"]),
+    ("IceStorm/repgrid", ["service"]),
+    ("IceStorm/repstress", ["service", "noipv6", "stress"]),
+    ("FreezeScript/dbmap", ["once"]),
+    ("FreezeScript/evictor", ["once"]),
+    ("IceGrid/simple", ["service"]),
+    ("IceGrid/deployer", ["service"]),
+    ("IceGrid/session", ["service"]),
+    ("IceGrid/update", ["service"]),
+    ("IceGrid/activation", ["service"]),
+    ("IceGrid/replicaGroup", ["service"]),
+    ("IceGrid/replication", ["service"]),
+    ("IceGrid/allocation", ["service"]),
+    ("IceGrid/distribution", ["service"]),
+    ("Glacier2/router", ["service"]),
+    ("Glacier2/attack", ["service"]),
+    ("Glacier2/sessionControl", ["service"]),
+    ("Glacier2/ssl", ["service"]),
+    ("Glacier2/dynamicFiltering", ["service"]),
+    ("Glacier2/staticFiltering", ["service", "noipv6"]),
     ]
 
 #
@@ -94,7 +94,7 @@ if TestUtil.isCygwin() == 0:
       ]
 
 if TestUtil.isWin32():
-    tests.insert(0, "IceUtil/condvar")
+    tests.insert(0, ("IceUtil/condvar", ["once"]))
 
 if __name__ == "__main__":
     TestUtil.run(tests)