Make CI tests actually fail if there is an error in build_tests; fix broken tests (#6804)

Author: cknitt

jscomp/build_tests/cli_help/input.js

@@ -214,7 +214,7 @@ async function test() {
 
   {
     // Shows format help with --help arg
-    const out = await exec(`../../../rescript format`, ["--help"], {
+    const out = await exec(`../../../rescript`, ["format", "--help"], {
       cwd: __dirname,
     });
     assert.equal(out.stdout, formatHelp);
@@ -224,7 +224,7 @@ async function test() {
 
   {
     // Shows format help with -h arg
-    const out = await exec(`../../../rescript format`, ["-h"], {
+    const out = await exec(`../../../rescript`, ["format", "-h"], {
       cwd: __dirname,
     });
     assert.equal(out.stdout, formatHelp);
@@ -234,7 +234,7 @@ async function test() {
 
   {
     // Shows convert help with --help arg
-    const out = await exec(`../../../rescript convert`, ["--help"], {
+    const out = await exec(`../../../rescript`, ["convert", "--help"], {
       cwd: __dirname,
     });
     assert.equal(out.stdout, convertHelp);
@@ -244,7 +244,7 @@ async function test() {
 
   {
     // Shows convert help with -h arg
-    const out = await exec(`../../../rescript convert`, ["-h"], {
+    const out = await exec(`../../../rescript`, ["convert", "-h"], {
       cwd: __dirname,
     });
     assert.equal(out.stdout, convertHelp);
@@ -254,7 +254,7 @@ async function test() {
 
   {
     // Shows dump help with --help arg
-    const out = await exec(`../../../rescript dump`, ["--help"], {
+    const out = await exec(`../../../rescript`, ["dump", "--help"], {
       cwd: __dirname,
     });
     assert.equal(out.stdout, dumpHelp);
@@ -264,7 +264,7 @@ async function test() {
 
   {
     // Shows dump help with -h arg
-    const out = await exec(`../../../rescript dump`, ["-h"], {
+    const out = await exec(`../../../rescript`, ["dump", "-h"], {
       cwd: __dirname,
     });
     assert.equal(out.stdout, dumpHelp);

jscomp/build_tests/utils.js

@@ -44,7 +44,7 @@ async function exec(command, args, options) {
         code = signals[signal] + 128;
       }
 
-      resolve({ code, stdout, stderr });
+      resolve({ status: code, stdout, stderr });
     });
   });
 }

scripts/ciTest.js

@@ -1,17 +1,16 @@
 //@ts-check
-var cp = require("child_process");
-var path = require("path");
-var fs = require("fs");
+const cp = require("child_process");
+const path = require("path");
+const fs = require("fs");
 
-var duneBinDir = require("./dune").duneBinDir;
+const duneBinDir = require("./dune").duneBinDir;
 
 const { exec } = require("../jscomp/build_tests/utils.js");
 
-var ounitTest = false;
-var mochaTest = false;
-var bsbTest = false;
-var formatTest = false;
-var all = false;
+let ounitTest = false;
+let mochaTest = false;
+let bsbTest = false;
+let formatTest = false;
 
 if (process.argv.includes("-ounit")) {
   ounitTest = true;
@@ -30,9 +29,6 @@ if (process.argv.includes("-format")) {
 }
 
 if (process.argv.includes("-all")) {
-  all = true;
-}
-if (all) {
   ounitTest = true;
   mochaTest = true;
   bsbTest = true;
@@ -56,10 +52,13 @@ async function runTests() {
 
   if (bsbTest) {
     console.log("Doing build_tests");
-    var buildTestDir = path.join(__dirname, "..", "jscomp", "build_tests");
-    var files = fs.readdirSync(buildTestDir);
+    const buildTestDir = path.join(__dirname, "..", "jscomp", "build_tests");
+    const files = fs.readdirSync(buildTestDir);
+
+    let hasError = false;
+
     for (const file of files) {
-      var testDir = path.join(buildTestDir, file);
+      const testDir = path.join(buildTestDir, file);
       if (file === "node_modules" || !fs.lstatSync(testDir).isDirectory()) {
         break;
       }
@@ -72,13 +71,18 @@ async function runTests() {
         const out = await exec(`node`, ["input.js"], { cwd: testDir });
         console.log(out.stdout);
 
-        if (out.code === 0) {
+        if (out.status === 0) {
           console.log("✅ success in", file);
         } else {
           console.log(`❌ error in ${file} with stderr:\n`, out.stderr);
+          hasError = true;
         }
       }
     }
+
+    if (hasError) {
+      process.exit(1);
+    }
   }
 
   if (formatTest) {