diff options
| author | Jose <jose@zeroc.com> | 2017-07-19 21:42:28 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-07-19 21:42:28 +0200 |
| commit | da43da82ebe18b96756a86949dd76243ac3fa322 (patch) | |
| tree | d1fe7b4eb52e170dd90b56980b7aa724114cc903 | |
| parent | ICE-8362 - updating Android test projects (diff) | |
| download | ice-3.7.0-rc2.tar.bz2 ice-3.7.0-rc2.tar.xz ice-3.7.0-rc2.zip | |
Fix for Glacier2 es5 & workersv3.7.0-rc2
| -rw-r--r-- | js/bin/HttpServer.js | 2 | ||||
| -rw-r--r-- | js/test/Common/Worker.js | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js index acf9f1a7130..c434bd6935e 100644 --- a/js/bin/HttpServer.js +++ b/js/bin/HttpServer.js @@ -160,7 +160,7 @@ function Init() TestData.scripts = TestData.scripts.map(function(f) { - return f.replace("/lib/Glacier2.js", "/lib/es5/Glacier2.js") + return f.replace("/lib/Glacier2.js", "/lib/es5/Glacier2.js"); }); } else diff --git a/js/test/Common/Worker.js b/js/test/Common/Worker.js index 573e2e25451..d775e416b72 100644 --- a/js/test/Common/Worker.js +++ b/js/test/Common/Worker.js @@ -35,6 +35,10 @@ self.onmessage = function(e) self.importScripts("/node_modules/regenerator-runtime/runtime.js"); self.importScripts("/lib/es5/Ice.js"); self.importScripts("/test/es5/Common/Controller.js"); + test.files = test.files.map(function(f) + { + return f.replace("/lib/Glacier2.js", "/lib/es5/Glacier2.js"); + }); } else { @@ -42,6 +46,7 @@ self.onmessage = function(e) self.importScripts("/test/Common/Controller.js"); } self.importScripts("/test/Common/TestRunner.js"); + for(var i = 0; i < test.files.length; ++i) { var f = test.files[i]; |