summaryrefslogtreecommitdiff
path: root/js/gulpfile.js
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-09-17 22:58:49 +0200
committerJose <jose@zeroc.com>2015-09-17 22:58:49 +0200
commitfd91507e8cfdc85eeed3e697123db15b1761f194 (patch)
tree9ecc2e6260b972ca2192ad862c22f9aafedc8415 /js/gulpfile.js
parentMissing js:ice-build metadata (diff)
downloadice-fd91507e8cfdc85eeed3e697123db15b1761f194.tar.bz2
ice-fd91507e8cfdc85eeed3e697123db15b1761f194.tar.xz
ice-fd91507e8cfdc85eeed3e697123db15b1761f194.zip
Update for JS browser test suite server languages
Diffstat (limited to 'js/gulpfile.js')
-rw-r--r--js/gulpfile.js17
1 files changed, 13 insertions, 4 deletions
diff --git a/js/gulpfile.js b/js/gulpfile.js
index c8d75ac5402..7417cef61a2 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -373,17 +373,26 @@ gulp.task("watch", ["test:watch"].concat(useBinDist ? [] : ["dist:watch"]));
gulp.task("test:run-with-browser", ["watch"].concat(useBinDist ? ["test"] : ["build"]),
function(){
+ var serverLanguages =
+ {
+ languages: [{value: "cpp", name: "C++"}, {value: "java", name: "Java"}]
+ };
+ if(process.platform == "win32")
+ {
+ serverLanguages.languages.push({value: "csharp", name: "C#"});
+ }
+ fs.writeFileSync("server-languages.json", JSON.stringify(serverLanguages, null, 4));
require("./bin/HttpServer")();
var p = require("child_process").spawn("python", ["../scripts/TestController.py"], {stdio: "inherit"});
- process.on(process.platform == "win32" ? "SIGBREAK" : "SIGINT",
+ process.on(process.platform == "win32" ? "SIGBREAK" : "SIGINT",
function()
{
process.exit();
});
process.on("exit", function()
{
- p.kill();
+ p.kill();
});
return gulp.src("./test/Ice/acm/index.html")
.pipe(open("", {url: "http://127.0.0.1:8080/test/Ice/acm/index.html"}));
@@ -392,14 +401,14 @@ gulp.task("test:run-with-browser", ["watch"].concat(useBinDist ? ["test"] : ["bu
gulp.task("test:run-with-node", (useBinDist ? ["test"] : ["build"]),
function(){
var p = require("child_process").spawn("python", ["allTests.py", "--all"], {stdio: "inherit"});
- process.on(process.platform == "win32" ? "SIGBREAK" : "SIGINT",
+ process.on(process.platform == "win32" ? "SIGBREAK" : "SIGINT",
function()
{
process.exit();
});
process.on("exit", function()
{
- p.kill();
+ p.kill();
});
});