From d6e878674a78857088142f363870bebed506626c Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Tue, 1 May 2018 17:25:02 +0100 Subject: [PATCH] Update tests --- test/blackbox-tests/test-cases/aliases/run.t | 16 ++++++++-------- test/blackbox-tests/test-cases/c-stubs/run.t | 4 ++-- .../blackbox-tests/test-cases/configurator/run.t | 6 +++--- test/blackbox-tests/test-cases/copy_files/run.t | 4 ++-- .../test-cases/depend-on-the-universe/run.t | 10 +++++----- .../test-cases/exclude-missing-module/run.t | 2 +- test/blackbox-tests/test-cases/exec-cmd/run.t | 12 ++++++------ test/blackbox-tests/test-cases/findlib/run.t | 4 ++-- test/blackbox-tests/test-cases/force-test/run.t | 8 ++++---- .../test-cases/gen-opam-install-file/run.t | 2 +- test/blackbox-tests/test-cases/github20/run.t | 2 +- test/blackbox-tests/test-cases/github24/run.t | 2 +- test/blackbox-tests/test-cases/github25/run.t | 4 ++-- test/blackbox-tests/test-cases/github534/run.t | 2 +- test/blackbox-tests/test-cases/github568/run.t | 2 +- test/blackbox-tests/test-cases/github597/run.t | 2 +- test/blackbox-tests/test-cases/github644/run.t | 6 +++--- test/blackbox-tests/test-cases/github660/run.t | 8 ++++---- .../test-cases/github717-odoc-index/run.t | 2 +- .../blackbox-tests/test-cases/include-loop/run.t | 2 +- .../blackbox-tests/test-cases/inline_tests/run.t | 8 ++++---- .../installable-dup-private-libs/run.t | 2 +- test/blackbox-tests/test-cases/intf-only/run.t | 10 +++++----- test/blackbox-tests/test-cases/js_of_ocaml/run.t | 4 ++-- .../test-cases/lib-available/run.t | 2 +- test/blackbox-tests/test-cases/loop/run.t | 6 +++--- test/blackbox-tests/test-cases/menhir/run.t | 2 +- .../blackbox-tests/test-cases/merlin-tests/run.t | 2 +- test/blackbox-tests/test-cases/meta-gen/run.t | 2 +- test/blackbox-tests/test-cases/misc/run.t | 2 +- .../test-cases/multiple-private-libs/run.t | 2 +- test/blackbox-tests/test-cases/null-dep/run.t | 2 +- .../blackbox-tests/test-cases/ocaml-syntax/run.t | 2 +- .../test-cases/ocamldep-multi-stanzas/run.t | 4 ++-- .../test-cases/odoc-unique-mlds/run.t | 4 ++-- test/blackbox-tests/test-cases/odoc/run.t | 8 ++++---- test/blackbox-tests/test-cases/output-obj/run.t | 4 ++-- test/blackbox-tests/test-cases/package-dep/run.t | 2 +- .../blackbox-tests/test-cases/ppx-rewriter/run.t | 6 +++--- .../test-cases/private-public-overlap/run.t | 10 +++++----- test/blackbox-tests/test-cases/promote/run.t | 12 ++++++------ test/blackbox-tests/test-cases/quoting/run.t | 2 +- test/blackbox-tests/test-cases/reason/run.t | 2 +- .../blackbox-tests/test-cases/redirections/run.t | 2 +- test/blackbox-tests/test-cases/scope-bug/run.t | 2 +- .../test-cases/scope-ppx-bug/run.t | 2 +- test/blackbox-tests/test-cases/select/run.t | 2 +- test/blackbox-tests/test-cases/utop/run.t | 2 +- 48 files changed, 105 insertions(+), 105 deletions(-) diff --git a/test/blackbox-tests/test-cases/aliases/run.t b/test/blackbox-tests/test-cases/aliases/run.t index 1211d4d56ad..b249a3bbb63 100644 --- a/test/blackbox-tests/test-cases/aliases/run.t +++ b/test/blackbox-tests/test-cases/aliases/run.t @@ -1,22 +1,22 @@ - $ jbuilder clean --display short - $ jbuilder build --display short @just-in-src + $ dune clean --display short + $ dune build --display short @just-in-src running in src - $ jbuilder clean --display short - $ jbuilder build --display short @everywhere + $ dune clean --display short + $ dune build --display short @everywhere running in src/foo/bar running in src/foo/baz running in src - $ jbuilder clean --display short - $ jbuilder build --display short @x + $ dune clean --display short + $ dune build --display short @x running in src/foo/bar running in src/foo/baz running in src - $ jbuilder build --display short @plop + $ dune build --display short @plop From the command line: Error: Alias plop is empty. It is not defined in . or any of its descendants. [1] - $ jbuilder build --display short @truc/x + $ dune build --display short @truc/x From the command line: Error: Don't know about directory truc! [1] diff --git a/test/blackbox-tests/test-cases/c-stubs/run.t b/test/blackbox-tests/test-cases/c-stubs/run.t index bdf668e4e82..5dcbb41986c 100644 --- a/test/blackbox-tests/test-cases/c-stubs/run.t +++ b/test/blackbox-tests/test-cases/c-stubs/run.t @@ -1,4 +1,4 @@ - $ jbuilder exec ./qnativerun/run.exe --display short + $ dune exec ./qnativerun/run.exe --display short ocamldep qnativerun/run.ml.d ocamlc q/q_stub$ext_obj ocamlmklib q/dllq_stubs$ext_dll,q/libq_stubs$ext_lib @@ -11,4 +11,4 @@ ocamlopt qnativerun/.run.eobjs/run.{cmx,o} ocamlopt qnativerun/run.exe 42 -# $ jbuilder exec ./qbyterun/run.bc --display short +# $ dune exec ./qbyterun/run.bc --display short diff --git a/test/blackbox-tests/test-cases/configurator/run.t b/test/blackbox-tests/test-cases/configurator/run.t index 3e29af3b883..533b38039b5 100644 --- a/test/blackbox-tests/test-cases/configurator/run.t +++ b/test/blackbox-tests/test-cases/configurator/run.t @@ -1,14 +1,14 @@ Show that config values are present - $ jbuilder exec config/run.exe + $ dune exec config/run.exe DUNE_CONFIGURATOR is present version is present We're able to compile C program sucessfully - $ jbuilder exec c_test/run.exe + $ dune exec c_test/run.exe Successfully compiled c program Importing #define's from code is successful - $ jbuilder exec import-define/run.exe + $ dune exec import-define/run.exe CAML_CONFIG_H=true Page_log=12 CONFIGURATOR_TESTING=foobar diff --git a/test/blackbox-tests/test-cases/copy_files/run.t b/test/blackbox-tests/test-cases/copy_files/run.t index feba60bcd8c..eb92ac921cc 100644 --- a/test/blackbox-tests/test-cases/copy_files/run.t +++ b/test/blackbox-tests/test-cases/copy_files/run.t @@ -1,4 +1,4 @@ - $ jbuilder build test.exe .merlin --display short --debug-dependency-path + $ dune build test.exe .merlin --display short --debug-dependency-path ocamllex lexers/lexer1.ml ocamldep lexer1.ml.d ocamldep test.ml.d @@ -13,6 +13,6 @@ ocamlc .test.eobjs/test.{cmi,cmo,cmt} ocamlopt .test.eobjs/test.{cmx,o} ocamlopt test.exe - $ jbuilder build @bar-source --display short + $ dune build @bar-source --display short #line 1 "include/bar.h" int foo () {return 42;} diff --git a/test/blackbox-tests/test-cases/depend-on-the-universe/run.t b/test/blackbox-tests/test-cases/depend-on-the-universe/run.t index 362ffdc53e5..720c0ab08b5 100644 --- a/test/blackbox-tests/test-cases/depend-on-the-universe/run.t +++ b/test/blackbox-tests/test-cases/depend-on-the-universe/run.t @@ -1,10 +1,10 @@ - $ jbuilder build @x + $ dune build @x Hello, world! - $ jbuilder build @x + $ dune build @x Hello, world! - $ jbuilder build @x + $ dune build @x Hello, world! - $ jbuilder build @x + $ dune build @x Hello, world! - $ jbuilder build @x + $ dune build @x Hello, world! 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 1748c2435fb..900bbcae9f4 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 @@ - $ jbuilder build --display short + $ dune build --display short File "jbuild", line 3, characters 24-28: Warning: Module Fake is excluded but it doesn't exist. diff --git a/test/blackbox-tests/test-cases/exec-cmd/run.t b/test/blackbox-tests/test-cases/exec-cmd/run.t index 04381a7c018..230a7552652 100644 --- a/test/blackbox-tests/test-cases/exec-cmd/run.t +++ b/test/blackbox-tests/test-cases/exec-cmd/run.t @@ -1,22 +1,22 @@ - $ jbuilder clean --display short - $ jbuilder exec --no-build ./foo.exe --display short + $ dune clean --display short + $ dune exec --no-build ./foo.exe --display short Error: Program "./foo.exe" isn't built yet you need to buid it first or remove the --no-build option. [1] - $ jbuilder exec ./foo.exe --display short + $ dune exec ./foo.exe --display short ocamldep foo.ml.d ocamlc .foo.eobjs/foo.{cmi,cmo,cmt} ocamlopt .foo.eobjs/foo.{cmx,o} ocamlopt foo.exe Foo - $ jbuilder exec --dev ./foo.exe --display short + $ dune exec --dev ./foo.exe --display short ocamlc .foo.eobjs/foo.{cmi,cmo,cmt} ocamlopt .foo.eobjs/foo.{cmx,o} ocamlopt foo.exe Foo - $ jbuilder exec dunetestbar --no-build --display short + $ dune exec dunetestbar --no-build --display short Error: Program "dunetestbar" isn't built yet you need to buid it first or remove the --no-build option. [1] - $ jbuilder exec dunetestbar --display short + $ dune exec dunetestbar --display short ocamldep bar.ml.d ocamlc .bar.eobjs/bar.{cmi,cmo,cmt} ocamlopt .bar.eobjs/bar.{cmx,o} diff --git a/test/blackbox-tests/test-cases/findlib/run.t b/test/blackbox-tests/test-cases/findlib/run.t index 2fb9e848cad..8d6adaec77d 100644 --- a/test/blackbox-tests/test-cases/findlib/run.t +++ b/test/blackbox-tests/test-cases/findlib/run.t @@ -1,4 +1,4 @@ - $ jbuilder external-lib-deps @install + $ dune external-lib-deps @install These are the external library dependencies in the default context: - a - b @@ -6,7 +6,7 @@ Reproduction case for #484. The error should point to src/jbuild - $ jbuilder build @install + $ dune build @install File "src/jbuild", line 4, characters 16-17: Error: Library "a" not found. Hint: try: dune external-lib-deps --missing @install diff --git a/test/blackbox-tests/test-cases/force-test/run.t b/test/blackbox-tests/test-cases/force-test/run.t index 2da42648115..23530751bb0 100644 --- a/test/blackbox-tests/test-cases/force-test/run.t +++ b/test/blackbox-tests/test-cases/force-test/run.t @@ -1,12 +1,12 @@ - $ jbuilder clean --display short - $ jbuilder runtest --display short + $ dune clean --display short + $ dune runtest --display short ocamldep f.ml.d ocamlc .f.eobjs/f.{cmi,cmo,cmt} ocamlopt .f.eobjs/f.{cmx,o} ocamlopt f.exe f alias runtest Foo Bar - $ jbuilder runtest --display short - $ jbuilder runtest --force --display short + $ dune runtest --display short + $ dune runtest --force --display short f alias runtest Foo Bar diff --git a/test/blackbox-tests/test-cases/gen-opam-install-file/run.t b/test/blackbox-tests/test-cases/gen-opam-install-file/run.t index d2b1e354a2b..990fb4ad249 100644 --- a/test/blackbox-tests/test-cases/gen-opam-install-file/run.t +++ b/test/blackbox-tests/test-cases/gen-opam-install-file/run.t @@ -1,4 +1,4 @@ - $ jbuilder runtest --display short + $ dune runtest --display short ocamldep bar.ml.d ocamldep foo.ml.d ocamldep foo.mli.d diff --git a/test/blackbox-tests/test-cases/github20/run.t b/test/blackbox-tests/test-cases/github20/run.t index a409cea8823..bee70b53c36 100644 --- a/test/blackbox-tests/test-cases/github20/run.t +++ b/test/blackbox-tests/test-cases/github20/run.t @@ -1 +1 @@ - $ jbuilder build .merlin --display short + $ dune build .merlin --display short diff --git a/test/blackbox-tests/test-cases/github24/run.t b/test/blackbox-tests/test-cases/github24/run.t index 766b11ee60c..3ddf0a6fc21 100644 --- a/test/blackbox-tests/test-cases/github24/run.t +++ b/test/blackbox-tests/test-cases/github24/run.t @@ -1 +1 @@ - $ jbuilder build @install --display short --debug-dependency-path + $ dune build @install --display short --debug-dependency-path diff --git a/test/blackbox-tests/test-cases/github25/run.t b/test/blackbox-tests/test-cases/github25/run.t index cc275cdf522..1da192cc177 100644 --- a/test/blackbox-tests/test-cases/github25/run.t +++ b/test/blackbox-tests/test-cases/github25/run.t @@ -6,14 +6,14 @@ problem. So jbuilder shouldn't crash because of "plop.ca-marche-pas" We need ocamlfind to run this test - $ jbuilder build @install --display short --only hello + $ dune build @install --display short --only hello ocamlc root/.hello.objs/hello.{cmi,cmo,cmt} ocamlopt root/.hello.objs/hello.{cmx,o} ocamlopt root/hello.{a,cmxa} ocamlopt root/hello.cmxs ocamlc root/hello.cma - $ jbuilder build @install --display short --only pas-de-bol 2>&1 | sed 's/[^ "]*findlib-packages/.../' + $ dune build @install --display short --only pas-de-bol 2>&1 | sed 's/[^ "]*findlib-packages/.../' ocamldep root/a.ml.d File ".../plop/META", line 1, characters 0-0: Error: Library "une-lib-qui-nexiste-pas" not found. diff --git a/test/blackbox-tests/test-cases/github534/run.t b/test/blackbox-tests/test-cases/github534/run.t index 6e65f624dbb..4de9911bbf5 100644 --- a/test/blackbox-tests/test-cases/github534/run.t +++ b/test/blackbox-tests/test-cases/github534/run.t @@ -1,4 +1,4 @@ - $ jbuilder exec ./main.exe --display short + $ dune exec ./main.exe --display short echo main.ml ocamldep main.ml.d ocamlc .main.eobjs/main.{cmi,cmo,cmt} diff --git a/test/blackbox-tests/test-cases/github568/run.t b/test/blackbox-tests/test-cases/github568/run.t index dae6e266f9f..6fc6e849020 100644 --- a/test/blackbox-tests/test-cases/github568/run.t +++ b/test/blackbox-tests/test-cases/github568/run.t @@ -1,4 +1,4 @@ - $ jbuilder runtest --display short -p lib1 --debug-dependency-path + $ dune runtest --display short -p lib1 --debug-dependency-path ocamldep test1.ml.d ocamldep lib1.ml.d ocamlc .lib1.objs/lib1.{cmi,cmo,cmt} diff --git a/test/blackbox-tests/test-cases/github597/run.t b/test/blackbox-tests/test-cases/github597/run.t index b9f40b7a65a..786edd87e11 100644 --- a/test/blackbox-tests/test-cases/github597/run.t +++ b/test/blackbox-tests/test-cases/github597/run.t @@ -1 +1 @@ - $ jbuilder build b/b.cma + $ dune build b/b.cma diff --git a/test/blackbox-tests/test-cases/github644/run.t b/test/blackbox-tests/test-cases/github644/run.t index c7172c24952..ac881f2d567 100644 --- a/test/blackbox-tests/test-cases/github644/run.t +++ b/test/blackbox-tests/test-cases/github644/run.t @@ -1,4 +1,4 @@ - $ jbuilder runtest + $ dune runtest File "jbuild", line 4, characters 20-42: Error: Library "ppx_that_doesn't_exist" not found. Hint: try: dune external-lib-deps --missing @runtest @@ -6,12 +6,12 @@ These should print something: - $ jbuilder external-lib-deps --display quiet @runtest + $ dune external-lib-deps --display quiet @runtest These are the external library dependencies in the default context: - ocaml-migrate-parsetree.driver-main - ppx_that_doesn't_exist - $ jbuilder external-lib-deps --display quiet --missing @runtest + $ dune external-lib-deps --display quiet --missing @runtest Error: The following libraries are missing in the default context: - ppx_that_doesn't_exist Hint: try: opam install ppx_that_doesn't_exist diff --git a/test/blackbox-tests/test-cases/github660/run.t b/test/blackbox-tests/test-cases/github660/run.t index 2b37f52ef7f..8e5b0f64851 100644 --- a/test/blackbox-tests/test-cases/github660/run.t +++ b/test/blackbox-tests/test-cases/github660/run.t @@ -1,20 +1,20 @@ When there are explicit interfaces, modules must be rebuilt. - $ jbuilder runtest --root explicit-interfaces --display quiet -j1 2>&1 | grep -v Entering + $ dune runtest --root explicit-interfaces --display quiet -j1 2>&1 | grep -v Entering main alias runtest hello $ echo 'let x = 1' >> explicit-interfaces/lib_sub.ml - $ jbuilder runtest --root explicit-interfaces --display quiet -j1 2>&1 | grep -v Entering | grep -v ocamlopt + $ dune runtest --root explicit-interfaces --display quiet -j1 2>&1 | grep -v Entering | grep -v ocamlopt main alias runtest hello When there are no interfaces, the situation is the same, but it is not possible to rely on these. - $ jbuilder runtest --root no-interfaces --display quiet -j1 2>&1 | grep -v Entering + $ dune runtest --root no-interfaces --display quiet -j1 2>&1 | grep -v Entering main alias runtest hello $ echo 'let x = 1' >> no-interfaces/lib_sub.ml - $ jbuilder runtest --root no-interfaces --display quiet -j1 2>&1 | grep -v Entering | grep -v ocamlopt + $ dune runtest --root no-interfaces --display quiet -j1 2>&1 | grep -v Entering | grep -v ocamlopt main alias runtest hello diff --git a/test/blackbox-tests/test-cases/github717-odoc-index/run.t b/test/blackbox-tests/test-cases/github717-odoc-index/run.t index bc867e11647..0ad4da8bfb5 100644 --- a/test/blackbox-tests/test-cases/github717-odoc-index/run.t +++ b/test/blackbox-tests/test-cases/github717-odoc-index/run.t @@ -1 +1 @@ - $ jbuilder build @doc + $ dune build @doc diff --git a/test/blackbox-tests/test-cases/include-loop/run.t b/test/blackbox-tests/test-cases/include-loop/run.t index b8e089d5f64..28650d8484b 100644 --- a/test/blackbox-tests/test-cases/include-loop/run.t +++ b/test/blackbox-tests/test-cases/include-loop/run.t @@ -1,4 +1,4 @@ - $ jbuilder build --display short + $ dune build --display short File "jbuild", line 2, characters 0-15: Error: Recursive inclusion of jbuild files detected: File a.inc is included from c.inc:2 diff --git a/test/blackbox-tests/test-cases/inline_tests/run.t b/test/blackbox-tests/test-cases/inline_tests/run.t index 6b43987f7f9..4e2e7e450ba 100644 --- a/test/blackbox-tests/test-cases/inline_tests/run.t +++ b/test/blackbox-tests/test-cases/inline_tests/run.t @@ -4,23 +4,23 @@ Fatal error: exception File "simple/.foo_simple.inline-tests/run.ml", line 1, characters 10-16: Assertion failed [1] - $ jbuilder runtest missing-backend + $ dune runtest missing-backend File "missing-backend/jbuild", line 3, characters 2-16: Error: No inline tests backend found. [1] - $ jbuilder runtest too-many-backends + $ dune runtest too-many-backends File "too-many-backends/jbuild", 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 [1] - $ jbuilder runtest many-backends-choose + $ dune runtest many-backends-choose run alias many-backends-choose/runtest backend_mbc1 - $ jbuilder runtest dune-file + $ dune runtest dune-file (dune 1 ((inline_tests.backend diff --git a/test/blackbox-tests/test-cases/installable-dup-private-libs/run.t b/test/blackbox-tests/test-cases/installable-dup-private-libs/run.t index 623b3e481be..1f836ebbfb7 100644 --- a/test/blackbox-tests/test-cases/installable-dup-private-libs/run.t +++ b/test/blackbox-tests/test-cases/installable-dup-private-libs/run.t @@ -1,4 +1,4 @@ - $ jbuilder build @install --display short + $ dune build @install --display short ocamldep a1/a.ml.d ocamlc a1/.a.objs/a.{cmi,cmo,cmt} ocamlopt a1/.a.objs/a.{cmx,o} diff --git a/test/blackbox-tests/test-cases/intf-only/run.t b/test/blackbox-tests/test-cases/intf-only/run.t index b52067c2518..3d3a3c1f3a6 100644 --- a/test/blackbox-tests/test-cases/intf-only/run.t +++ b/test/blackbox-tests/test-cases/intf-only/run.t @@ -1,6 +1,6 @@ Successes: - $ jbuilder build --display short --root foo --debug-dep 2>&1 | grep -v Entering + $ dune build --display short --root foo --debug-dep 2>&1 | grep -v Entering ocamldep test/bar.ml.d ocamldep foo.ml.d ocamlc .foo.objs/foo__.{cmi,cmo,cmt} @@ -20,7 +20,7 @@ Successes: Errors: - $ jbuilder build --display short --root a foo.cma 2>&1 | grep -v Entering + $ dune build --display short --root a foo.cma 2>&1 | grep -v Entering File "jbuild", line 2, characters 1-13: Warning: Some modules don't have an implementation. You need to add the following field to this stanza: @@ -30,16 +30,16 @@ Errors: This will become an error in the future. ocamlc .foo.objs/foo.{cmi,cmo,cmt} ocamlc foo.cma - $ jbuilder build --display short --root b foo.cma 2>&1 | grep -v Entering + $ dune build --display short --root b foo.cma 2>&1 | grep -v Entering File "jbuild", 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 - $ jbuilder build --display short --root c foo.cma 2>&1 | grep -v Entering + $ dune build --display short --root c foo.cma 2>&1 | grep -v Entering File "jbuild", line 3, characters 35-36: Error: Module X doesn't exist. - $ jbuilder build --display short --root d foo.cma 2>&1 | grep -v Entering + $ dune build --display short --root d foo.cma 2>&1 | grep -v Entering File "jbuild", line 3, characters 35-36: Error: Module X has an implementation, it cannot be listed here diff --git a/test/blackbox-tests/test-cases/js_of_ocaml/run.t b/test/blackbox-tests/test-cases/js_of_ocaml/run.t index d0c442f88a4..56caadd96e6 100644 --- a/test/blackbox-tests/test-cases/js_of_ocaml/run.t +++ b/test/blackbox-tests/test-cases/js_of_ocaml/run.t @@ -1,4 +1,4 @@ - $ jbuilder build --display short --dev bin/technologic.bc.js @install lib/x.cma.js lib/x__Y.cmo.js bin/z.cmo.js + $ dune build --display short --dev bin/technologic.bc.js @install lib/x.cma.js lib/x__Y.cmo.js bin/z.cmo.js ocamlc lib/stubs$ext_obj ocamlmklib lib/dllx_stubs$ext_dll,lib/libx_stubs$ext_lib ocamlopt .ppx/js_of_ocaml-ppx/ppx.exe @@ -34,7 +34,7 @@ use it break it fix it - $ jbuilder build --display short bin/technologic.bc.js @install + $ dune build --display short bin/technologic.bc.js @install ocamlc lib/.x.objs/x__.{cmi,cmo,cmt} ocamlc lib/.x.objs/x__Y.{cmi,cmo,cmt} ocamlc lib/.x.objs/x.{cmi,cmo,cmt} diff --git a/test/blackbox-tests/test-cases/lib-available/run.t b/test/blackbox-tests/test-cases/lib-available/run.t index a38b9fad41b..b8e91df63f5 100644 --- a/test/blackbox-tests/test-cases/lib-available/run.t +++ b/test/blackbox-tests/test-cases/lib-available/run.t @@ -1,3 +1,3 @@ - $ jbuilder build @runtest --display short --debug-dependency-path 2>&1 | sed "s/ cmd / sh /" + $ dune build @runtest --display short --debug-dependency-path 2>&1 | sed "s/ cmd / sh /" sh alias runtest sh alias runtest diff --git a/test/blackbox-tests/test-cases/loop/run.t b/test/blackbox-tests/test-cases/loop/run.t index 0d568fe781a..5569a88e70a 100644 --- a/test/blackbox-tests/test-cases/loop/run.t +++ b/test/blackbox-tests/test-cases/loop/run.t @@ -1,4 +1,4 @@ - $ jbuilder build --display short a + $ dune build --display short a true x true y Dependency cycle between the following files: @@ -11,14 +11,14 @@ This second example is slightly more complicated as we request result1 but the cycle doesn't involve result1. We must make sure the output does show a cycle. - $ jbuilder build --display short result1 + $ dune build --display short result1 Dependency cycle between the following files: _build/default/result2 --> _build/default/input --> _build/default/result2 [1] - $ jbuilder build --display short result1 --debug-dependency-path + $ dune build --display short result1 --debug-dependency-path Dependency cycle between the following files: _build/default/result2 --> _build/default/input diff --git a/test/blackbox-tests/test-cases/menhir/run.t b/test/blackbox-tests/test-cases/menhir/run.t index 8dc89d999d1..83912cf3172 100644 --- a/test/blackbox-tests/test-cases/menhir/run.t +++ b/test/blackbox-tests/test-cases/menhir/run.t @@ -1,4 +1,4 @@ - $ jbuilder build src/test.exe --display short --debug-dependency-path + $ dune build src/test.exe --display short --debug-dependency-path ocamllex src/lexer1.ml ocamldep src/lexer1.ml.d ocamllex src/lexer2.ml diff --git a/test/blackbox-tests/test-cases/merlin-tests/run.t b/test/blackbox-tests/test-cases/merlin-tests/run.t index ac15339788c..a65734540aa 100644 --- a/test/blackbox-tests/test-cases/merlin-tests/run.t +++ b/test/blackbox-tests/test-cases/merlin-tests/run.t @@ -1,4 +1,4 @@ - $ jbuilder build @print-merlins --display short + $ dune build @print-merlins --display short ocamldep sanitize-dot-merlin/sanitize_dot_merlin.ml.d ocamlc sanitize-dot-merlin/.sanitize_dot_merlin.eobjs/sanitize_dot_merlin.{cmi,cmo,cmt} ocamlopt sanitize-dot-merlin/.sanitize_dot_merlin.eobjs/sanitize_dot_merlin.{cmx,o} diff --git a/test/blackbox-tests/test-cases/meta-gen/run.t b/test/blackbox-tests/test-cases/meta-gen/run.t index a423c5ca30f..ba2558481be 100644 --- a/test/blackbox-tests/test-cases/meta-gen/run.t +++ b/test/blackbox-tests/test-cases/meta-gen/run.t @@ -1,4 +1,4 @@ - $ jbuilder runtest --force --display short + $ dune runtest --force --display short description = "contains \"quotes\"" requires = "bytes" archive(byte) = "foobar.cma" diff --git a/test/blackbox-tests/test-cases/misc/run.t b/test/blackbox-tests/test-cases/misc/run.t index cd9d83f3d40..0dcbe42ec64 100644 --- a/test/blackbox-tests/test-cases/misc/run.t +++ b/test/blackbox-tests/test-cases/misc/run.t @@ -1,4 +1,4 @@ - $ jbuilder runtest --display short + $ dune runtest --display short File "jbuild", line 65, characters 21-44: Warning: Directory dir-that-doesnt-exist doesn't exist. diff alias runtest diff --git a/test/blackbox-tests/test-cases/multiple-private-libs/run.t b/test/blackbox-tests/test-cases/multiple-private-libs/run.t index 3ecc4bf4c41..d4ca816648a 100644 --- a/test/blackbox-tests/test-cases/multiple-private-libs/run.t +++ b/test/blackbox-tests/test-cases/multiple-private-libs/run.t @@ -1,6 +1,6 @@ This test checks that there is no clash when two private libraries have the same name - $ jbuilder build --display short @doc-private + $ dune build --display short @doc-private ocamldep a/test.ml.d ocamlc a/.test.objs/test.{cmi,cmo,cmt} odoc _doc/_odoc/lib/test@a/test.odoc diff --git a/test/blackbox-tests/test-cases/null-dep/run.t b/test/blackbox-tests/test-cases/null-dep/run.t index c3b3574c608..41f62eea89b 100644 --- a/test/blackbox-tests/test-cases/null-dep/run.t +++ b/test/blackbox-tests/test-cases/null-dep/run.t @@ -1 +1 @@ - $ jbuilder runtest --debug-dependency-path + $ dune runtest --debug-dependency-path diff --git a/test/blackbox-tests/test-cases/ocaml-syntax/run.t b/test/blackbox-tests/test-cases/ocaml-syntax/run.t index b9c7f7e5b71..15f1ec1cea4 100644 --- a/test/blackbox-tests/test-cases/ocaml-syntax/run.t +++ b/test/blackbox-tests/test-cases/ocaml-syntax/run.t @@ -1,2 +1,2 @@ - $ jbuilder runtest --force --display short + $ dune runtest --force --display short ocaml syntax 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 bd4bdc97ea0..0bd5be8a6af 100644 --- a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t +++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t @@ -1,4 +1,4 @@ - $ jbuilder exec ./test.exe --debug-dep --display short + $ dune exec ./test.exe --debug-dep --display short File "jbuild", line 1, characters 0-0: Warning: Module "Lib" is used in several stanzas: - jbuild:8 @@ -13,7 +13,7 @@ - [1] - $ jbuilder build src/a.cma --debug-dep --display short + $ dune build src/a.cma --debug-dep --display short File "src/jbuild", line 1, characters 0-0: Warning: Module "X" is used in several stanzas: - src/jbuild:4 diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t b/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t index b677338b14f..65ff14bc492 100644 --- a/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t +++ b/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t @@ -1,5 +1,5 @@ Duplicate mld's in the same scope - $ jbuilder build @doc --display short --root ./same-scope 2>&1 | grep -v Entering + $ dune build @doc --display short --root ./same-scope 2>&1 | grep -v Entering odoc _doc/_html/odoc.css ocamlc lib1/.root_lib1.objs/root_lib1.{cmi,cmo,cmt} odoc _doc/_odoc/lib/root.lib1/root_lib1.odoc @@ -12,7 +12,7 @@ Duplicate mld's in the same scope Duplicate mld's in different scope $ rm -rf diff-scope/_build - $ jbuilder build @doc --display short --root ./diff-scope 2>&1 | grep -v Entering + $ dune build @doc --display short --root ./diff-scope 2>&1 | grep -v Entering odoc _doc/_html/odoc.css ocamlc scope1/.scope1.objs/scope1.{cmi,cmo,cmt} odoc _doc/_odoc/lib/scope1/scope1.odoc diff --git a/test/blackbox-tests/test-cases/odoc/run.t b/test/blackbox-tests/test-cases/odoc/run.t index 5d4d79cfcda..32a544307d0 100644 --- a/test/blackbox-tests/test-cases/odoc/run.t +++ b/test/blackbox-tests/test-cases/odoc/run.t @@ -1,4 +1,4 @@ - $ jbuilder build @doc --display short + $ dune build @doc --display short ocamldep bar.ml.d ocamlc .bar.objs/bar.{cmi,cmo,cmt} odoc _doc/_odoc/lib/bar/bar.odoc @@ -20,7 +20,7 @@ odoc _doc/_html/foo/index.html odoc _doc/_html/foo/Foo_byte/.jbuilder-keep,_doc/_html/foo/Foo_byte/index.html odoc _doc/_html/foo/Foo2/.jbuilder-keep,_doc/_html/foo/Foo2/index.html - $ jbuilder runtest --display short + $ dune runtest --display short @@ -40,7 +40,7 @@ - $ jbuilder build @foo-mld --display short + $ dune build @foo-mld --display short {1 Library foo} This library exposes the following toplevel modules: {!modules:Foo Foo2}. @@ -48,7 +48,7 @@ The entry point of this library is the module: {!module-Foo_byte}. - $ jbuilder build @bar-mld --display short + $ dune build @bar-mld --display short {1 Library bar} The entry point of this library is the module: {!module-Bar}. diff --git a/test/blackbox-tests/test-cases/output-obj/run.t b/test/blackbox-tests/test-cases/output-obj/run.t index b93484d7e26..6a1dc8337d2 100644 --- a/test/blackbox-tests/test-cases/output-obj/run.t +++ b/test/blackbox-tests/test-cases/output-obj/run.t @@ -1,4 +1,4 @@ - $ jbuilder build --display short @all + $ dune build --display short @all ocamldep test.ml.d ocamlc .test.eobjs/test.{cmi,cmo,cmt} ocamlc test.bc.o @@ -11,7 +11,7 @@ ocamlopt test.exe ocamlopt test$ext_dll - $ jbuilder build @runtest + $ dune build @runtest static alias runtest OK: ./static.bc dynamic alias runtest diff --git a/test/blackbox-tests/test-cases/package-dep/run.t b/test/blackbox-tests/test-cases/package-dep/run.t index c7462fa2861..10e5e34be6b 100644 --- a/test/blackbox-tests/test-cases/package-dep/run.t +++ b/test/blackbox-tests/test-cases/package-dep/run.t @@ -1,4 +1,4 @@ - $ jbuilder runtest --display short + $ dune runtest --display short ocamldep bar.ml.d ocamldep foo.ml.d ocamlc .foo.objs/foo.{cmi,cmo,cmt} diff --git a/test/blackbox-tests/test-cases/ppx-rewriter/run.t b/test/blackbox-tests/test-cases/ppx-rewriter/run.t index 465a6879d1c..f5fbe1cea8f 100644 --- a/test/blackbox-tests/test-cases/ppx-rewriter/run.t +++ b/test/blackbox-tests/test-cases/ppx-rewriter/run.t @@ -1,4 +1,4 @@ - $ jbuilder build ./w_omp_driver.exe --display short + $ dune build ./w_omp_driver.exe --display short ocamldep ppx/fooppx.ml.d ocamlc ppx/.fooppx.objs/fooppx.{cmi,cmo,cmt} ocamlopt ppx/.fooppx.objs/fooppx.{cmx,o} @@ -9,7 +9,7 @@ ocamlc .w_omp_driver.eobjs/w_omp_driver.{cmi,cmo,cmt} ocamlopt .w_omp_driver.eobjs/w_omp_driver.{cmx,o} ocamlopt w_omp_driver.exe - $ jbuilder build ./w_ppx_driver.exe --display short + $ dune build ./w_ppx_driver.exe --display short ocamlopt .ppx/ppx_driver.runner/ppx.exe ppx w_ppx_driver.pp.ml ocamldep w_ppx_driver.pp.ml.d @@ -17,4 +17,4 @@ ocamlopt .w_ppx_driver.eobjs/w_ppx_driver.{cmx,o} ocamlopt w_ppx_driver.exe This test is broken because ppx_driver doesn't support migrate custom arguments -# $ jbuilder build ./w_ppx_driver_flags.exe --display short +# $ dune build ./w_ppx_driver_flags.exe --display short 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 5c74df5db44..c3aa05d40d1 100644 --- a/test/blackbox-tests/test-cases/private-public-overlap/run.t +++ b/test/blackbox-tests/test-cases/private-public-overlap/run.t @@ -1,13 +1,13 @@ public libraries may not have private dependencies - $ jbuilder build --display short --root private-dep 2>&1 | grep -v Entering + $ dune build --display short --root private-dep 2>&1 | grep -v Entering File "jbuild", 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 On the other hand, public libraries may have private preprocessors - $ jbuilder build --display short --root private-rewriter 2>&1 | grep -v Entering + $ dune build --display short --root private-rewriter 2>&1 | grep -v Entering ocamlc .ppx_internal.objs/ppx_internal.{cmi,cmo,cmt} ocamlopt .ppx_internal.objs/ppx_internal.{cmx,o} ocamlopt ppx_internal.{a,cmxa} @@ -21,7 +21,7 @@ On the other hand, public libraries may have private preprocessors ocamlc mylib.cma Unless they introduce private runtime dependencies: - $ jbuilder build --display short --root private-runtime-deps 2>&1 | grep -v Entering + $ dune build --display short --root private-runtime-deps 2>&1 | grep -v Entering File "jbuild", 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. @@ -33,12 +33,12 @@ Unless they introduce private runtime dependencies: ocamldep mylib.pp.ml.d However, public binaries may accept private dependencies - $ jbuilder build --display short --root exes 2>&1 | grep -v Entering + $ dune build --display short --root exes 2>&1 | grep -v Entering ocamldep publicbin.ml.d ocamlc .publicbin.eobjs/publicbin.{cmi,cmo,cmt} ocamlopt .publicbin.eobjs/publicbin.{cmx,o} ocamlopt publicbin.exe Private dependencies shouldn't make the library optional - $ jbuilder build --display short --root optional 2>&1 | grep -v Entering + $ dune build --display short --root optional 2>&1 | grep -v Entering [1] diff --git a/test/blackbox-tests/test-cases/promote/run.t b/test/blackbox-tests/test-cases/promote/run.t index abf6c6b08e1..3564d891427 100644 --- a/test/blackbox-tests/test-cases/promote/run.t +++ b/test/blackbox-tests/test-cases/promote/run.t @@ -1,30 +1,30 @@ $ printf titi > x - $ jbuilder build --display short --diff-command false @blah 2>&1 | sed 's/.*false.*/DIFF/' + $ dune build --display short --diff-command false @blah 2>&1 | sed 's/.*false.*/DIFF/' sh (internal) (exit 1) DIFF $ cat x titi - $ jbuilder promote --display short + $ dune promote --display short Promoting _build/default/x.gen to x. $ cat x toto - $ jbuilder build --display short --diff-command false @blah + $ dune build --display short --diff-command false @blah $ cat x toto Otherwise this test fails on OSX - $ jbuilder clean --display short + $ dune clean --display short $ printf titi > x - $ jbuilder build --display short --diff-command false @blah --auto-promote 2>&1 | sed 's/.*false.*/DIFF/' + $ dune build --display short --diff-command false @blah --auto-promote 2>&1 | sed 's/.*false.*/DIFF/' sh (internal) (exit 1) DIFF Promoting _build/default/x.gen to x. $ cat x toto - $ jbuilder build --display short --diff-command false @blah + $ dune build --display short --diff-command false @blah $ cat x toto diff --git a/test/blackbox-tests/test-cases/quoting/run.t b/test/blackbox-tests/test-cases/quoting/run.t index ade020b2844..4116104902f 100644 --- a/test/blackbox-tests/test-cases/quoting/run.t +++ b/test/blackbox-tests/test-cases/quoting/run.t @@ -1,7 +1,7 @@ This behavior is surprising, we should get an error about the fact that ${@} is not quoted and doesn't contain exactly 1 element - $ jbuilder build x + $ dune build x Error: Rule failed to generate the following targets: - x - y diff --git a/test/blackbox-tests/test-cases/reason/run.t b/test/blackbox-tests/test-cases/reason/run.t index 7f8815f3366..29a914478b7 100644 --- a/test/blackbox-tests/test-cases/reason/run.t +++ b/test/blackbox-tests/test-cases/reason/run.t @@ -1,4 +1,4 @@ - $ jbuilder build @runtest @install-file --display short + $ dune build @runtest @install-file --display short refmt bar.re.ml ocamldep pp/reasononlypp.depends.ocamldep-output ocamldep ppx/reasonppx.depends.ocamldep-output diff --git a/test/blackbox-tests/test-cases/redirections/run.t b/test/blackbox-tests/test-cases/redirections/run.t index 8e655100ab0..8df19d09eed 100644 --- a/test/blackbox-tests/test-cases/redirections/run.t +++ b/test/blackbox-tests/test-cases/redirections/run.t @@ -1,4 +1,4 @@ - $ jbuilder runtest --display short 2>&1 | sed "s/ cmd / sh /" + $ dune runtest --display short 2>&1 | sed "s/ cmd / sh /" sh stderr,stdout sh stderr,stdout diff alias runtest diff --git a/test/blackbox-tests/test-cases/scope-bug/run.t b/test/blackbox-tests/test-cases/scope-bug/run.t index 29aab26dd2b..cff4674d169 100644 --- a/test/blackbox-tests/test-cases/scope-bug/run.t +++ b/test/blackbox-tests/test-cases/scope-bug/run.t @@ -1,4 +1,4 @@ - $ jbuilder build --display short @install + $ dune build --display short @install ocamldep alib/alib.ml.d ocamldep alib/main.ml.d ocamldep blib/blib.ml.d diff --git a/test/blackbox-tests/test-cases/scope-ppx-bug/run.t b/test/blackbox-tests/test-cases/scope-ppx-bug/run.t index ef83f91c59b..7920c5d42aa 100644 --- a/test/blackbox-tests/test-cases/scope-ppx-bug/run.t +++ b/test/blackbox-tests/test-cases/scope-ppx-bug/run.t @@ -1,4 +1,4 @@ - $ jbuilder build --display short @install --debug-dep + $ dune build --display short @install --debug-dep ocamlc a/ppx/.a.objs/a.{cmi,cmo,cmt} ocamlopt a/ppx/.a.objs/a.{cmx,o} ocamlopt a/ppx/a.{a,cmxa} diff --git a/test/blackbox-tests/test-cases/select/run.t b/test/blackbox-tests/test-cases/select/run.t index 379b874b7cc..3d03d99b241 100644 --- a/test/blackbox-tests/test-cases/select/run.t +++ b/test/blackbox-tests/test-cases/select/run.t @@ -1,4 +1,4 @@ - $ jbuilder runtest --display short + $ dune runtest --display short ocamldep bar.ml.d ocamldep bar_no_unix.ml.d ocamldep bar_unix.ml.d diff --git a/test/blackbox-tests/test-cases/utop/run.t b/test/blackbox-tests/test-cases/utop/run.t index e859918b44f..118c19b5439 100644 --- a/test/blackbox-tests/test-cases/utop/run.t +++ b/test/blackbox-tests/test-cases/utop/run.t @@ -1,4 +1,4 @@ - $ jbuilder utop --display short forutop -- init_forutop.ml + $ dune utop --display short forutop -- init_forutop.ml ocamldep forutop/.utop/utop.ml.d ocamldep forutop/forutop.ml.d ocamlc forutop/.forutop.objs/forutop.{cmi,cmo,cmt}