tests: point all input.js files to exes directly

Author: jchavarri

jscomp/build_tests/bs_dependencies_node_path_override/testcase.js

@@ -3,8 +3,9 @@ var assert = require('assert')
 var path = require('path')
 var p = require('child_process')
 var fs = require('fs')
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe
 var output = p.spawnSync(
- `../node_modules/.bin/rescript clean -with-deps && ../node_modules/.bin/rescript build`,
+ `${rescript_exe} clean -with-deps && ${rescript_exe} build`,
  {
  cwd: __dirname,
  encoding: "utf8",
@@ -14,4 +15,4 @@ var output = p.spawnSync(
 fs.rmSync('overridden_node_modules/liba/lib', { recursive: true, force: true })
 
 var u = require("./examples/test.js")
-assert.equal(path.basename(u.v), 'demo.mldemo.ml')
+assert.equal(path.basename(u.v), 'demo.mldemo.ml')

jscomp/build_tests/bucklescript-tea/input.js

@@ -1,9 +1,10 @@
 var p = require("child_process");
 const { assert } = require("console");
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe
 
-var o = p.spawnSync(`../node_modules/.bin/rescript`);
+var o = p.spawnSync(rescript_exe);
 
 console.log(o.stderr + "");
 console.log("-----");
 console.log(o.stdout + "");
-assert(o.status === 0)
+assert(o.status === 0)

jscomp/build_tests/case/input.js

@@ -2,7 +2,8 @@
 
 var p = require('child_process')
 var assert = require('assert')
-var o = p.spawnSync(`../node_modules/.bin/rescript`,{encoding: 'utf8',cwd : __dirname})
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe
+var o = p.spawnSync(rescript_exe,{encoding: 'utf8',cwd : __dirname})
 
 
-assert.ok(o.stderr.match(/different cases/).length > 0 )
+assert.ok(o.stderr.match(/different cases/).length > 0 )

jscomp/build_tests/case2/input.js

@@ -1,5 +1,6 @@
 var p = require("child_process");
 var assert = require("assert");
-var o = p.spawnSync(`../node_modules/.bin/rescript`, { encoding: "utf8", cwd: __dirname });
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
 
 assert.ok(o.stderr.match(/different cases/).length > 0);

jscomp/build_tests/case3/input.js

@@ -4,7 +4,8 @@ var p = require("child_process");
 var fs = require("fs");
 var path = require("path");
 var assert = require("assert");
-p.spawnSync(`../node_modules/.bin/rescript`, {
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+p.spawnSync(rescript_exe, {
  encoding: "utf8",
  cwd: __dirname,
  stdio: [0, 1, 2],

jscomp/build_tests/cmd/input.js

@@ -2,6 +2,8 @@ var p = require("child_process");
 
 var assert = require("assert");
 
+var bsc_exe_path = require("../../../scripts/bin_path").bsc_exe;
+
 var react = `
 type u 
 
@@ -28,7 +30,7 @@ let d = bar ()
 
 function evalCode(code) {
  var bsc_exe = p.spawnSync(
- `../node_modules/.bin/bsc -bs-no-version-header -bs-cross-module-opt -w -40 -bs-eval '${code}'`,
+ `${bsc_exe_path} -bs-no-version-header -bs-cross-module-opt -w -40 -bs-eval '${code}'`,
  {
  encoding: "utf8",
  shell: true,

jscomp/build_tests/customize_namespace/input.js

@@ -2,6 +2,7 @@
 
 var cp = require("child_process");
 var assert = require("assert");
-cp.execSync(`../node_modules/.bin/rescript build`, { cwd: __dirname, encoding: "utf8" });
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
+cp.execSync(`${rescript_exe} build`, { cwd: __dirname, encoding: "utf8" });
 
 assert.equal(require("./src/demo.bs").v, 5);

jscomp/build_tests/cycle/input.js

@@ -3,11 +3,12 @@ const cp = require("child_process");
 const assert = require("assert");
 const fs = require('fs')
 const path = require('path')
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 
-var output = cp.spawnSync(`../node_modules/.bin/rescript`, { encoding: "utf8", shell: true });
+var output = cp.spawnSync(rescript_exe, { encoding: "utf8", shell: true });
 
 assert(/dependency cycle/.test(output.stdout));
 
 var compilerLogFile = path.join(__dirname, 'lib', 'bs', '.compiler.log');
 var compilerLog = fs.readFileSync(compilerLogFile, 'utf8');
-assert(/dependency cycle/.test(compilerLog));
+assert(/dependency cycle/.test(compilerLog));

jscomp/build_tests/cycle1/input.js

@@ -3,11 +3,12 @@ const cp = require("child_process");
 const assert = require("assert");
 const fs = require('fs')
 const path = require('path')
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe
 
-var output = cp.spawnSync(`../node_modules/.bin/rescript`, { encoding: "utf8", shell: true });
+var output = cp.spawnSync(rescript_exe, { encoding: "utf8", shell: true });
 
 assert(/is dangling/.test(output.stdout));
 
 var compilerLogFile = path.join(__dirname, 'lib', 'bs', '.compiler.log');
 var compilerLog = fs.readFileSync(compilerLogFile, 'utf8');
-assert(/is dangling/.test(compilerLog));
+assert(/is dangling/.test(compilerLog));

jscomp/build_tests/dev/input.js

@@ -2,6 +2,7 @@
 var assert = require("assert");
 var path = require("path");
 var p = require("child_process");
-p.execSync(`npx rescript build`, { cwd: __dirname, shell: true, encoding: "utf8" });
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe
+p.execSync(`${rescript_exe} build`, { cwd: __dirname, shell: true, encoding: "utf8" });
 var u = require("./examples/test.js");
 assert.equal(path.basename(u.v), "demo.mldemo.ml");