diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-11-05 11:32:23 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-11-05 11:32:23 +0100 |
| commit | 48198a9094aad9d36f21aa798c7ce1365669402c (patch) | |
| tree | 8c46c8ce33589bd31721aa9a0f7ce3ce1de7a98b /scripts/Util.py | |
| parent | Fix JavaScript build to not depend on deprecated gulp-util (diff) | |
| download | ice-48198a9094aad9d36f21aa798c7ce1365669402c.tar.bz2 ice-48198a9094aad9d36f21aa798c7ce1365669402c.tar.xz ice-48198a9094aad9d36f21aa798c7ce1365669402c.zip | |
Fixed bug in test driver where --browser no longer worked
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 404f03a0839..82f4a74f1bb 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -570,7 +570,9 @@ class Mapping(object): # avoid having to check the configuration type) self.uwp = False self.openssl = False - self.browser = False + self.browser = "" + self.es5 = False + self.worker = False self.dotnetcore = False self.android = False self.xamarin = False @@ -3692,10 +3694,7 @@ class JavaScriptMapping(JavaScriptMixin,Mapping): def __init__(self, options=[]): Mapping.Config.__init__(self, options) - self.es5 = False - self.browser = "" - self.worker = False - parseOptions(self, options) + if self.browser and self.protocol == "tcp": self.protocol = "ws" |