summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-06-19 00:22:17 -0400
committerBernard Normier <bernard@zeroc.com>2017-06-19 00:22:17 -0400
commit44b2ea32229a2c65d7e7252272e1a96870b59e76 (patch)
tree3ed971bf1b6f2344fe6c1edbe0d241807f335b40 /scripts/Util.py
parentRevert "Fix for ICE-8086 - validate platforms/configs/languages" (diff)
downloadice-44b2ea32229a2c65d7e7252272e1a96870b59e76.tar.bz2
ice-44b2ea32229a2c65d7e7252272e1a96870b59e76.tar.xz
ice-44b2ea32229a2c65d7e7252272e1a96870b59e76.zip
Add back iceboxadmin Debug, disable IceBridge/Debug tests on Windows
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index 9b714046ac4..de48cfdb058 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -365,12 +365,12 @@ class Windows(Platform):
def canRun(self, mapping, current):
#
- # On Windows, if testing with a binary distribution, don't test Glacier2/IceStorm services
+ # On Windows, if testing with a binary distribution, don't test Glacier2/IceBridge/IceStorm services
# with the Debug configurations since we don't provide binaries for them.
#
if current.driver.useIceBinDist(mapping):
parent = re.match(r'^([\w]*).*', current.testcase.getTestSuite().getId()).group(1)
- if parent in ["Glacier2", "IceStorm"] and current.config.buildConfig.find("Debug") >= 0:
+ if parent in ["Glacier2", "IceBridge", "IceStorm"] and current.config.buildConfig.find("Debug") >= 0:
return False
return True