diff options
| author | Joe George <joe@zeroc.com> | 2015-06-01 14:49:05 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-06-01 15:23:28 -0400 |
| commit | beeb6e2890bafb8a6efac64d069e6a6231527105 (patch) | |
| tree | f05de89e160fe8d082c09856fb3c4034fd1131d3 /js/gulpfile.js | |
| parent | Fixed test env for PHP brew and Java on Windows (diff) | |
| download | ice-beeb6e2890bafb8a6efac64d069e6a6231527105.tar.bz2 ice-beeb6e2890bafb8a6efac64d069e6a6231527105.tar.xz ice-beeb6e2890bafb8a6efac64d069e6a6231527105.zip | |
Fix ICE-6549
- Remove js/index.js
- Remove demo npm command
- Redirect / to frist test in js browser tests
Diffstat (limited to 'js/gulpfile.js')
| -rw-r--r-- | js/gulpfile.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/js/gulpfile.js b/js/gulpfile.js index 6c9adc1266b..da25f1c079c 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -385,16 +385,17 @@ gulp.task("test:run-with-browser", ["watch"].concat(useBinDist ? ["test"] : ["bu require("./bin/HttpServer")(); var p = require("child_process").spawn("python", ["../scripts/TestController.py"], {stdio: "inherit"}); - process.on("SIGINT", function() { p.kill()}); - process.on("exit", function() { p.kill() }); - return gulp.src("./index.html").pipe(open("", {url: "http://127.0.0.1:8080/test/Ice/acm/index.html"})); + process.on("SIGINT", function() { p.kill(); }); + process.on("exit", function() { p.kill(); }); + return gulp.src("./test/Ice/acm/index.html") + .pipe(open("", {url: "http://127.0.0.1:8080/test/Ice/acm/index.html"})); }); gulp.task("test:run-with-node", (useBinDist ? ["test"] : ["build"]), function(){ var p = require("child_process").spawn("python", ["allTests.py", "--all"], {stdio: "inherit"}); - process.on("SIGINT", function() { p.kill()}); - process.on("exit", function() { p.kill() }); + process.on("SIGINT", function() { p.kill(); }); + process.on("exit", function() { p.kill(); }); }); gulp.task("lint:html", ["build"], |