Fix bad merge

This commit is contained in:
Ron Buckton 2018-06-25 11:33:23 -07:00
parent 52fa900b5c
commit d3ef20caf0
2 changed files with 3 additions and 5 deletions

View File

@ -298,8 +298,7 @@ gulp.task(runJs, /*help*/ false, [typescriptServicesJs, tsserverlibraryDts], ()
gulp.task(
"tests",
if (tests || runners || light || testTimeout || taskConfigsFolder) {
writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, testTimeout);
"Builds the test infrastructure using the built compiler",
[runJs]);
gulp.task(

View File

@ -80,10 +80,9 @@ proc.on('exit', (code, signal) => {
});
});
// terminate children.
process.on('SIGINT', () => {
proc.kill('SIGINT'); // calls runner.abort()
proc.kill('SIGTERM'); // if that didn't work, we're probably in an infinite loop, so make it die.
proc.kill('SIGINT');
proc.kill('SIGTERM');
});
function escapeRegExp(pattern) {