From d3ef20caf036f655c844dbc93efbf5099a04b0fb Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 25 Jun 2018 11:33:23 -0700
Subject: [PATCH] Fix bad merge

---
 Gulpfile.js                 | 3 +--
 scripts/run-failed-tests.js | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gulpfile.js b/Gulpfile.js
index 5ef7294ed8b..68b1391cf52 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -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(
diff --git a/scripts/run-failed-tests.js b/scripts/run-failed-tests.js
index a716434d1d6..876c4a34eec 100644
--- a/scripts/run-failed-tests.js
+++ b/scripts/run-failed-tests.js
@@ -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) {