backport fix for hanging tests (#6667)

Author: tsnobip

scripts/ciTest.js

@@ -5,6 +5,8 @@ var fs = require("fs");
 
 var duneBinDir = require("./dune").duneBinDir;
 
+const { exec } = require("./utils.js");
+
 var ounitTest = false;
 var mochaTest = false;
 var bsbTest = false;
@@ -37,7 +39,7 @@ if (all) {
   formatTest = true;
 }
 
-function runTests() {
+async function runTests() {
   if (ounitTest) {
     cp.execSync(path.join(duneBinDir, "ounit_tests"), {
       stdio: [0, 1, 2],
@@ -56,7 +58,7 @@ function runTests() {
     console.log("Doing build_tests");
     var buildTestDir = path.join(__dirname, "..", "jscomp", "build_tests");
     var files = fs.readdirSync(buildTestDir);
-    files.forEach(function (file) {
+    for (const file of files) {
       var testDir = path.join(buildTestDir, file);
       if (file === "node_modules" || !fs.lstatSync(testDir).isDirectory()) {
         return;
@@ -65,23 +67,18 @@ function runTests() {
         console.warn(`input.js does not exist in ${testDir}`);
       } else {
         console.log(`testing ${file}`);
+
         // note existsSync test already ensure that it is a directory
-        cp.exec(
-          `node input.js`,
-          { cwd: testDir, encoding: "utf8" },
-          function (error, stdout, stderr) {
-            console.log(stdout);
+        const out = await exec(`node`, ["input.js"], { cwd: testDir });
+        console.log(out.stdout);
 
-            if (error !== null) {
-              console.log(`❌ error in ${file} with stderr:\n`, stderr);
-              throw error;
-            } else {
-              console.log("✅ success in", file);
-            }
-          }
-        );
+        if (out.code === 0) {
+          console.log("✅ success in", file);
+        } else {
+          console.log(`❌ error in ${file} with stderr:\n`, out.stderr);
+        }
       }
-    });
+    }
   }
 
   if (formatTest) {
@@ -92,12 +89,4 @@ function runTests() {
   }
 }
 
-function main() {
-  try {
-    runTests();
-  } catch (err) {
-    console.error(err);
-    process.exit(2);
-  }
-}
-main();
+runTests();

scripts/utils.js

@@ -0,0 +1,52 @@
+const child_process = require("child_process");
+
+const signals = {
+  SIGINT: 2,
+  SIGQUIT: 3,
+  SIGKILL: 9,
+  SIGTERM: 15,
+};
+
+/**
+ * @param {string} command
+ * @param {Array<string>} args
+ * @param {child_process.SpawnOptions} [options]
+ */
+async function exec(command, args, options) {
+  const stdoutChunks = [];
+  const stderrChunks = [];
+
+  const subprocess = child_process.spawn(command, args, {
+    stdio: ["ignore", "pipe", "pipe"],
+    ...options,
+  });
+
+  subprocess.stdout.on("data", chunk => {
+    stdoutChunks.push(chunk);
+  });
+
+  subprocess.stderr.on("data", chunk => {
+    stderrChunks.push(chunk);
+  });
+
+  return await new Promise((resolve, reject) => {
+    subprocess.once("error", err => {
+      reject(err);
+    });
+
+    subprocess.once("close", (exitCode, signal) => {
+      const stdout = Buffer.concat(stdoutChunks).toString("utf8");
+      const stderr = Buffer.concat(stderrChunks).toString("utf8");
+
+      let code = exitCode ?? 1;
+      if (signals[signal]) {
+        // + 128 is standard POSIX practice, see also https://nodejs.org/api/process.html#exit-codes
+        code = signals[signal] + 128;
+      }
+
+      resolve({ code, stdout, stderr });
+    });
+  });
+}
+
+exports.exec = exec;