summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-12-18 11:49:49 +0100
committerBenoit Foucher <benoit@zeroc.com>2018-12-18 11:50:12 +0100
commitecbaf83da7b97eda008ec8d005ceaacbb25ccd59 (patch)
treef30dfca91e02f912603460ea654fc8f9f785d53f /scripts/Util.py
parentJavaScript Ice/timeout extra fixes, Close #262 (diff)
downloadice-ecbaf83da7b97eda008ec8d005ceaacbb25ccd59.tar.bz2
ice-ecbaf83da7b97eda008ec8d005ceaacbb25ccd59.tar.xz
ice-ecbaf83da7b97eda008ec8d005ceaacbb25ccd59.zip
Fix to skip typescript testing when running with IE
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index 85a40847075..0d3cde83c9a 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -3748,6 +3748,11 @@ class JavaScriptMapping(JavaScriptMixin,Mapping):
class TypeScriptMapping(JavaScriptMixin,Mapping):
+ class Config(Mapping.Config):
+
+ def canRun(self, testId, current):
+ return Mapping.Config.canRun(self, testId, current) and self.browser != "Ie" # IE doesn't support ES6
+
def _getDefaultSource(self, processType):
return { "client" : "Client.ts", "serveramd" : "ServerAMD.ts", "server" : "Server.ts" }[processType]