diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-12-21 13:14:17 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-21 13:14:17 +0100 |
| commit | 80a5cbd5dcc9d12e196fdd45097fece9cc71e687 (patch) | |
| tree | ca9f85e2b314d63133e2a80274626ff72dc28789 /scripts/Util.py | |
| parent | Fix for running tests with ES5 (diff) | |
| download | ice-80a5cbd5dcc9d12e196fdd45097fece9cc71e687.tar.bz2 ice-80a5cbd5dcc9d12e196fdd45097fece9cc71e687.tar.xz ice-80a5cbd5dcc9d12e196fdd45097fece9cc71e687.zip | |
Additional fixes for Edge/IE, only run with ES5
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index f19a573798e..c532adf12de 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2669,9 +2669,20 @@ class JavaScriptMapping(Mapping): return Mapping.computeTestCases(self, testId, files) def getOptions(self, current): - # JavaScript with NodeJS only supports tcp and no other options, Browsers only support WS and WSS - protocols = ["ws", "wss"] if current.config.browser else ["tcp"] - return { "protocol" : protocols, "compress" : [False], "ipv6" : [False], "serialize" : [False], "mx" : [False] } + options = { + "protocol" : ["ws", "wss"] if current.config.browser else ["tcp"], + "compress" : [False], + "ipv6" : [False], + "serialize" : [False], + "mx" : [False], + "es5" : [False, True] + } + + # Edge and Ie only support ES5 for now + if current.config.browser in ["Edge", "Ie"]: + options["es5"] = [True] + + return options from Glacier2Util import * from IceBoxUtil import * |