diff --git a/test/blackbox-tests/test-cases/melange/flags.t b/test/blackbox-tests/test-cases/melange/flags.t index 3626983f988..34d8a8ec0b6 100644 --- a/test/blackbox-tests/test-cases/melange/flags.t +++ b/test/blackbox-tests/test-cases/melange/flags.t @@ -43,7 +43,7 @@ Trying to build triggers both warnings File "main.ml", line 1, characters 9-11: 1 | let t = "\e\n" in ^^ - Error (warning 14 [illegal-backslash]): illegal backslash escape in string. + Warning 14 [illegal-backslash]: illegal backslash escape in string. File "main.ml", line 1, characters 4-5: 1 | let t = "\e\n" in ^ @@ -62,6 +62,10 @@ Let's ignore them using compile_flags > EOF $ dune build @mel + File "main.ml", line 1, characters 9-11: + 1 | let t = "\e\n" in + ^^ + Warning 14 [illegal-backslash]: illegal backslash escape in string. $ node _build/default/output/main.js hello @@ -79,7 +83,7 @@ Can also pass flags from the env stanza. Let's go back to failing state: File "main.ml", line 1, characters 9-11: 1 | let t = "\e\n" in ^^ - Error (warning 14 [illegal-backslash]): illegal backslash escape in string. + Warning 14 [illegal-backslash]: illegal backslash escape in string. File "main.ml", line 1, characters 4-5: 1 | let t = "\e\n" in ^ @@ -100,6 +104,10 @@ Adding env stanza with both warnings silenced allows the build to pass successfu > EOF $ dune build @mel + File "main.ml", line 1, characters 9-11: + 1 | let t = "\e\n" in + ^^ + Warning 14 [illegal-backslash]: illegal backslash escape in string. $ node _build/default/output/main.js hello diff --git a/test/blackbox-tests/test-cases/melange/library-include-subdirs.t b/test/blackbox-tests/test-cases/melange/library-include-subdirs.t index d95c3794cf3..a868ef05c44 100644 --- a/test/blackbox-tests/test-cases/melange/library-include-subdirs.t +++ b/test/blackbox-tests/test-cases/melange/library-include-subdirs.t @@ -35,7 +35,7 @@ Test moving modules in a library with `(include_subdirs unqualified)` Melange shows the proper path to `bar.js` $ cat _build/default/output/lib/foo.js | grep bar.js - let Foo__Bar = require("./init/bar.js"); + const Foo__Bar = require("./init/bar.js"); $ mv lib/init lib/end $ dune build @mel @@ -43,7 +43,7 @@ Melange shows the proper path to `bar.js` The import in `foo.js` has been updated to the new bar.js target $ cat _build/default/output/lib/foo.js | grep bar.js - let Foo__Bar = require("./end/bar.js"); + const Foo__Bar = require("./end/bar.js"); The initial file is not there anymore @@ -79,7 +79,7 @@ Now try the same thing with `melange.emit` Melange shows the proper path to `bar.js` $ cat _build/default/output/foo.js | grep bar.js - let Melange__Bar = require("./init/bar.js"); + const Melange__Bar = require("./init/bar.js"); $ mv init end $ dune build @mel @@ -87,7 +87,7 @@ Melange shows the proper path to `bar.js` The import in `foo.js` has been updated to the new bar.js target $ cat _build/default/output/foo.js | grep bar.js - let Melange__Bar = require("./end/bar.js"); + const Melange__Bar = require("./end/bar.js"); The initial file is not there anymore diff --git a/test/blackbox-tests/test-cases/melange/merlin.t b/test/blackbox-tests/test-cases/melange/merlin.t index 8a4d7e6a873..756fc821bcf 100644 --- a/test/blackbox-tests/test-cases/melange/merlin.t +++ b/test/blackbox-tests/test-cases/melange/merlin.t @@ -41,10 +41,12 @@ Paths to Melange stdlib appear in B and S entries without melange.emit stanza $ dune ocaml dump-dot-merlin $PWD | grep -e "^B " -e "^S " + B /MELC_STDLIB/__private__/melange_mini_stdlib/melange/.public_cmi_melange B /MELC_STDLIB/melange B /MELC_STDLIB/melange B $TESTCASE_ROOT/_build/default/.foo.objs/melange S /MELC_STDLIB + S /MELC_STDLIB/__private__/melange_mini_stdlib S /MELC_STDLIB S $TESTCASE_ROOT @@ -68,10 +70,12 @@ Dump-dot-merlin includes the melange flags $ dune ocaml dump-dot-merlin $PWD EXCLUDE_QUERY_DIR STDLIB /MELC_STDLIB/melange + B /MELC_STDLIB/__private__/melange_mini_stdlib/melange/.public_cmi_melange B /MELC_STDLIB/melange B /MELC_STDLIB/melange B $TESTCASE_ROOT/_build/default/.output.mobjs/melange S /MELC_STDLIB + S /MELC_STDLIB/__private__/melange_mini_stdlib S /MELC_STDLIB S $TESTCASE_ROOT # FLG -w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g -mel-g @@ -113,6 +117,8 @@ User ppx flags should appear in merlin config Bar: _build/default/bar ((STDLIB /MELC_STDLIB/melange) (EXCLUDE_QUERY_DIR) + (B + /MELC_STDLIB/__private__/melange_mini_stdlib/melange/.public_cmi_melange) (B $TESTCASE_ROOT/_build/default/.foo.objs/melange) (S @@ -135,6 +141,8 @@ User ppx flags should appear in merlin config Bar: _build/default/bar.ml ((STDLIB /MELC_STDLIB/melange) (EXCLUDE_QUERY_DIR) + (B + /MELC_STDLIB/__private__/melange_mini_stdlib/melange/.public_cmi_melange) (B $TESTCASE_ROOT/_build/default/.foo.objs/melange) (S @@ -157,6 +165,8 @@ User ppx flags should appear in merlin config Foo: _build/default/foo ((STDLIB /MELC_STDLIB/melange) (EXCLUDE_QUERY_DIR) + (B + /MELC_STDLIB/__private__/melange_mini_stdlib/melange/.public_cmi_melange) (B $TESTCASE_ROOT/_build/default/.foo.objs/melange) (S @@ -178,6 +188,8 @@ User ppx flags should appear in merlin config Foo: _build/default/foo.ml-gen ((STDLIB /MELC_STDLIB/melange) (EXCLUDE_QUERY_DIR) + (B + /MELC_STDLIB/__private__/melange_mini_stdlib/melange/.public_cmi_melange) (B $TESTCASE_ROOT/_build/default/.foo.objs/melange) (S diff --git a/test/blackbox-tests/test-cases/melange/ocaml-flags.t b/test/blackbox-tests/test-cases/melange/ocaml-flags.t index 0d099553978..e2d5ebd2a18 100644 --- a/test/blackbox-tests/test-cases/melange/ocaml-flags.t +++ b/test/blackbox-tests/test-cases/melange/ocaml-flags.t @@ -26,6 +26,10 @@ The code in main contains unused var (warning 26) and illegal backlash (warning Building does not fail, warnings are silenced $ dune build @mel + File "main.ml", line 1, characters 9-11: + 1 | let t = "\e\n" in + ^^ + Warning 14 [illegal-backslash]: illegal backslash escape in string. $ node _build/default/output/main.js hello diff --git a/test/blackbox-tests/test-cases/melange/private-lib-dep.t b/test/blackbox-tests/test-cases/melange/private-lib-dep.t index 687b3daf275..b2ee59e313f 100644 --- a/test/blackbox-tests/test-cases/melange/private-lib-dep.t +++ b/test/blackbox-tests/test-cases/melange/private-lib-dep.t @@ -48,7 +48,7 @@ Melange public library depends on private library // Generated by Melange 'use strict'; - let Priv = require("foo.__private__.priv/priv.js"); + const Priv = require("foo.__private__.priv/priv.js"); const x = "public lib uses " + Priv.x; diff --git a/test/blackbox-tests/test-cases/merlin/dialect.t/run.t b/test/blackbox-tests/test-cases/merlin/dialect.t/run.t index 62106c4a9af..53599138059 100644 --- a/test/blackbox-tests/test-cases/merlin/dialect.t/run.t +++ b/test/blackbox-tests/test-cases/merlin/dialect.t/run.t @@ -67,11 +67,14 @@ CRAM sanitization X_mel: _build/default/melange/x_mel ((STDLIB lib/melange/melange) (EXCLUDE_QUERY_DIR) + (B + lib/melange/__private__/melange_mini_stdlib/melange/.public_cmi_melange) (B lib/melange/js/melange) (B lib/melange/melange) (B $TESTCASE_ROOT/_build/default/melange/.x_mel.objs/melange) (S lib/melange) + (S lib/melange/__private__/melange_mini_stdlib) (S lib/melange/js) (S $TESTCASE_ROOT/melange) @@ -81,11 +84,14 @@ CRAM sanitization X_mel: _build/default/melange/x_mel.mlx ((STDLIB lib/melange/melange) (EXCLUDE_QUERY_DIR) + (B + lib/melange/__private__/melange_mini_stdlib/melange/.public_cmi_melange) (B lib/melange/js/melange) (B lib/melange/melange) (B $TESTCASE_ROOT/_build/default/melange/.x_mel.objs/melange) (S lib/melange) + (S lib/melange/__private__/melange_mini_stdlib) (S lib/melange/js) (S $TESTCASE_ROOT/melange)