Merge remote-tracking branch 'origin/encoding11' into mx

Conflicts:
	cpp/src/Ice/.depend
	cpp/src/Ice/.depend.mak
	cpp/src/slice2cpp/Gen.cpp

1 files changed, 35 insertions, 35 deletions

diff --git a/cpp/allTests.py b/cpp/allTests.py
index 046dfe586ce..c0432217228 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -35,7 +35,7 @@ tests = [
     ("Slice/errorDetection", ["once"]),
     ("Slice/keyword", ["once"]),
     ("Slice/structure", ["once"]),
-    ("Ice/properties", ["once", "novc6", "nobcc"]),
+    ("Ice/properties", ["once", "novc6", "nomingw"]),
     ("Ice/proxy", ["core"]),
     ("Ice/operations", ["core"]),
     ("Ice/exceptions", ["core"]),
@@ -58,7 +58,7 @@ tests = [
     ("Ice/custom", ["core", "novc6", "nossl"]),
     ("Ice/retry", ["core"]),
     ("Ice/timeout", ["core"]),
-    ("Ice/background", ["core"]),
+    ("Ice/background", ["core", "nomingw"]),
     ("Ice/servantLocator", ["core"]),
     ("Ice/interceptor", ["core"]),
     ("Ice/stringConverter", ["core"]),
@@ -67,39 +67,39 @@ tests = [
     ("Ice/defaultValue", ["core"]),
     ("Ice/invoke", ["core", "novc6"]),
     ("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl
-    ("IceBox/configuration", ["core", "noipv6", "nobcc", "novc6"]),
-    ("Freeze/dbmap", ["once", "novc6"]),
-    ("Freeze/complex", ["once", "novc6"]),
-    ("Freeze/evictor", ["core", "novc6"]),
-    ("Freeze/fileLock", ["core", "novc6"]),
-    ("IceStorm/single", ["service", "novc6", "noappverifier"]),  # This test doensn't work with appverifier is sensitive to timeouts.
-    ("IceStorm/federation", ["service", "novc6"]),
-    ("IceStorm/federation2", ["service", "novc6"]),
-    ("IceStorm/stress", ["service", "stress", "novc6", "noappverifier"]), # This test is very slow with appverifier.
-    ("IceStorm/rep1", ["service", "novc6"]),
-    ("IceStorm/repgrid", ["service", "novc6"]),
-    ("IceStorm/repstress", ["service", "noipv6", "stress", "novc6"]),
-    ("FreezeScript/dbmap", ["once", "novc6"]),
-    ("FreezeScript/evictor", ["once", "novc6"]),
-    ("IceGrid/simple", ["service", "novc6"]),
-    ("IceGrid/fileLock", ["service", "nobcc", "novc6"]),
-    ("IceGrid/deployer", ["service", "nobcc", "novc6"]),
-    ("IceGrid/session", ["service", "nobcc", "novc6"]),
-    ("IceGrid/update", ["service", "nobcc", "novc6"]),
-    ("IceGrid/activation", ["service", "nobcc", "novc6"]),
-    ("IceGrid/replicaGroup", ["service", "nobcc", "novc6"]),
-    ("IceGrid/replication", ["service", "nobcc", "novc6"]),
-    ("IceGrid/allocation", ["service", "nobcc", "novc6"]),
-    ("IceGrid/distribution", ["service", "nobcc", "novc6"]),
-    ("IceGrid/admin", ["service", "novc6"]),
-    ("Glacier2/router", ["service", "novc6"]),
-    ("Glacier2/attack", ["service", "novc6"]),
-    ("Glacier2/override", ["service", "novc6"]),
-    ("Glacier2/sessionControl", ["service", "novc6"]),
-    ("Glacier2/ssl", ["service", "novalgrind", "novc6"]), # valgrind doesn't work well with openssl
-    ("Glacier2/dynamicFiltering", ["service", "novc6"]),
-    ("Glacier2/staticFiltering", ["service", "noipv6", "novc6"]),
-    ("Glacier2/sessionHelper", ["service", "novc6"]),
+    ("IceBox/configuration", ["core", "noipv6", "novc6", "nomingw"]),
+    ("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 doensn'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/activation", ["service", "novc6", "nomingw"]),
+    ("IceGrid/replicaGroup", ["service", "novc6", "nomingw"]),
+    ("IceGrid/replication", ["service", "novc6", "nomingw"]),
+    ("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"]),
+    ("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"]),
+    ("Glacier2/sessionHelper", ["service", "novc6", "nomingw"]),
     ]
 
 #