Skip to content

Commit d3ef20c

Browse files
committed
Fix bad merge
1 parent 52fa900 commit d3ef20c

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Gulpfile.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,7 @@ gulp.task(runJs, /*help*/ false, [typescriptServicesJs, tsserverlibraryDts], ()
298298

299299
gulp.task(
300300
"tests",
301-
if (tests || runners || light || testTimeout || taskConfigsFolder) {
302-
writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, testTimeout);
301+
"Builds the test infrastructure using the built compiler",
303302
[runJs]);
304303

305304
gulp.task(

scripts/run-failed-tests.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,9 @@ proc.on('exit', (code, signal) => {
8080
});
8181
});
8282

83-
// terminate children.
8483
process.on('SIGINT', () => {
85-
proc.kill('SIGINT'); // calls runner.abort()
86-
proc.kill('SIGTERM'); // if that didn't work, we're probably in an infinite loop, so make it die.
84+
proc.kill('SIGINT');
85+
proc.kill('SIGTERM');
8786
});
8887

8988
function escapeRegExp(pattern) {

0 commit comments

Comments
 (0)