From 4c9de316f0a89f8e26fd2dce66c340f8bb678b87 Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Thu, 29 Mar 2018 12:14:11 -0400 Subject: [PATCH] Simplify blackbox tests Remove all the -j1, --root ., --display quiet --- test/blackbox-tests/test-cases/aliases/run.t | 16 ++++++++-------- .../test-cases/byte-code-only/run.t | 4 ++-- test/blackbox-tests/test-cases/c-stubs/run.t | 4 ++-- test/blackbox-tests/test-cases/copy_files/run.t | 4 ++-- .../test-cases/cross-compilation/run.t | 2 +- .../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 | 6 +++--- 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-cases/github25/root/run.t | 6 +++--- 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 | 8 ++++---- .../blackbox-tests/test-cases/include-loop/run.t | 2 +- .../blackbox-tests/test-cases/inline_tests/run.t | 10 +++++----- .../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 +- .../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/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 +- 45 files changed, 102 insertions(+), 102 deletions(-) diff --git a/test/blackbox-tests/test-cases/aliases/run.t b/test/blackbox-tests/test-cases/aliases/run.t index 45a7fb6f..1211d4d5 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 -j1 --display short --root . - $ jbuilder build -j1 --display short --root . @just-in-src + $ jbuilder clean --display short + $ jbuilder build --display short @just-in-src running in src - $ jbuilder clean -j1 --display short --root . - $ jbuilder build -j1 --display short --root . @everywhere + $ jbuilder clean --display short + $ jbuilder build --display short @everywhere running in src/foo/bar running in src/foo/baz running in src - $ jbuilder clean -j1 --display short --root . - $ jbuilder build -j1 --display short --root . @x + $ jbuilder clean --display short + $ jbuilder build --display short @x running in src/foo/bar running in src/foo/baz running in src - $ jbuilder build -j1 --display short --root . @plop + $ jbuilder 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 -j1 --display short --root . @truc/x + $ jbuilder 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/byte-code-only/run.t b/test/blackbox-tests/test-cases/byte-code-only/run.t index 7592d88a..73b64f9e 100644 --- a/test/blackbox-tests/test-cases/byte-code-only/run.t +++ b/test/blackbox-tests/test-cases/byte-code-only/run.t @@ -1,4 +1,4 @@ - $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" jbuilder build --root . -j1 --display short + $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" jbuilder build --display short ocamldep bin/toto.ml.d ocamlc bin/.toto.eobjs/toto.{cmi,cmo,cmt} ocamlc bin/toto.exe @@ -7,6 +7,6 @@ ocamlc src/foo.cma Check that building a native only executable fails - $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" jbuilder build --root . -j1 --display short native-only/foo.exe + $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" jbuilder build --display short native-only/foo.exe Don't know how to build native-only/foo.exe [1] diff --git a/test/blackbox-tests/test-cases/c-stubs/run.t b/test/blackbox-tests/test-cases/c-stubs/run.t index 33db944a..5dafd56a 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 -j1 ./qnativerun/run.exe --display short --root . + $ jbuilder exec ./qnativerun/run.exe --display short ocamldep qnativerun/run.ml.d ocamlc q/q_stub.o ocamlmklib q/dllq_stubs.so,q/libq_stubs.a @@ -11,4 +11,4 @@ ocamlopt qnativerun/.run.eobjs/run.{cmx,o} ocamlopt qnativerun/run.exe 42 -# $ jbuilder exec -j1 ./qbyterun/run.bc --display short --root . +# $ jbuilder exec ./qbyterun/run.bc --display short diff --git a/test/blackbox-tests/test-cases/copy_files/run.t b/test/blackbox-tests/test-cases/copy_files/run.t index 919231ff..2290b1b9 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 -j1 test.exe .merlin --display short --root . --debug-dependency-path + $ jbuilder 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 @@ ocamlopt .test.eobjs/test.{cmx,o} ocamlopt foo.{a,cmxa} ocamlopt test.exe - $ jbuilder build -j1 @bar-source --display short --root . + $ jbuilder build @bar-source --display short #line 1 "include/bar.h" int foo () {return 42;} diff --git a/test/blackbox-tests/test-cases/cross-compilation/run.t b/test/blackbox-tests/test-cases/cross-compilation/run.t index b44e1e30..dae8d6bb 100644 --- a/test/blackbox-tests/test-cases/cross-compilation/run.t +++ b/test/blackbox-tests/test-cases/cross-compilation/run.t @@ -1,4 +1,4 @@ - $ env OCAMLFIND_CONF=$PWD/etc/findlib.conf jbuilder build --display short --root . -j1 -x foo file @install + $ env OCAMLFIND_CONF=$PWD/etc/findlib.conf jbuilder build --display short -x foo file @install ocamldep bin/blah.ml.d [default.foo] ocamldep lib/p.ml.d [default.foo] ocamlc lib/.p.objs/p.{cmi,cmo,cmt} [default.foo] 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 99bd644e..362ffdc5 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 --root . -j 1 --display quiet @x + $ jbuilder build @x Hello, world! - $ jbuilder build --root . -j 1 --display quiet @x + $ jbuilder build @x Hello, world! - $ jbuilder build --root . -j 1 --display quiet @x + $ jbuilder build @x Hello, world! - $ jbuilder build --root . -j 1 --display quiet @x + $ jbuilder build @x Hello, world! - $ jbuilder build --root . -j 1 --display quiet @x + $ jbuilder 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 61014571..1748c243 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 --root . -j 1 + $ jbuilder 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 ec101394..04381a7c 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 -j1 --display short --root . - $ jbuilder exec --no-build ./foo.exe -j1 --display short --root . + $ jbuilder clean --display short + $ jbuilder 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 -j1 --display short --root . + $ jbuilder 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 -j1 --display short --root . + $ jbuilder 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 -j1 --display short --root . + $ jbuilder 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 -j1 --display short --root . + $ jbuilder 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 c29eba1d..d8028be9 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 --root . -j1 --display quiet @install + $ jbuilder external-lib-deps @install These are the external library dependencies in the default context: - a - b @@ -6,8 +6,8 @@ Reproduction case for #484. The error should point to src/jbuild - $ jbuilder build --root . -j1 --display quiet @install + $ jbuilder build @install File "src/jbuild", line 4, characters 16-17: Error: Library "a" not found. - Hint: try: jbuilder external-lib-deps --missing --root . @install + Hint: try: jbuilder external-lib-deps --missing @install [1] diff --git a/test/blackbox-tests/test-cases/force-test/run.t b/test/blackbox-tests/test-cases/force-test/run.t index 97172b6a..2da42648 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 -j1 --display short --root . - $ jbuilder runtest -j1 --display short --root . + $ jbuilder clean --display short + $ jbuilder 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 -j1 --display short --root . - $ jbuilder runtest --force -j1 --display short --root . + $ jbuilder runtest --display short + $ jbuilder 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 0fd2f121..40ddb269 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 -j1 --display short --root . + $ jbuilder runtest --display short ocamldep bar.ml.d ocamldep foo_byte.ml.d ocamlc .foo_byte.objs/foo_byte.{cmi,cmo,cmt} diff --git a/test/blackbox-tests/test-cases/github20/run.t b/test/blackbox-tests/test-cases/github20/run.t index 454c7fb9..a409cea8 100644 --- a/test/blackbox-tests/test-cases/github20/run.t +++ b/test/blackbox-tests/test-cases/github20/run.t @@ -1 +1 @@ - $ jbuilder build -j1 .merlin --display short --root . + $ jbuilder 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 31620326..766b11ee 100644 --- a/test/blackbox-tests/test-cases/github24/run.t +++ b/test/blackbox-tests/test-cases/github24/run.t @@ -1 +1 @@ - $ jbuilder build -j1 @install --display short --root . --debug-dependency-path + $ jbuilder build @install --display short --debug-dependency-path diff --git a/test/blackbox-tests/test-cases/github25/root/run.t b/test/blackbox-tests/test-cases/github25/root/run.t index 139e9efc..53ba3d05 100644 --- a/test/blackbox-tests/test-cases/github25/root/run.t +++ b/test/blackbox-tests/test-cases/github25/root/run.t @@ -6,19 +6,19 @@ problem. So jbuilder shouldn't crash because of "plop.ca-marche-pas" We need ocamlfind to run this test - $ jbuilder build -j1 @install --display short --root . --only hello + $ jbuilder build @install --display short --only hello ocamlc .hello.objs/hello.{cmi,cmo,cmt} ocamlopt .hello.objs/hello.{cmx,o} ocamlopt hello.{a,cmxa} ocamlopt hello.cmxs ocamlc hello.cma - $ jbuilder build -j1 @install --display short --root . --only pas-de-bol 2>&1 | sed 's/[^ "]*findlib-packages/.../' + $ jbuilder build @install --display short --only pas-de-bol 2>&1 | sed 's/[^ "]*findlib-packages/.../' ocamldep a.ml.d File ".../plop/META", line 1, characters 0-0: Error: Library "une-lib-qui-nexiste-pas" not found. -> required by library "plop.ca-marche-pas" in .../plop - Hint: try: jbuilder external-lib-deps --missing --root . --only-packages pas-de-bol @install + Hint: try: jbuilder external-lib-deps --missing --only-packages pas-de-bol @install ocamldep b.ml.d ocamlc .pas_de_bol.objs/pas_de_bol.{cmi,cmo,cmt} ocamlopt .pas_de_bol.objs/pas_de_bol.{cmx,o} diff --git a/test/blackbox-tests/test-cases/github534/run.t b/test/blackbox-tests/test-cases/github534/run.t index 35f8450f..6e65f624 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 --root . -j1 --display short + $ jbuilder 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 84933d15..ec79e4d6 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 -j1 -p lib1 --debug-dependency-path + $ jbuilder 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 0de71ff8..b9f40b7a 100644 --- a/test/blackbox-tests/test-cases/github597/run.t +++ b/test/blackbox-tests/test-cases/github597/run.t @@ -1 +1 @@ - $ jbuilder build --root . -j1 --display quiet b/b.cma + $ jbuilder 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 2b1b58b3..df627dc9 100644 --- a/test/blackbox-tests/test-cases/github644/run.t +++ b/test/blackbox-tests/test-cases/github644/run.t @@ -1,11 +1,11 @@ - $ jbuilder runtest --root . -j 1 --display quiet + $ jbuilder runtest File "jbuild", line 4, characters 20-42: Error: Library "ppx_that_doesn't_exist" not found. - Hint: try: jbuilder external-lib-deps --missing --root . @runtest + Hint: try: jbuilder external-lib-deps --missing @runtest [1] These should print something: - $ jbuilder external-lib-deps --root . -j 1 --display quiet @runtest + $ jbuilder external-lib-deps @runtest - $ jbuilder external-lib-deps --root . -j 1 --display quiet --missing @runtest + $ jbuilder external-lib-deps --missing @runtest diff --git a/test/blackbox-tests/test-cases/include-loop/run.t b/test/blackbox-tests/test-cases/include-loop/run.t index f9c11731..b8e089d5 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 --root . -j 1 + $ jbuilder 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 4a583a85..6b43987f 100644 --- a/test/blackbox-tests/test-cases/inline_tests/run.t +++ b/test/blackbox-tests/test-cases/inline_tests/run.t @@ -1,26 +1,26 @@ - $ env -u OCAMLRUNPARAM jbuilder runtest simple -j1 --display quiet --root . + $ env -u OCAMLRUNPARAM jbuilder runtest simple run alias simple/runtest (exit 2) (cd _build/default/simple && ./.foo_simple.inline-tests/run.exe) Fatal error: exception File "simple/.foo_simple.inline-tests/run.ml", line 1, characters 10-16: Assertion failed [1] - $ jbuilder runtest missing-backend -j1 --display quiet --root . + $ jbuilder runtest missing-backend File "missing-backend/jbuild", line 3, characters 2-16: Error: No inline tests backend found. [1] - $ jbuilder runtest too-many-backends -j1 --display quiet --root . + $ jbuilder 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 -j1 --display quiet --root . + $ jbuilder runtest many-backends-choose run alias many-backends-choose/runtest backend_mbc1 - $ jbuilder runtest dune-file -j1 --display quiet --root . + $ jbuilder 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 3636c25b..623b3e48 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 -j1 --display short --root . + $ jbuilder 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 0215a48c..e3a63180 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 -j1 --debug-dep 2>&1 | grep -v Entering + $ jbuilder 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 -j1 foo.cma 2>&1 | grep -v Entering + $ jbuilder 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 -j1 foo.cma 2>&1 | grep -v Entering + $ jbuilder 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 -j1 foo.cma 2>&1 | grep -v Entering + $ jbuilder 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 -j1 foo.cma 2>&1 | grep -v Entering + $ jbuilder 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 5410874e..4a77ec02 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 -j1 --display short --root . --dev bin/technologic.bc.js @install lib/x.cma.js lib/x__Y.cmo.js bin/z.cmo.js + $ jbuilder 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.o ocamlmklib lib/dllx_stubs.so,lib/libx_stubs.a ocamlopt .ppx/js_of_ocaml-ppx/ppx.exe @@ -34,7 +34,7 @@ use it break it fix it - $ jbuilder build -j1 --display short --root . bin/technologic.bc.js @install + $ jbuilder 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 e69a8c0e..a38b9fad 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 -j1 @runtest --display short --root . --debug-dependency-path 2>&1 | sed "s/ cmd / sh /" + $ jbuilder 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 ece4f370..0d568fe7 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 --root . -j 1 a + $ jbuilder 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 --root . -j 1 result1 + $ jbuilder build --display short result1 Dependency cycle between the following files: _build/default/result2 --> _build/default/input --> _build/default/result2 [1] - $ jbuilder build --display short --root . -j 1 result1 --debug-dependency-path + $ jbuilder 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 0e30bb67..35d348a7 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 -j1 src/test.exe --display short --root . --debug-dependency-path + $ jbuilder 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 3034a6fc..ac153397 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 -j1 --display short --root . + $ jbuilder 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 28d7fbd3..a423c5ca 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 -j1 --display short --root . + $ jbuilder 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 8f3f5d1c..cd9d83f3 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 -j1 --display short --root . + $ jbuilder 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 46d207f9..3ecc4bf4 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 -j1 --display short --root . @doc-private + $ jbuilder 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/ocaml-syntax/run.t b/test/blackbox-tests/test-cases/ocaml-syntax/run.t index 31848275..b9c7f7e5 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 -j1 --display short --root . + $ jbuilder 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 bf327660..f6cd265b 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 -j1 --debug-dep --display short --root . + $ jbuilder 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 -j1 --debug-dep --display short --root . + $ jbuilder 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 552fab87..b677338b 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 -j1 --display short --root ./same-scope 2>&1 | grep -v Entering + $ jbuilder 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 -j1 --display short --root ./diff-scope 2>&1 | grep -v Entering + $ jbuilder 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 643a3501..ac5ba611 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 -j1 --display short --root . + $ jbuilder 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 -j1 --display short --root . + $ jbuilder runtest --display short @@ -40,7 +40,7 @@ - $ jbuilder build @foo-mld -j1 --display short --root . + $ jbuilder build @foo-mld --display short {1 Library foo} This library exposes the following toplevel modules: {!modules:Foo Foo2} @@ -48,7 +48,7 @@ This library exposes the following toplevel modules: {!modules:Foo_byte} - $ jbuilder build @bar-mld -j1 --display short --root . + $ jbuilder build @bar-mld --display short {1 Library bar} This library exposes the following toplevel modules: {!modules:Bar} diff --git a/test/blackbox-tests/test-cases/output-obj/run.t b/test/blackbox-tests/test-cases/output-obj/run.t index b5c5a01d..9c71ca90 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 -j1 --root . --display short @all + $ jbuilder 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.so - $ jbuilder build -j1 --root . --display quiet @runtest + $ jbuilder 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 53923c70..c7462fa2 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 -j1 --display short --root . + $ jbuilder 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 0861f603..465a6879 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 -j1 --display short --root . + $ jbuilder 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 -j1 --display short --root . + $ jbuilder 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 -j1 --display short --root . +# $ jbuilder 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 2002262b..5c74df5d 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 -j1 --display short --root private-dep 2>&1 | grep -v Entering + $ jbuilder 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 -j1 --display short --root private-rewriter 2>&1 | grep -v Entering + $ jbuilder 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 -j1 --display short --root private-runtime-deps 2>&1 | grep -v Entering + $ jbuilder 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 -j1 --display short --root exes 2>&1 | grep -v Entering + $ jbuilder 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 -j1 --display short --root optional 2>&1 | grep -v Entering + $ jbuilder 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 f9e052e6..abf6c6b0 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 --root . -j1 --diff-command false @blah 2>&1 | sed 's/.*false.*/DIFF/' + $ jbuilder 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 --root . + $ jbuilder promote --display short Promoting _build/default/x.gen to x. $ cat x toto - $ jbuilder build --display short --root . -j1 --diff-command false @blah + $ jbuilder build --display short --diff-command false @blah $ cat x toto Otherwise this test fails on OSX - $ jbuilder clean --display short --root . -j1 + $ jbuilder clean --display short $ printf titi > x - $ jbuilder build --display short --root . -j1 --diff-command false @blah --auto-promote 2>&1 | sed 's/.*false.*/DIFF/' + $ jbuilder 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 --root . -j1 --diff-command false @blah + $ jbuilder build --display short --diff-command false @blah $ cat x toto diff --git a/test/blackbox-tests/test-cases/reason/run.t b/test/blackbox-tests/test-cases/reason/run.t index 700a2635..7f8815f3 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 -j1 --display short --root . + $ jbuilder 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 0bd2b316..8e655100 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 -j1 --display short --root . 2>&1 | sed "s/ cmd / sh /" + $ jbuilder 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 f36e9e02..be51352e 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 -j1 --display short --root . @install + $ jbuilder build --display short @install ocamldep alib/alib.ml.d ocamldep alib/main.ml.d ocamlc alib/.alib.objs/alib__.{cmi,cmo,cmt} 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 af1e0a4f..ef83f91c 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 -j1 --display short --root . @install --debug-dep + $ jbuilder 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 8db3b6ce..379b874b 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 -j1 --display short --root . + $ jbuilder 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 266b48a2..a4117331 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 -j1 --display short --root . forutop -- init_forutop.ml + $ jbuilder 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}