summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-11-08 10:25:32 +0100
committerBenoit Foucher <benoit@zeroc.com>2012-11-08 10:25:32 +0100
commit7310ad264e17f639fb58dd947ef1c31295e4501c (patch)
tree3cb77562f0c445da903c1ae09ee2b6d80c139a6a /scripts/TestUtil.py
parentUpdated GUI online help to use doc.zeroc.com, in a web browser (diff)
downloadice-7310ad264e17f639fb58dd947ef1c31295e4501c.tar.bz2
ice-7310ad264e17f639fb58dd947ef1c31295e4501c.tar.xz
ice-7310ad264e17f639fb58dd947ef1c31295e4501c.zip
Fixed MinGW port
- The build no longer requires Cygwin - Running the tests no longer requires setting CPP_COMPILER, TestUtil.py che for RI_DEVKIT in the environment to figure out if running with MinGW devki - DynamicLibrary no longer appends the "d" suffix when compiling with debug - COMPSUFFIX is now defined when compiling Ice - Much simplified the build system by removing all the checks for MinGW in makefiles, MinGW settings are now located to Make.rules.MINGW only. - Fixed allTests.py to skip plugin and metrics tests. - Fixed build instructions.
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index aa83cc84d36..2592c3ae55d 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -96,7 +96,9 @@ def getCppCompiler():
def isMINGW():
if not isWin32():
return False
- return getCppCompiler() == "MINGW"
+ # Ruby Installer DEVKIT sets the RI_DEVKIT environment variable,
+ # we check for this variable to detect the Ruby MINGW environment.
+ return os.environ.has_key("RI_DEVKIT")
def isVC90():
if not isWin32():