diff --git a/test/blackbox-tests/test-cases/exclude-missing-module/run.t b/test/blackbox-tests/test-cases/exclude-missing-module/run.t index 900bbcae9f4..b33629ee4ec 100644 --- a/test/blackbox-tests/test-cases/exclude-missing-module/run.t +++ b/test/blackbox-tests/test-cases/exclude-missing-module/run.t @@ -1,3 +1,3 @@ $ dune build --display short - File "jbuild", line 3, characters 24-28: + File "dune", line 3, characters 24-28: Warning: Module Fake is excluded but it doesn't exist. diff --git a/test/blackbox-tests/test-cases/findlib/run.t b/test/blackbox-tests/test-cases/findlib/run.t index 8d6adaec77d..e252556cda8 100644 --- a/test/blackbox-tests/test-cases/findlib/run.t +++ b/test/blackbox-tests/test-cases/findlib/run.t @@ -7,7 +7,7 @@ Reproduction case for #484. The error should point to src/jbuild $ dune build @install - File "src/jbuild", line 4, characters 16-17: + File "src/dune", line 4, characters 16-17: Error: Library "a" not found. Hint: try: dune external-lib-deps --missing @install [1] diff --git a/test/blackbox-tests/test-cases/github644/run.t b/test/blackbox-tests/test-cases/github644/run.t index ac881f2d567..8bdb70fd7e4 100644 --- a/test/blackbox-tests/test-cases/github644/run.t +++ b/test/blackbox-tests/test-cases/github644/run.t @@ -1,5 +1,5 @@ $ dune runtest - File "jbuild", line 4, characters 20-42: + File "dune", line 4, characters 20-42: Error: Library "ppx_that_doesn't_exist" not found. Hint: try: dune external-lib-deps --missing @runtest [1] diff --git a/test/blackbox-tests/test-cases/include-loop/run.t b/test/blackbox-tests/test-cases/include-loop/run.t index 28650d8484b..bf044efa0fa 100644 --- a/test/blackbox-tests/test-cases/include-loop/run.t +++ b/test/blackbox-tests/test-cases/include-loop/run.t @@ -1,8 +1,8 @@ $ dune build --display short - File "jbuild", line 2, characters 0-15: + File "dune", line 2, characters 0-15: Error: Recursive inclusion of jbuild files detected: File a.inc is included from c.inc:2 --> included from b.inc:2 --> included from a.inc:2 - --> included from jbuild:2 + --> included from dune:2 [1] diff --git a/test/blackbox-tests/test-cases/inline_tests/run.t b/test/blackbox-tests/test-cases/inline_tests/run.t index 4e2e7e450ba..cc4780368d2 100644 --- a/test/blackbox-tests/test-cases/inline_tests/run.t +++ b/test/blackbox-tests/test-cases/inline_tests/run.t @@ -5,12 +5,12 @@ [1] $ dune runtest missing-backend - File "missing-backend/jbuild", line 3, characters 2-16: + File "missing-backend/dune", line 3, characters 2-16: Error: No inline tests backend found. [1] $ dune runtest too-many-backends - File "too-many-backends/jbuild", line 17, characters 2-16: + File "too-many-backends/dune", line 17, characters 2-16: Error: Too many independant inline tests backends found: - "backend_tmb1" in _build/default/too-many-backends - "backend_tmb2" in _build/default/too-many-backends diff --git a/test/blackbox-tests/test-cases/intf-only/run.t b/test/blackbox-tests/test-cases/intf-only/run.t index 3d3a3c1f3a6..0365f33b065 100644 --- a/test/blackbox-tests/test-cases/intf-only/run.t +++ b/test/blackbox-tests/test-cases/intf-only/run.t @@ -21,7 +21,7 @@ Successes: Errors: $ dune build --display short --root a foo.cma 2>&1 | grep -v Entering - File "jbuild", line 2, characters 1-13: + File "dune", line 2, characters 1-13: Warning: Some modules don't have an implementation. You need to add the following field to this stanza: @@ -31,15 +31,15 @@ Errors: ocamlc .foo.objs/foo.{cmi,cmo,cmt} ocamlc foo.cma $ dune build --display short --root b foo.cma 2>&1 | grep -v Entering - File "jbuild", line 3, characters 34-37: + File "dune", line 3, characters 34-37: Warning: The following modules must be listed here as they don't have an implementation: - y This will become an error in the future. ocamlc .foo.objs/foo.{cmi,cmo,cmt} ocamlc foo.cma $ dune build --display short --root c foo.cma 2>&1 | grep -v Entering - File "jbuild", line 3, characters 35-36: + File "dune", line 3, characters 35-36: Error: Module X doesn't exist. $ dune build --display short --root d foo.cma 2>&1 | grep -v Entering - File "jbuild", line 3, characters 35-36: + File "dune", line 3, characters 35-36: Error: Module X has an implementation, it cannot be listed here diff --git a/test/blackbox-tests/test-cases/misc/run.t b/test/blackbox-tests/test-cases/misc/run.t index 0dcbe42ec64..514d25e7e71 100644 --- a/test/blackbox-tests/test-cases/misc/run.t +++ b/test/blackbox-tests/test-cases/misc/run.t @@ -1,7 +1,7 @@ $ dune runtest --display short - File "jbuild", line 65, characters 21-44: + File "dune", line 65, characters 21-44: Warning: Directory dir-that-doesnt-exist doesn't exist. + No rule found for jbuild diff alias runtest diff alias runtest - diff alias runtest - diff alias runtest + [1] diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t index 0bd5be8a6af..0aa1554b701 100644 --- a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t +++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t @@ -1,8 +1,8 @@ $ dune exec ./test.exe --debug-dep --display short - File "jbuild", line 1, characters 0-0: + File "dune", line 1, characters 0-0: Warning: Module "Lib" is used in several stanzas: - - jbuild:8 - - jbuild:4 + - dune:8 + - dune:4 To remove this warning, you must specify an explicit "modules" field in every library, executable, and executables stanzas in this jbuild file. Note that each module cannot appear in more than one "modules" field - it must belong @@ -14,10 +14,10 @@ [1] $ dune build src/a.cma --debug-dep --display short - File "src/jbuild", line 1, characters 0-0: + File "src/dune", line 1, characters 0-0: Warning: Module "X" is used in several stanzas: - - src/jbuild:4 - - src/jbuild:3 + - src/dune:4 + - src/dune:3 To remove this warning, you must specify an explicit "modules" field in every library, executable, and executables stanzas in this jbuild file. Note that each module cannot appear in more than one "modules" field - it must belong diff --git a/test/blackbox-tests/test-cases/private-public-overlap/run.t b/test/blackbox-tests/test-cases/private-public-overlap/run.t index c3aa05d40d1..98605bc1c51 100644 --- a/test/blackbox-tests/test-cases/private-public-overlap/run.t +++ b/test/blackbox-tests/test-cases/private-public-overlap/run.t @@ -1,7 +1,7 @@ public libraries may not have private dependencies $ dune build --display short --root private-dep 2>&1 | grep -v Entering - File "jbuild", line 10, characters 14-24: + File "dune", line 10, characters 14-24: Error: Library "privatelib" is private, it cannot be a dependency of a public library. You need to give "privatelib" a public name. ocamldep publiclib.ml.d @@ -22,7 +22,7 @@ On the other hand, public libraries may have private preprocessors Unless they introduce private runtime dependencies: $ dune build --display short --root private-runtime-deps 2>&1 | grep -v Entering - File "jbuild", line 16, characters 20-31: + File "dune", line 16, characters 20-31: Error: Library "private_runtime_dep" is private, it cannot be a dependency of a public library. You need to give "private_runtime_dep" a public name. ocamlc .private_ppx.objs/private_ppx.{cmi,cmo,cmt}