citest: add callback (rescript-lang#5477)

* citest: add callback

* clean up

* tests: use rescript_exe in custom_namespace test

* tests: remove stdio override from all tests that used it

Co-authored-by: Cristiano Calcagno <cristianoc@users.noreply.github.com>

Author: jchavarri

jscomp/build_tests/case3/input.js

@@ -8,7 +8,6 @@ var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 p.spawnSync(rescript_exe, {
   encoding: "utf8",
   cwd: __dirname,
-  stdio: [0, 1, 2],
 });
 
 var o = fs.readFileSync(path.join(__dirname, "src", "hello.bs.js"), "ascii");

jscomp/build_tests/custom_namespace/input.js

@@ -2,10 +2,10 @@ var child_process = require("child_process");
 var fs = require("fs");
 var path = require("path");
 var assert = require("assert");
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 
-child_process.execSync(`../node_modules/.bin/rescript clean -with-deps && ../node_modules/.bin/rescript build`, {
+child_process.execSync(`${rescript_exe} clean -with-deps && ${rescript_exe} build`, {
   cwd: __dirname,
-  stdio: [0, 1, 2],
 });
 
 var x = require("./src/demo.bs.js");

jscomp/build_tests/exports/input.js

@@ -4,5 +4,4 @@ var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 child_process.execSync(rescript_exe, {
   cwd: __dirname,
   encoding: "utf8",
-  stdio: [0, 1, 2],
 });

jscomp/build_tests/hyphen2/input.js

@@ -1,4 +1,4 @@
 var p = require("child_process");
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 
-p.execSync(rescript_exe, { cwd: __dirname, stdio: [0, 1, 2] });
+p.execSync(rescript_exe, { cwd: __dirname });

jscomp/build_tests/install/input.js

@@ -7,12 +7,10 @@ var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 p.spawnSync(rescript_exe, [`clean`], {
   encoding: "utf8",
   cwd: __dirname,
-  stdio: [0, 1, 2]
 });
 p.spawnSync(rescript_exe, [`build`,`-install`], {
   encoding: "utf8",
   cwd: __dirname,
-  stdio: [0, 1, 2]
 });
 
 var fooExists = fs.existsSync(path.join(__dirname, "lib", "ocaml", "Foo.cmi"));
@@ -21,12 +19,10 @@ assert.ok(fooExists == false);
 p.spawnSync(rescript_exe, {
   encoding: "utf8",
   cwd: __dirname,
-  stdio: [0, 1, 2]
 });
 p.spawnSync(rescript_exe ,[`build`,`-install`], {
   encoding: "utf8",
   cwd: __dirname,
-  stdio: [0, 1, 2]
 });
 
 fooExists = fs.existsSync(path.join(__dirname, "lib", "ocaml", "Foo.cmi"));

jscomp/build_tests/namespace/input.js

@@ -4,7 +4,6 @@ var path = require("path");
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 child_process.execSync(`${rescript_exe} clean -with-deps && ${rescript_exe} build`, {
   cwd: __dirname,
-  stdio: [0, 1, 2],
 });
 
 var x = require("./src/demo.bs.js");

jscomp/build_tests/nested/input.js

@@ -3,7 +3,7 @@ var assert = require("assert");
 var fs = require("fs");
 var path = require("path");
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-p.execSync(rescript_exe, { cwd: __dirname, stdio: [0, 1, 2] });
+p.execSync(rescript_exe, { cwd: __dirname });
 
 var content = fs.readFileSync(path.join(__dirname, "src", "demo.js"), "utf8");
 

jscomp/build_tests/nnest/input.js

@@ -5,7 +5,7 @@ var assert = require("assert");
 var fs = require("fs");
 var path = require("path");
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-p.execSync(rescript_exe, { cwd: __dirname, stdio: [0, 1, 2] });
+p.execSync(rescript_exe, { cwd: __dirname });
 
 var content = fs.readFileSync(path.join(__dirname, "src", "demo.js"), "utf8");
 

jscomp/build_tests/ns/input.js

@@ -1,4 +1,4 @@
 var child_process = require("child_process");
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 
-child_process.execSync(rescript_exe, { cwd: __dirname, stdio: [0, 1, 2] });
+child_process.execSync(rescript_exe, { cwd: __dirname });

jscomp/build_tests/priv/input.js

@@ -2,7 +2,7 @@ var child_process = require("child_process");
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 
 var output = child_process.spawnSync(
-  `${rescript_exe} -with-deps && ${rescript_exe} build`,
+  `${rescript_exe} clean -with-deps && ${rescript_exe} build`,
   { cwd: __dirname, shell: true, encoding: "utf8" }
 );
 

jscomp/build_tests/react_ppx/input.js

@@ -2,4 +2,4 @@
 var cp = require("child_process");
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 
-cp.execSync(rescript_exe, { cwd: __dirname, stdio: [0, 1, 2] });
+cp.execSync(rescript_exe, { cwd: __dirname });

jscomp/build_tests/rerror/input.js

@@ -4,7 +4,6 @@ var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 child_process.spawnSync(`${rescript_exe} clean -with-deps`, {
   cwd: __dirname,
   encoding: "utf8",
-  stdio: [0, 1, 2],
 });
 var o = child_process.spawnSync(rescript_exe, {
   cwd: __dirname,

jscomp/build_tests/scoped_ppx/input.js

@@ -1,7 +1,7 @@
 var cp = require("child_process");
 var assert = require("assert");
 var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-cp.execSync(rescript_exe, { cwd: __dirname, stdio: [0, 1, 2], encoding: "utf8" });
+cp.execSync(rescript_exe, { cwd: __dirname, encoding: "utf8" });
 
 var output = cp.execSync(`${rescript_exe} build -- -t commands src/hello.ast`, {
   cwd: __dirname,

jscomp/build_tests/white space/input.js

@@ -7,7 +7,6 @@ try {
   p.execSync(`${rescript_exe} build`, {
     cwd: __dirname,
     encoding: "utf8",
-    stdio: [0, 1, 2],
   });
   r.rollup({
     input: path.join(__dirname, "yy.js"),

scripts/ciTest.js

@@ -118,7 +118,6 @@ function runTests() {
       encoding: "utf8",
     });
     var files = fs.readdirSync(buildTestDir);
-    var failed = [];
     files.forEach(function (file) {
       var testDir = path.join(buildTestDir, file);
       if (file === "node_modules" || !fs.lstatSync(testDir).isDirectory()) {
@@ -129,20 +128,22 @@ function runTests() {
       } else {
         console.log(`testing ${file}`);
         // note existsSync test already ensure that it is a directory
-        try {
-          cp.exec(`node input.js`, { cwd: testDir, encoding: "utf8" });
-          console.log("✅ success in ", file);
-        } catch (e) {
-          failed.push(file);
-          console.log("❌ error", e);
-        }
+        cp.exec(
+          `node input.js`,
+          { cwd: testDir, encoding: "utf8" },
+          function (error, stdout, stderr) {
+            console.log(stdout);
+
+            if (error !== null) {
+              console.log(stderr);
+              throw new Error(`❌ error in ${file}: \n${error} `);
+            } else {
+              console.log("✅ success in ", file);
+            }
+          }
+        );
       }
     });
-    if (failed.length > 0) {
-      console.log("");
-      console.log("❌ Build tests failed", failed);
-      throw new Error();
-    }
   }
 }