ICE-6620 Java process left around with gulp tests

1 files changed, 18 insertions, 4 deletions

diff --git a/js/gulpfile.js b/js/gulpfile.js
index 99a05331363..0d2c24f73b6 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -376,8 +376,15 @@ 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(process.platform == "win32" ? "SIGBREAK" : "SIGINT", function() { p.kill(); });
-        process.on("exit", function() { p.kill(); });
+        process.on(process.platform == "win32" ? "SIGBREAK" : "SIGINT", 
+            function()
+            {
+                process.exit();
+            });
+        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"}));
     });
@@ -385,8 +392,15 @@ 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("SIGINT", function() { p.kill(); });
-        process.on("exit", function() { p.kill(); });
+        process.on(process.platform == "win32" ? "SIGBREAK" : "SIGINT", 
+            function()
+            {
+                process.exit();
+            });
+        process.on("exit", function()
+            {
+                p.kill(); 
+            });
     });
 
 gulp.task("lint:html", ["build"],