1 files changed, 13 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index d25f7434540..3cdce99ad47 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -86,6 +86,10 @@ def getCppCompiler():
         compiler = re.search("CPP_COMPILER[\t\s]*= ([A-Z0-9]*)", config.read()).group(1)
     return compiler
 
+def isMINGW():
+    if not isWin32():
+        return False
+    return getCppCompiler() == "MINGW"
 
 def isVC6():
     if not isWin32():
@@ -686,7 +690,7 @@ def getGlacier2Router():
     return getIceExe("glacier2router")
 
 def getIceExe(name):
-    if isVC6():
+    if isVC6() or isMINGW():
         return os.path.join(getServiceDir(), name)
     else:
         return os.path.join(getCppBinDir(), name)
@@ -1679,6 +1683,14 @@ def runTests(start, expanded, num = 0, script = False):
                 print("%s*** test not supported with VC++ 6.0%s" % (prefix, suffix))
                 continue
 
+            if isMINGW() and "nomingw" in config:
+                print "%s*** test not supported with MINGW%s" % (prefix, suffix)
+                continue
+
+            if isWin32() and "nowin32" in config:
+                print "%s*** test not supported with MINGW%s" % (prefix, suffix)
+                continue
+
             # If this is mono and we're running ssl protocol tests
             # then skip. This occurs when using --all.
             if mono and ("nomono" in config or (i.find(os.path.join("cs","test")) != -1 and args.find("ssl") != -1)):