Skip to content

Commit bc2840e

Browse files
authored
Build tests clean up (#6365)
* Remove unrelated files from tests * Remove npm link * Fix tests on Linux * Clean up test success log
1 parent 835a961 commit bc2840e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+42
-1891
lines changed

jscomp/build_tests/case/.gitignore

-25
This file was deleted.

jscomp/build_tests/case/README.md

-16
This file was deleted.

jscomp/build_tests/case/input.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,12 @@ var assert = require("assert");
33
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
44
var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
55

6-
assert.ok(o.stderr.match(/different cases/).length > 0);
6+
if (
7+
![
8+
`Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/demo vs src/Demo\n`,
9+
// On linux files are parsed in different order
10+
`Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/Demo vs src/demo\n`,
11+
].includes(o.stderr)
12+
) {
13+
assert.fail(o.stderr);
14+
}

jscomp/build_tests/case/package.json

-16
This file was deleted.

jscomp/build_tests/case2/.gitignore

-25
This file was deleted.

jscomp/build_tests/case2/README.md

-16
This file was deleted.

jscomp/build_tests/case2/input.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,12 @@ var assert = require("assert");
33
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
44
var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
55

6-
assert.ok(o.stderr.match(/different cases/).length > 0);
6+
if (
7+
![
8+
`Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/X vs src/x\n`,
9+
// On linux files are parsed in different order
10+
`Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/x vs src/X\n`,
11+
].includes(o.stderr)
12+
) {
13+
assert.fail(o.stderr);
14+
}

jscomp/build_tests/case2/package.json

-16
This file was deleted.

jscomp/build_tests/case3/.gitignore

-27
This file was deleted.

jscomp/build_tests/case3/README.md

-16
This file was deleted.

jscomp/build_tests/case3/input.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ var fs = require("fs");
55
var path = require("path");
66
var assert = require("assert");
77
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
8-
p.spawnSync(rescript_exe, {
8+
p.spawnSync(`${rescript_exe} clean && ${rescript_exe} build`, {
99
encoding: "utf8",
1010
cwd: __dirname,
1111
});
1212

1313
var o = fs.readFileSync(path.join(__dirname, "src", "hello.bs.js"), "ascii");
14-
assert.ok(/HelloGen.f/.test(o));
14+
assert.ok(/HelloGen\.f/.test(o));

jscomp/build_tests/case3/package-lock.json

-64
This file was deleted.

jscomp/build_tests/case3/package.json

-17
This file was deleted.

jscomp/build_tests/case3/src/hello.bs.js

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jscomp/build_tests/custom_namespace/.gitignore

-25
This file was deleted.

jscomp/build_tests/custom_namespace/README.md

-16
This file was deleted.

jscomp/build_tests/custom_namespace/input.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
var child_process = require("child_process");
2-
var fs = require("fs");
3-
var path = require("path");
42
var assert = require("assert");
53
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
64

jscomp/build_tests/custom_namespace/package.json

-16
This file was deleted.

0 commit comments

Comments
 (0)