summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-07-17 21:38:28 +0200
committerJose <jose@zeroc.com>2017-07-17 21:38:28 +0200
commitb381e5543b9771726bbc0f0f3b0d0ee7a3e56cea (patch)
tree156616b9410bd635e8d237341d052ae63c1c3024
parentbuild system fixes for java-compat/android (diff)
downloadice-b381e5543b9771726bbc0f0f3b0d0ee7a3e56cea.tar.bz2
ice-b381e5543b9771726bbc0f0f3b0d0ee7a3e56cea.tar.xz
ice-b381e5543b9771726bbc0f0f3b0d0ee7a3e56cea.zip
ICE-8348 - ES5 browser tests looking in source lib dir for ice when using bin dist
-rw-r--r--js/bin/HttpServer.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js
index 844d07aa2b1..4b5df205131 100644
--- a/js/bin/HttpServer.js
+++ b/js/bin/HttpServer.js
@@ -49,9 +49,13 @@ function Init()
}
var libraries = ["/lib/Ice.js", "/lib/Ice.min.js",
- "/lib/Glacier2.js", "/lib/Glacier2.min.js",
- "/lib/IceStorm.js", "/lib/IceStorm.min.js",
- "/lib/IceGrid.js", "/lib/IceGrid.min.js",];
+ "/lib/Glacier2.js", "/lib/Glacier2.min.js",
+ "/lib/IceStorm.js", "/lib/IceStorm.min.js",
+ "/lib/IceGrid.js", "/lib/IceGrid.min.js",
+ "/lib/es5/Ice.js", "/lib/es5/Ice.min.js",
+ "/lib/es5/Glacier2.js", "/lib/es5/Glacier2.min.js",
+ "/lib/es5/IceStorm.js", "/lib/es5/IceStorm.min.js",
+ "/lib/es5/IceGrid.js", "/lib/es5/IceGrid.min.js"];
TestData.TestSuites = fs.readFileSync(path.join(__dirname, "..", "test", "Common", "TestSuites.json"), "utf8");
var TestSuites = JSON.parse(TestData.TestSuites);