3 files changed, 36 insertions, 34 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py
index 3dcdcecb2da..c47405c8295 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -47,19 +47,19 @@ tests = [
     ("Ice/inheritance", ["core", "bt"]),
     ("Ice/facets", ["core", "bt"]),
     ("Ice/objects", ["core", "bt"]),
-    ("Ice/optional", ["core", "bt"]),
+    ("Ice/optional", ["core", "bt", "noc++11"]),
     ("Ice/binding", ["core", "nosocks", "bt"]),
     ("Ice/faultTolerance", ["core", "novalgrind"]), # valgrind reports leak with aborted servers
     ("Ice/location", ["core"]),
     ("Ice/adapterDeactivation", ["core"]),
     ("Ice/slicing/exceptions", ["core", "bt"]),
     ("Ice/slicing/objects", ["core", "bt"]),
-    ("Ice/gc", ["once"]),
+    ("Ice/gc", ["once", "noc++11"]),
     ("Ice/dispatcher", ["once"]),
     ("Ice/checksum", ["core"]),
-    ("Ice/stream", ["core"]),
+    ("Ice/stream", ["core", "noc++11"]),
     ("Ice/hold", ["core", "bt"]),
-    ("Ice/custom", ["core", "nossl", "nows"]),
+    ("Ice/custom", ["core", "nossl", "nows", "noc++11"]),
     ("Ice/retry", ["core"]),
     ("Ice/timeout", ["core", "nocompress", "nosocks"]),
     ("Ice/acm", ["core", "bt"]),
@@ -79,38 +79,38 @@ tests = [
     ("Ice/logger", ["once"]),
     ("Ice/networkProxy", ["core", "noipv6", "nosocks"]),
     ("Ice/services", ["once"]),
-    ("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl
+    ("IceSSL/configuration", ["once", "novalgrind", "noc++11"]), # valgrind doesn't work well with openssl
     ("IceBox/configuration", ["core", "noipv6", "novc100", "nomingw", "nomx"]),
     ("IceBox/admin", ["core", "noipv6", "novc100", "nomingw", "nomx"]),
-    ("IceStorm/single", ["service", "novc100", "noappverifier", "nomingw"]), # This test doesn't work with appverifier
-    ("IceStorm/federation", ["service", "novc100", "nomingw"]),
-    ("IceStorm/federation2", ["service", "novc100", "nomingw"]),
-    ("IceStorm/stress", ["service", "stress", "novc100", "nomingw"]), # Too slow with appverifier.
-    ("IceStorm/rep1", ["service", "novc100", "nomingw"]),
-    ("IceStorm/repgrid", ["service", "novc100", "nomingw"]),
-    ("IceStorm/repstress", ["service", "noipv6", "stress", "novc100", "nomingw"]),
+    ("IceStorm/single", ["service", "novc100", "noappverifier", "nomingw", "noc++11"]), # This test doesn't work with appverifier
+    ("IceStorm/federation", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceStorm/federation2", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceStorm/stress", ["service", "stress", "novc100", "nomingw", "noc++11"]), # Too slow with appverifier.
+    ("IceStorm/rep1", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceStorm/repgrid", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceStorm/repstress", ["service", "noipv6", "stress", "novc100", "nomingw", "noc++11"]),
     ("IceDiscovery/simple", ["service"]),
-    ("IceGrid/simple", ["service", "novc100", "nomingw"]),
-    ("IceGrid/fileLock", ["service", "novc100", "nomingw"]),
-    ("IceGrid/deployer", ["service", "novc100", "nomingw"]),
-    ("IceGrid/session", ["service", "novc100", "nomingw", "nows"]),
-    ("IceGrid/update", ["service", "novc100", "nomingw"]),
-    ("IceGrid/noRestartUpdate", ["service", "novc100", "nomingw"]),
-    ("IceGrid/activation", ["service", "novc100", "nomingw"]),
+    ("IceGrid/simple", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceGrid/fileLock", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceGrid/deployer", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceGrid/session", ["service", "novc100", "nomingw", "nows", "noc++11"]),
+    ("IceGrid/update", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceGrid/noRestartUpdate", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceGrid/activation", ["service", "novc100", "nomingw", "noc++11"]),
     ("IceGrid/replicaGroup", ["service", "novc100", "nomingw", "noc++11", "nomultiarch"]),
-    ("IceGrid/replication", ["service", "novc100", "nomingw", "nomx"]),
-    ("IceGrid/allocation", ["service", "novc100", "nomingw"]),
-    ("IceGrid/distribution", ["service", "novc100", "nomingw"]),
-    ("IceGrid/admin", ["service", "novc100", "nomingw","nows"]),
-    ("Glacier2/router", ["service", "novc100", "nomingw"]),
-    ("Glacier2/attack", ["service", "novc100", "nomingw", "nomx"]),
-    ("Glacier2/override", ["service", "novc100", "nomingw"]),
-    ("Glacier2/sessionControl", ["service", "novc100", "nomingw"]),
-    ("Glacier2/ssl", ["service", "novalgrind", "novc100", "nomingw"]), # valgrind doesn't work well with openssl
-    ("Glacier2/dynamicFiltering", ["service", "novc100", "nomingw"]),
-    ("Glacier2/staticFiltering", ["service", "noipv6", "novc100", "nomingw", "nomx"]),
-    ("Glacier2/sessionHelper", ["core", "novc100", "nomingw"]),
-    ("Glacier2/hashpassword", ["once", "nomingw", "novalgrind", "noappverifier"])
+    ("IceGrid/replication", ["service", "novc100", "nomingw", "nomx", "noc++11"]),
+    ("IceGrid/allocation", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceGrid/distribution", ["service", "novc100", "nomingw", "noc++11"]),
+    ("IceGrid/admin", ["service", "novc100", "nomingw","nows", "noc++11"]),
+    ("Glacier2/router", ["service", "novc100", "nomingw", "noc++11"]),
+    ("Glacier2/attack", ["service", "novc100", "nomingw", "nomx", "noc++11"]),
+    ("Glacier2/override", ["service", "novc100", "nomingw", "noc++11"]),
+    ("Glacier2/sessionControl", ["service", "novc100", "nomingw", "noc++11"]),
+    ("Glacier2/ssl", ["service", "novalgrind", "novc100", "nomingw", "noc++11"]), # valgrind doesn't work well with openssl
+    ("Glacier2/dynamicFiltering", ["service", "novc100", "nomingw", "noc++11"]),
+    ("Glacier2/staticFiltering", ["service", "noipv6", "novc100", "nomingw", "nomx", "noc++11"]),
+    ("Glacier2/sessionHelper", ["core", "novc100", "nomingw", "noc++11"]),
+    ("Glacier2/hashpassword", ["once", "nomingw", "novalgrind", "noappverifier", "noc++11"])
     ]
 
 #
diff --git a/cpp/test/Makefile b/cpp/test/Makefile
index c7d629810ff..594f90a2b07 100644
--- a/cpp/test/Makefile
+++ b/cpp/test/Makefile
@@ -16,7 +16,8 @@ SUBDIRS		= Common \
 		  IceUtil \
 		  Slice \
 		  Ice \
-		  IceDiscovery
+		  IceDiscovery \
+		  IceBox
 else
 
 SUBDIRS		= Common \
diff --git a/cpp/test/Makefile.mak b/cpp/test/Makefile.mak
index f4d7534085d..149cdd3c68e 100644
--- a/cpp/test/Makefile.mak
+++ b/cpp/test/Makefile.mak
@@ -20,7 +20,8 @@ SUBDIRS		= Common \
 SUBDIRS		= IceUtil \
 		  Slice \
 		  Ice \
-		  IceDiscovery
+		  IceDiscovery \
+		  IceBox
 !elseif "$(CPP_COMPILER)" == "VC100"
 SUBDIRS		= IceUtil \
 		  Slice \