Fix to testicedist.py configurations, removed --c++11 from TestUtil.py

- Added no-cpp11 configuration for OS X (to test with --std=c++11)
- Added cpp11 configuration on Linux to test C++11 libraries

2 files changed, 10 insertions, 25 deletions

diff --git a/distribution/bin/testicedist.py b/distribution/bin/testicedist.py
index 12e255fffe6..a74b338982f 100755
--- a/distribution/bin/testicedist.py
+++ b/distribution/bin/testicedist.py
@@ -455,6 +455,9 @@ class Platform:
         
         if buildConfiguration == "cpp11":
             env["CPP11"] = "yes"
+        
+        if buildConfiguration == "no-cpp11":
+            env["CPP11"] = "no"
             
         if self.is64(arch) and not self.isWindows():
             env["LP64"] = "yes"
@@ -530,7 +533,7 @@ class Platform:
         return None
     
     def getLanguageMappings(self, compiler, arch, buildConfiguration):
-        if buildConfiguration in ["debug", "cpp11", "winrt"]:
+        if buildConfiguration in ["debug", "cpp11", "no-cpp11", "winrt"]:
             languages = ["cpp"]
         elif buildConfiguration == "java1.6":
             languages = ["java"]
@@ -750,9 +753,6 @@ class Platform:
         if self.is64(arch):
             args += " --x64"
                     
-        if buildConfiguration == "cpp11":
-            args += " --c++11"
-            
         if lang == "cs" and compiler == "VC90":
             args += " --compact"
 
@@ -853,8 +853,7 @@ class Platform:
 
         if self.is64(arch):
             args += " --x64"
-        if buildConfiguration == "cpp11":
-            args += " --c++11"
+
         if buildConfiguration == "debug":
             args += " --mode=debug"
         else:
@@ -935,7 +934,7 @@ class Darwin(Platform):
         return ["clang"]
 
     def getSupportedConfigurations(self, compiler, arch):
-        return ["default", "cpp11"]
+        return ["default", "no-cpp11"]
 
     def getSupportedLanguages(self):
         return ["cpp", "java", "py", "js"]
@@ -1028,7 +1027,7 @@ class Linux(Platform):
             return ["x86"]
             
     def getSupportedConfigurations(self, compiler, arch):
-        return ["default", "java1.8"]
+        return ["default", "cpp11", "java1.8"]
 
     def getPlatformEnvironment(self, compiler, arch, buildConfiguration, lang, useBinDist):
         env = Platform.getPlatformEnvironment(self, compiler, arch, buildConfiguration, lang, useBinDist)
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 5091b00f52b..a32bf2824e0 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -21,7 +21,6 @@ ipv6 = False                    # Default to use IPv4 only
 socksProxy = False              # Use SOCKS proxy running on localhost
 iceHome = None                  # Binary distribution to use (None to use binaries from source distribution)
 x64 = False                     # Binary distribution is 64-bit
-cpp11 = False                   # Binary distribution is c++ 11
 extraArgs = []
 
 
@@ -297,7 +296,6 @@ def run(tests, root = False):
           --no-ipv6                   Don't use IPv6 addresses.
           --ice-home=<path>           Use the binary distribution from the given path.
           --x64                       Binary distribution is 64-bit.
-          --c++11                     Binary distribution is c++11.
           --cross=lang                Run cross language test.
           --client-home=<dir>         Run cross test clients from the given Ice source distribution.
           --script                    Generate a script to run the tests.
@@ -318,8 +316,7 @@ def run(tests, root = False):
                                     "debug", "protocol=", "compress", "valgrind", "host=", "serialize", "continue",
                                     "ipv6", "no-ipv6", "socks", "ice-home=", "cross=", "client-home=", "x64",
                                     "script", "env", "arg=",
-                                    "service-dir=", "appverifier", "compact", "silverlight", "winrt", "server", "mx",
-                                    "c++11"])
+                                    "service-dir=", "appverifier", "compact", "silverlight", "winrt", "server", "mx"])
     except getopt.GetoptError:
         usage()
 
@@ -390,7 +387,7 @@ def run(tests, root = False):
         if o in ( "--cross", "--protocol", "--host", "--debug", "--compress", "--valgrind", "--serialize", "--ipv6", \
                   "--socks", "--ice-home", "--x64", "--env", \
                   "--service-dir", "--appverifier", "--compact", "--silverlight", "--winrt", \
-                  "--server", "--mx", "--client-home", "--c++11"):
+                  "--server", "--mx", "--client-home"):
             arg += " " + o
             if len(a) > 0:
                 arg += " " + a
@@ -781,7 +778,6 @@ class DriverConfig:
     ipv6 = False
     socksProxy = False
     x64 = False
-    cpp11 = False
     serviceDir = None
     mx = False
     extraArgs = []
@@ -797,7 +793,6 @@ class DriverConfig:
         global ipv6
         global socksProxy
         global x64
-        global cpp11
         global serviceDir
         global compact
         global silverlight
@@ -815,7 +810,6 @@ class DriverConfig:
         self.ipv6 = ipv6
         self.socksProxy = socksProxy
         self.x64 = x64
-        self.cpp11 = cpp11
         self.serviceDir = serviceDir
         self.compact = compact
         self.silverlight = silverlight
@@ -1574,8 +1568,6 @@ def getCppBinDir(lang = None):
                     binDir = os.path.join(binDir, "amd64")
             elif isWin32() and lang != "php":
                 binDir = os.path.join(binDir, "x64")
-        if isDarwin() and cpp11:
-          binDir = os.path.join(binDir, "c++11")
     return binDir
 
 def getServiceDir():
@@ -1635,8 +1627,6 @@ def getTestEnv(lang, testdir):
                     libDir = os.path.join(libDir, "amd64")
             elif not isDarwin():
                 libDir = libDir + "64"
-          if isDarwin() and cpp11:
-            libDir = os.path.join(libDir, "c++11")
 
     addLdPath(libDir, env)
 
@@ -1769,7 +1759,6 @@ def processCmdLine():
           --socks                     Use SOCKS proxy running on localhost.
           --ice-home=<path>           Use the binary distribution from the given path.
           --x64                       Binary distribution is 64-bit.
-          --c++11                     Binary distribution is c++11.
           --env                       Print important environment variables.
           --cross=lang                Run cross language test.
           --client-home=<dir>         Run cross test clients from the given Ice source distribution.
@@ -1788,7 +1777,7 @@ def processCmdLine():
             sys.argv[1:], "", ["debug", "trace=", "protocol=", "compress", "valgrind", "host=", "serialize", "ipv6", \
                                "socks", "ice-home=", "x64", "cross=", "client-home=", "env", \
                                "service-dir=", "appverifier", "arg=", \
-                               "compact", "silverlight", "winrt", "server", "mx", "c++11"])
+                               "compact", "silverlight", "winrt", "server", "mx"])
     except getopt.GetoptError:
         usage()
 
@@ -1816,9 +1805,6 @@ def processCmdLine():
         elif o == "--x64":
             global x64
             x64 = True
-        elif o == "--c++11":
-            global cpp11
-            cpp11 = True
         elif o == "--compress":
             global compress
             compress = True