From fb0dcd49871df214c1c5911ed9714ebb9d1d9951 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wwigham@gmail.com>
Date: Thu, 21 Feb 2019 18:17:53 -0800
Subject: [PATCH] Have runtests always throw on failure, make rm stream signal
 end of read queue (#30035)

---
 scripts/build/tests.js | 9 ++-------
 scripts/build/utils.js | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/build/tests.js b/scripts/build/tests.js
index bcf5431b8d9..0ac65002ab8 100644
--- a/scripts/build/tests.js
+++ b/scripts/build/tests.js
@@ -140,13 +140,8 @@ async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode,
     await deleteTemporaryProjectOutput();
 
     if (error !== undefined) {
-        if (watchMode) {
-            throw error;
-        }
-        else {
-            log.error(error);
-            process.exit(typeof errorStatus === "number" ? errorStatus : 2);
-        }
+        process.exitCode = typeof errorStatus === "number" ? errorStatus : 2;
+        throw error;
     }
 }
 exports.runConsoleTests = runConsoleTests;
diff --git a/scripts/build/utils.js b/scripts/build/utils.js
index 170c36adef6..f9e48c58256 100644
--- a/scripts/build/utils.js
+++ b/scripts/build/utils.js
@@ -340,6 +340,7 @@ function rm(dest, opts) {
             duplex.push(file);
             cb();
         }
+        duplex.push(null); // signal end of read queue
     };
 
     const duplex = new Duplex({