Remove BCC support

1 files changed, 2 insertions, 16 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 12ca1e94b38..d25f7434540 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -87,11 +87,6 @@ def getCppCompiler():
     return compiler
 
 
-def isBCC2010():
-    if not isWin32():
-        return False
-    return getCppCompiler() == "BCC2010"
-
 def isVC6():
     if not isWin32():
         return False
@@ -197,9 +192,6 @@ def configurePaths():
 
     if isWin32():
         libDir = getCppBinDir()
-        if iceHome and isBCC2010():
-            addLdPath(libDir)
-            libDir = os.path.join(libDir, "bcc10")
     else:
         libDir = os.path.join(getIceDir("cpp"), "lib")
         if iceHome and x64:
@@ -646,9 +638,7 @@ def getIceBox():
     lang = getDefaultMapping()
     if lang == "cpp":
         iceBox = ""
-        if isBCC2010():
-            iceBox = os.path.join(getServiceDir(), "icebox.exe")
-        elif isWin32():
+        if isWin32():
             #
             # Read the build.txt file from the test directory to figure out
             # how the IceBox service was built ("debug" vs. "release") and
@@ -696,7 +686,7 @@ def getGlacier2Router():
     return getIceExe("glacier2router")
 
 def getIceExe(name):
-    if isBCC2010() or isVC6():
+    if isVC6():
         return os.path.join(getServiceDir(), name)
     else:
         return os.path.join(getCppBinDir(), name)
@@ -1685,10 +1675,6 @@ def runTests(start, expanded, num = 0, script = False):
                 print("%s*** test only supported under Win32%s" % (prefix, suffix))
                 continue
 
-            if isBCC2010() and "nobcc" in config:
-                print("%s*** test not supported with C++Builder%s" % (prefix, suffix))
-                continue
-
             if isVC6() and "novc6" in config:
                 print("%s*** test not supported with VC++ 6.0%s" % (prefix, suffix))
                 continue