From dc0a6d44016c373aa316f2a4aa043c25a676f6fc Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Thu, 3 May 2018 14:05:54 +0100 Subject: [PATCH] Rename all jbuild files --- bin/{jbuild => dune} | 0 doc/{jbuild => dune} | 0 example/{jbuild => dune} | 0 example/sample-projects/hello_world/bin/{jbuild => dune} | 0 example/sample-projects/hello_world/lib/{jbuild => dune} | 0 example/sample-projects/hello_world/test/{jbuild => dune} | 0 example/sample-projects/with-configure-step/{jbuild => dune} | 0 example/sample-projects/with-configure-step/src/{jbuild => dune} | 0 src/configurator/{jbuild => dune} | 0 src/configurator/flags/{jbuild => dune} | 0 src/{jbuild => dune} | 0 src/fiber/{jbuild => dune} | 0 src/ocaml-config/{jbuild => dune} | 0 src/stdune/caml/{jbuild => dune} | 0 src/stdune/{jbuild => dune} | 0 src/usexp/{jbuild => dune} | 0 src/usexp/gen/{jbuild => dune} | 0 src/usexp/gen/lib/{jbuild => dune} | 0 src/xdg/{jbuild => dune} | 0 test/blackbox-tests/{jbuild => dune} | 0 test/blackbox-tests/test-cases/aliases/{jbuild => dune} | 0 .../test-cases/aliases/src/{foo/bar/jbuild => dune} | 0 .../test-cases/aliases/src/foo/{baz/jbuild => bar/dune} | 0 .../test-cases/aliases/src/{jbuild => foo/baz/dune} | 0 .../blackbox-tests/test-cases/byte-code-only/bin/{jbuild => dune} | 0 .../test-cases/byte-code-only/native-only/{jbuild => dune} | 0 .../blackbox-tests/test-cases/byte-code-only/src/{jbuild => dune} | 0 test/blackbox-tests/test-cases/c-stubs/{jbuild => dune} | 0 test/blackbox-tests/test-cases/c-stubs/q/{jbuild => dune} | 0 .../blackbox-tests/test-cases/c-stubs/qnativerun/{jbuild => dune} | 0 .../test-cases/configurator/c_test/{jbuild => dune} | 0 .../test-cases/configurator/config/{jbuild => dune} | 0 .../test-cases/configurator/import-define/{jbuild => dune} | 0 test/blackbox-tests/test-cases/copy_files/{jbuild => dune} | 0 test/blackbox-tests/test-cases/copy_files/lexers/{jbuild => dune} | 0 .../test-cases/cross-compilation/bin/{jbuild => dune} | 0 test/blackbox-tests/test-cases/cross-compilation/{jbuild => dune} | 0 .../test-cases/cross-compilation/lib/{jbuild => dune} | 0 .../test-cases/depend-on-the-universe/{jbuild => dune} | 0 .../test-cases/exclude-missing-module/{jbuild => dune} | 0 test/blackbox-tests/test-cases/exec-cmd/{jbuild => dune} | 0 test/blackbox-tests/test-cases/findlib/src/{jbuild => dune} | 0 test/blackbox-tests/test-cases/findlib/test/{jbuild => dune} | 0 test/blackbox-tests/test-cases/force-test/{jbuild => dune} | 0 .../test-cases/gen-opam-install-file/{jbuild => dune} | 0 test/blackbox-tests/test-cases/github20/{jbuild => dune} | 0 test/blackbox-tests/test-cases/github24/{jbuild => dune} | 0 test/blackbox-tests/test-cases/github25/root/{jbuild => dune} | 0 test/blackbox-tests/test-cases/github534/{jbuild => dune} | 0 test/blackbox-tests/test-cases/github568/{jbuild => dune} | 0 test/blackbox-tests/test-cases/github597/a/{jbuild => dune} | 0 test/blackbox-tests/test-cases/github597/b/{jbuild => dune} | 0 test/blackbox-tests/test-cases/github644/{jbuild => dune} | 0 .../test-cases/github660/explicit-interfaces/{jbuild => dune} | 0 .../test-cases/github660/no-interfaces/{jbuild => dune} | 0 .../test-cases/github717-odoc-index/{jbuild => dune} | 0 test/blackbox-tests/test-cases/include-loop/{jbuild => dune} | 0 .../test-cases/inline_tests/dune-file/{jbuild => dune} | 0 .../test-cases/inline_tests/many-backends-choose/{jbuild => dune} | 0 .../test-cases/inline_tests/missing-backend/{jbuild => dune} | 0 .../test-cases/inline_tests/simple/{jbuild => dune} | 0 .../test-cases/inline_tests/too-many-backends/{jbuild => dune} | 0 .../test-cases/installable-dup-private-libs/a1/{jbuild => dune} | 0 .../test-cases/installable-dup-private-libs/a2/{jbuild => dune} | 0 test/blackbox-tests/test-cases/intf-only/a/{jbuild => dune} | 0 test/blackbox-tests/test-cases/intf-only/b/{jbuild => dune} | 0 test/blackbox-tests/test-cases/intf-only/c/{jbuild => dune} | 0 test/blackbox-tests/test-cases/intf-only/d/{jbuild => dune} | 0 test/blackbox-tests/test-cases/intf-only/foo/{jbuild => dune} | 0 .../blackbox-tests/test-cases/intf-only/foo/test/{jbuild => dune} | 0 test/blackbox-tests/test-cases/js_of_ocaml/bin/{jbuild => dune} | 0 test/blackbox-tests/test-cases/js_of_ocaml/lib/{jbuild => dune} | 0 test/blackbox-tests/test-cases/lib-available/{jbuild => dune} | 0 test/blackbox-tests/test-cases/loop/{jbuild => dune} | 0 test/blackbox-tests/test-cases/menhir/src/{jbuild => dune} | 0 test/blackbox-tests/test-cases/merlin-tests/{jbuild => dune} | 0 test/blackbox-tests/test-cases/merlin-tests/exe/{jbuild => dune} | 0 test/blackbox-tests/test-cases/merlin-tests/lib/{jbuild => dune} | 0 test/blackbox-tests/test-cases/merlin-tests/ppx/{jbuild => dune} | 0 .../test-cases/merlin-tests/sanitize-dot-merlin/{jbuild => dune} | 0 test/blackbox-tests/test-cases/meta-gen/{jbuild => dune} | 0 test/blackbox-tests/test-cases/meta-gen/src/{jbuild => dune} | 0 test/blackbox-tests/test-cases/misc/blah/{jbuild => dune} | 0 test/blackbox-tests/test-cases/misc/{jbuild => dune} | 0 .../test-cases/multiple-private-libs/a/{jbuild => dune} | 0 .../test-cases/multiple-private-libs/b/{jbuild => dune} | 0 test/blackbox-tests/test-cases/null-dep/{jbuild => dune} | 0 test/blackbox-tests/test-cases/ocaml-syntax/{jbuild => dune} | 0 .../test-cases/ocamldep-multi-stanzas/{jbuild => dune} | 0 .../test-cases/ocamldep-multi-stanzas/src/{jbuild => dune} | 0 .../odoc-unique-mlds/diff-scope/scope1/{jbuild => dune} | 0 .../odoc-unique-mlds/diff-scope/scope2/{jbuild => dune} | 0 .../test-cases/odoc-unique-mlds/same-scope/lib1/{jbuild => dune} | 0 .../test-cases/odoc-unique-mlds/same-scope/lib2/{jbuild => dune} | 0 test/blackbox-tests/test-cases/odoc/{jbuild => dune} | 0 test/blackbox-tests/test-cases/output-obj/{jbuild => dune} | 0 test/blackbox-tests/test-cases/package-dep/{jbuild => dune} | 0 test/blackbox-tests/test-cases/ppx-rewriter/{jbuild => dune} | 0 test/blackbox-tests/test-cases/ppx-rewriter/ppx/{jbuild => dune} | 0 .../test-cases/private-public-overlap/exes/{jbuild => dune} | 0 .../test-cases/private-public-overlap/optional/{jbuild => dune} | 0 .../private-public-overlap/private-dep/{jbuild => dune} | 0 .../private-public-overlap/private-rewriter/{jbuild => dune} | 0 .../private-public-overlap/private-runtime-deps/{jbuild => dune} | 0 test/blackbox-tests/test-cases/promote/{jbuild => dune} | 0 test/blackbox-tests/test-cases/quoting/{jbuild => dune} | 0 test/blackbox-tests/test-cases/reason/{jbuild => dune} | 0 test/blackbox-tests/test-cases/reason/pp/{jbuild => dune} | 0 test/blackbox-tests/test-cases/reason/ppx/{jbuild => dune} | 0 test/blackbox-tests/test-cases/redirections/{jbuild => dune} | 0 test/blackbox-tests/test-cases/scope-bug/alib/{jbuild => dune} | 0 test/blackbox-tests/test-cases/scope-bug/blib/{jbuild => dune} | 0 .../blackbox-tests/test-cases/scope-bug/blib/sub/{jbuild => dune} | 0 .../test-cases/scope-ppx-bug/a/kernel/{jbuild => dune} | 0 .../test-cases/scope-ppx-bug/a/ppx/{jbuild => dune} | 0 test/blackbox-tests/test-cases/scope-ppx-bug/b/{jbuild => dune} | 0 test/blackbox-tests/test-cases/select/{jbuild => dune} | 0 test/blackbox-tests/test-cases/utop/forutop/{jbuild => dune} | 0 test/common/{jbuild => dune} | 0 test/{jbuild => dune} | 0 test/unit-tests/configurator/{jbuild => dune} | 0 test/unit-tests/{jbuild => dune} | 0 test/unit-tests/ocaml-config/{jbuild => dune} | 0 vendor/cmdliner/src/{jbuild => dune} | 0 vendor/opam-file-format/src/{jbuild => dune} | 0 vendor/re/src/{jbuild => dune} | 0 126 files changed, 0 insertions(+), 0 deletions(-) rename bin/{jbuild => dune} (100%) rename doc/{jbuild => dune} (100%) rename example/{jbuild => dune} (100%) rename example/sample-projects/hello_world/bin/{jbuild => dune} (100%) rename example/sample-projects/hello_world/lib/{jbuild => dune} (100%) rename example/sample-projects/hello_world/test/{jbuild => dune} (100%) rename example/sample-projects/with-configure-step/{jbuild => dune} (100%) rename example/sample-projects/with-configure-step/src/{jbuild => dune} (100%) rename src/configurator/{jbuild => dune} (100%) rename src/configurator/flags/{jbuild => dune} (100%) rename src/{jbuild => dune} (100%) rename src/fiber/{jbuild => dune} (100%) rename src/ocaml-config/{jbuild => dune} (100%) rename src/stdune/caml/{jbuild => dune} (100%) rename src/stdune/{jbuild => dune} (100%) rename src/usexp/{jbuild => dune} (100%) rename src/usexp/gen/{jbuild => dune} (100%) rename src/usexp/gen/lib/{jbuild => dune} (100%) rename src/xdg/{jbuild => dune} (100%) rename test/blackbox-tests/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/aliases/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/aliases/src/{foo/bar/jbuild => dune} (100%) rename test/blackbox-tests/test-cases/aliases/src/foo/{baz/jbuild => bar/dune} (100%) rename test/blackbox-tests/test-cases/aliases/src/{jbuild => foo/baz/dune} (100%) rename test/blackbox-tests/test-cases/byte-code-only/bin/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/byte-code-only/native-only/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/byte-code-only/src/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/c-stubs/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/c-stubs/q/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/c-stubs/qnativerun/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/configurator/c_test/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/configurator/config/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/configurator/import-define/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/copy_files/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/copy_files/lexers/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/cross-compilation/bin/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/cross-compilation/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/cross-compilation/lib/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/depend-on-the-universe/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/exclude-missing-module/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/exec-cmd/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/findlib/src/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/findlib/test/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/force-test/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/gen-opam-install-file/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github20/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github24/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github25/root/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github534/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github568/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github597/a/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github597/b/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github644/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github660/explicit-interfaces/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github660/no-interfaces/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/github717-odoc-index/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/include-loop/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/inline_tests/dune-file/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/inline_tests/many-backends-choose/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/inline_tests/missing-backend/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/inline_tests/simple/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/inline_tests/too-many-backends/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/installable-dup-private-libs/a1/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/installable-dup-private-libs/a2/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/intf-only/a/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/intf-only/b/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/intf-only/c/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/intf-only/d/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/intf-only/foo/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/intf-only/foo/test/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/js_of_ocaml/bin/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/js_of_ocaml/lib/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/lib-available/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/loop/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/menhir/src/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/merlin-tests/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/merlin-tests/exe/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/merlin-tests/lib/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/merlin-tests/ppx/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/merlin-tests/sanitize-dot-merlin/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/meta-gen/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/meta-gen/src/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/misc/blah/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/misc/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/multiple-private-libs/a/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/multiple-private-libs/b/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/null-dep/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/ocaml-syntax/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/ocamldep-multi-stanzas/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/ocamldep-multi-stanzas/src/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib1/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib2/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/odoc/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/output-obj/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/package-dep/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/ppx-rewriter/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/ppx-rewriter/ppx/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/private-public-overlap/exes/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/private-public-overlap/optional/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/private-public-overlap/private-dep/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/private-public-overlap/private-rewriter/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/private-public-overlap/private-runtime-deps/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/promote/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/quoting/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/reason/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/reason/pp/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/reason/ppx/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/redirections/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/scope-bug/alib/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/scope-bug/blib/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/scope-bug/blib/sub/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/scope-ppx-bug/a/kernel/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/scope-ppx-bug/a/ppx/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/scope-ppx-bug/b/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/select/{jbuild => dune} (100%) rename test/blackbox-tests/test-cases/utop/forutop/{jbuild => dune} (100%) rename test/common/{jbuild => dune} (100%) rename test/{jbuild => dune} (100%) rename test/unit-tests/configurator/{jbuild => dune} (100%) rename test/unit-tests/{jbuild => dune} (100%) rename test/unit-tests/ocaml-config/{jbuild => dune} (100%) rename vendor/cmdliner/src/{jbuild => dune} (100%) rename vendor/opam-file-format/src/{jbuild => dune} (100%) rename vendor/re/src/{jbuild => dune} (100%) diff --git a/bin/jbuild b/bin/dune similarity index 100% rename from bin/jbuild rename to bin/dune diff --git a/doc/jbuild b/doc/dune similarity index 100% rename from doc/jbuild rename to doc/dune diff --git a/example/jbuild b/example/dune similarity index 100% rename from example/jbuild rename to example/dune diff --git a/example/sample-projects/hello_world/bin/jbuild b/example/sample-projects/hello_world/bin/dune similarity index 100% rename from example/sample-projects/hello_world/bin/jbuild rename to example/sample-projects/hello_world/bin/dune diff --git a/example/sample-projects/hello_world/lib/jbuild b/example/sample-projects/hello_world/lib/dune similarity index 100% rename from example/sample-projects/hello_world/lib/jbuild rename to example/sample-projects/hello_world/lib/dune diff --git a/example/sample-projects/hello_world/test/jbuild b/example/sample-projects/hello_world/test/dune similarity index 100% rename from example/sample-projects/hello_world/test/jbuild rename to example/sample-projects/hello_world/test/dune diff --git a/example/sample-projects/with-configure-step/jbuild b/example/sample-projects/with-configure-step/dune similarity index 100% rename from example/sample-projects/with-configure-step/jbuild rename to example/sample-projects/with-configure-step/dune diff --git a/example/sample-projects/with-configure-step/src/jbuild b/example/sample-projects/with-configure-step/src/dune similarity index 100% rename from example/sample-projects/with-configure-step/src/jbuild rename to example/sample-projects/with-configure-step/src/dune diff --git a/src/configurator/jbuild b/src/configurator/dune similarity index 100% rename from src/configurator/jbuild rename to src/configurator/dune diff --git a/src/configurator/flags/jbuild b/src/configurator/flags/dune similarity index 100% rename from src/configurator/flags/jbuild rename to src/configurator/flags/dune diff --git a/src/jbuild b/src/dune similarity index 100% rename from src/jbuild rename to src/dune diff --git a/src/fiber/jbuild b/src/fiber/dune similarity index 100% rename from src/fiber/jbuild rename to src/fiber/dune diff --git a/src/ocaml-config/jbuild b/src/ocaml-config/dune similarity index 100% rename from src/ocaml-config/jbuild rename to src/ocaml-config/dune diff --git a/src/stdune/caml/jbuild b/src/stdune/caml/dune similarity index 100% rename from src/stdune/caml/jbuild rename to src/stdune/caml/dune diff --git a/src/stdune/jbuild b/src/stdune/dune similarity index 100% rename from src/stdune/jbuild rename to src/stdune/dune diff --git a/src/usexp/jbuild b/src/usexp/dune similarity index 100% rename from src/usexp/jbuild rename to src/usexp/dune diff --git a/src/usexp/gen/jbuild b/src/usexp/gen/dune similarity index 100% rename from src/usexp/gen/jbuild rename to src/usexp/gen/dune diff --git a/src/usexp/gen/lib/jbuild b/src/usexp/gen/lib/dune similarity index 100% rename from src/usexp/gen/lib/jbuild rename to src/usexp/gen/lib/dune diff --git a/src/xdg/jbuild b/src/xdg/dune similarity index 100% rename from src/xdg/jbuild rename to src/xdg/dune diff --git a/test/blackbox-tests/jbuild b/test/blackbox-tests/dune similarity index 100% rename from test/blackbox-tests/jbuild rename to test/blackbox-tests/dune diff --git a/test/blackbox-tests/test-cases/aliases/jbuild b/test/blackbox-tests/test-cases/aliases/dune similarity index 100% rename from test/blackbox-tests/test-cases/aliases/jbuild rename to test/blackbox-tests/test-cases/aliases/dune diff --git a/test/blackbox-tests/test-cases/aliases/src/foo/bar/jbuild b/test/blackbox-tests/test-cases/aliases/src/dune similarity index 100% rename from test/blackbox-tests/test-cases/aliases/src/foo/bar/jbuild rename to test/blackbox-tests/test-cases/aliases/src/dune diff --git a/test/blackbox-tests/test-cases/aliases/src/foo/baz/jbuild b/test/blackbox-tests/test-cases/aliases/src/foo/bar/dune similarity index 100% rename from test/blackbox-tests/test-cases/aliases/src/foo/baz/jbuild rename to test/blackbox-tests/test-cases/aliases/src/foo/bar/dune diff --git a/test/blackbox-tests/test-cases/aliases/src/jbuild b/test/blackbox-tests/test-cases/aliases/src/foo/baz/dune similarity index 100% rename from test/blackbox-tests/test-cases/aliases/src/jbuild rename to test/blackbox-tests/test-cases/aliases/src/foo/baz/dune diff --git a/test/blackbox-tests/test-cases/byte-code-only/bin/jbuild b/test/blackbox-tests/test-cases/byte-code-only/bin/dune similarity index 100% rename from test/blackbox-tests/test-cases/byte-code-only/bin/jbuild rename to test/blackbox-tests/test-cases/byte-code-only/bin/dune diff --git a/test/blackbox-tests/test-cases/byte-code-only/native-only/jbuild b/test/blackbox-tests/test-cases/byte-code-only/native-only/dune similarity index 100% rename from test/blackbox-tests/test-cases/byte-code-only/native-only/jbuild rename to test/blackbox-tests/test-cases/byte-code-only/native-only/dune diff --git a/test/blackbox-tests/test-cases/byte-code-only/src/jbuild b/test/blackbox-tests/test-cases/byte-code-only/src/dune similarity index 100% rename from test/blackbox-tests/test-cases/byte-code-only/src/jbuild rename to test/blackbox-tests/test-cases/byte-code-only/src/dune diff --git a/test/blackbox-tests/test-cases/c-stubs/jbuild b/test/blackbox-tests/test-cases/c-stubs/dune similarity index 100% rename from test/blackbox-tests/test-cases/c-stubs/jbuild rename to test/blackbox-tests/test-cases/c-stubs/dune diff --git a/test/blackbox-tests/test-cases/c-stubs/q/jbuild b/test/blackbox-tests/test-cases/c-stubs/q/dune similarity index 100% rename from test/blackbox-tests/test-cases/c-stubs/q/jbuild rename to test/blackbox-tests/test-cases/c-stubs/q/dune diff --git a/test/blackbox-tests/test-cases/c-stubs/qnativerun/jbuild b/test/blackbox-tests/test-cases/c-stubs/qnativerun/dune similarity index 100% rename from test/blackbox-tests/test-cases/c-stubs/qnativerun/jbuild rename to test/blackbox-tests/test-cases/c-stubs/qnativerun/dune diff --git a/test/blackbox-tests/test-cases/configurator/c_test/jbuild b/test/blackbox-tests/test-cases/configurator/c_test/dune similarity index 100% rename from test/blackbox-tests/test-cases/configurator/c_test/jbuild rename to test/blackbox-tests/test-cases/configurator/c_test/dune diff --git a/test/blackbox-tests/test-cases/configurator/config/jbuild b/test/blackbox-tests/test-cases/configurator/config/dune similarity index 100% rename from test/blackbox-tests/test-cases/configurator/config/jbuild rename to test/blackbox-tests/test-cases/configurator/config/dune diff --git a/test/blackbox-tests/test-cases/configurator/import-define/jbuild b/test/blackbox-tests/test-cases/configurator/import-define/dune similarity index 100% rename from test/blackbox-tests/test-cases/configurator/import-define/jbuild rename to test/blackbox-tests/test-cases/configurator/import-define/dune diff --git a/test/blackbox-tests/test-cases/copy_files/jbuild b/test/blackbox-tests/test-cases/copy_files/dune similarity index 100% rename from test/blackbox-tests/test-cases/copy_files/jbuild rename to test/blackbox-tests/test-cases/copy_files/dune diff --git a/test/blackbox-tests/test-cases/copy_files/lexers/jbuild b/test/blackbox-tests/test-cases/copy_files/lexers/dune similarity index 100% rename from test/blackbox-tests/test-cases/copy_files/lexers/jbuild rename to test/blackbox-tests/test-cases/copy_files/lexers/dune diff --git a/test/blackbox-tests/test-cases/cross-compilation/bin/jbuild b/test/blackbox-tests/test-cases/cross-compilation/bin/dune similarity index 100% rename from test/blackbox-tests/test-cases/cross-compilation/bin/jbuild rename to test/blackbox-tests/test-cases/cross-compilation/bin/dune diff --git a/test/blackbox-tests/test-cases/cross-compilation/jbuild b/test/blackbox-tests/test-cases/cross-compilation/dune similarity index 100% rename from test/blackbox-tests/test-cases/cross-compilation/jbuild rename to test/blackbox-tests/test-cases/cross-compilation/dune diff --git a/test/blackbox-tests/test-cases/cross-compilation/lib/jbuild b/test/blackbox-tests/test-cases/cross-compilation/lib/dune similarity index 100% rename from test/blackbox-tests/test-cases/cross-compilation/lib/jbuild rename to test/blackbox-tests/test-cases/cross-compilation/lib/dune diff --git a/test/blackbox-tests/test-cases/depend-on-the-universe/jbuild b/test/blackbox-tests/test-cases/depend-on-the-universe/dune similarity index 100% rename from test/blackbox-tests/test-cases/depend-on-the-universe/jbuild rename to test/blackbox-tests/test-cases/depend-on-the-universe/dune diff --git a/test/blackbox-tests/test-cases/exclude-missing-module/jbuild b/test/blackbox-tests/test-cases/exclude-missing-module/dune similarity index 100% rename from test/blackbox-tests/test-cases/exclude-missing-module/jbuild rename to test/blackbox-tests/test-cases/exclude-missing-module/dune diff --git a/test/blackbox-tests/test-cases/exec-cmd/jbuild b/test/blackbox-tests/test-cases/exec-cmd/dune similarity index 100% rename from test/blackbox-tests/test-cases/exec-cmd/jbuild rename to test/blackbox-tests/test-cases/exec-cmd/dune diff --git a/test/blackbox-tests/test-cases/findlib/src/jbuild b/test/blackbox-tests/test-cases/findlib/src/dune similarity index 100% rename from test/blackbox-tests/test-cases/findlib/src/jbuild rename to test/blackbox-tests/test-cases/findlib/src/dune diff --git a/test/blackbox-tests/test-cases/findlib/test/jbuild b/test/blackbox-tests/test-cases/findlib/test/dune similarity index 100% rename from test/blackbox-tests/test-cases/findlib/test/jbuild rename to test/blackbox-tests/test-cases/findlib/test/dune diff --git a/test/blackbox-tests/test-cases/force-test/jbuild b/test/blackbox-tests/test-cases/force-test/dune similarity index 100% rename from test/blackbox-tests/test-cases/force-test/jbuild rename to test/blackbox-tests/test-cases/force-test/dune diff --git a/test/blackbox-tests/test-cases/gen-opam-install-file/jbuild b/test/blackbox-tests/test-cases/gen-opam-install-file/dune similarity index 100% rename from test/blackbox-tests/test-cases/gen-opam-install-file/jbuild rename to test/blackbox-tests/test-cases/gen-opam-install-file/dune diff --git a/test/blackbox-tests/test-cases/github20/jbuild b/test/blackbox-tests/test-cases/github20/dune similarity index 100% rename from test/blackbox-tests/test-cases/github20/jbuild rename to test/blackbox-tests/test-cases/github20/dune diff --git a/test/blackbox-tests/test-cases/github24/jbuild b/test/blackbox-tests/test-cases/github24/dune similarity index 100% rename from test/blackbox-tests/test-cases/github24/jbuild rename to test/blackbox-tests/test-cases/github24/dune diff --git a/test/blackbox-tests/test-cases/github25/root/jbuild b/test/blackbox-tests/test-cases/github25/root/dune similarity index 100% rename from test/blackbox-tests/test-cases/github25/root/jbuild rename to test/blackbox-tests/test-cases/github25/root/dune diff --git a/test/blackbox-tests/test-cases/github534/jbuild b/test/blackbox-tests/test-cases/github534/dune similarity index 100% rename from test/blackbox-tests/test-cases/github534/jbuild rename to test/blackbox-tests/test-cases/github534/dune diff --git a/test/blackbox-tests/test-cases/github568/jbuild b/test/blackbox-tests/test-cases/github568/dune similarity index 100% rename from test/blackbox-tests/test-cases/github568/jbuild rename to test/blackbox-tests/test-cases/github568/dune diff --git a/test/blackbox-tests/test-cases/github597/a/jbuild b/test/blackbox-tests/test-cases/github597/a/dune similarity index 100% rename from test/blackbox-tests/test-cases/github597/a/jbuild rename to test/blackbox-tests/test-cases/github597/a/dune diff --git a/test/blackbox-tests/test-cases/github597/b/jbuild b/test/blackbox-tests/test-cases/github597/b/dune similarity index 100% rename from test/blackbox-tests/test-cases/github597/b/jbuild rename to test/blackbox-tests/test-cases/github597/b/dune diff --git a/test/blackbox-tests/test-cases/github644/jbuild b/test/blackbox-tests/test-cases/github644/dune similarity index 100% rename from test/blackbox-tests/test-cases/github644/jbuild rename to test/blackbox-tests/test-cases/github644/dune diff --git a/test/blackbox-tests/test-cases/github660/explicit-interfaces/jbuild b/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune similarity index 100% rename from test/blackbox-tests/test-cases/github660/explicit-interfaces/jbuild rename to test/blackbox-tests/test-cases/github660/explicit-interfaces/dune diff --git a/test/blackbox-tests/test-cases/github660/no-interfaces/jbuild b/test/blackbox-tests/test-cases/github660/no-interfaces/dune similarity index 100% rename from test/blackbox-tests/test-cases/github660/no-interfaces/jbuild rename to test/blackbox-tests/test-cases/github660/no-interfaces/dune diff --git a/test/blackbox-tests/test-cases/github717-odoc-index/jbuild b/test/blackbox-tests/test-cases/github717-odoc-index/dune similarity index 100% rename from test/blackbox-tests/test-cases/github717-odoc-index/jbuild rename to test/blackbox-tests/test-cases/github717-odoc-index/dune diff --git a/test/blackbox-tests/test-cases/include-loop/jbuild b/test/blackbox-tests/test-cases/include-loop/dune similarity index 100% rename from test/blackbox-tests/test-cases/include-loop/jbuild rename to test/blackbox-tests/test-cases/include-loop/dune diff --git a/test/blackbox-tests/test-cases/inline_tests/dune-file/jbuild b/test/blackbox-tests/test-cases/inline_tests/dune-file/dune similarity index 100% rename from test/blackbox-tests/test-cases/inline_tests/dune-file/jbuild rename to test/blackbox-tests/test-cases/inline_tests/dune-file/dune diff --git a/test/blackbox-tests/test-cases/inline_tests/many-backends-choose/jbuild b/test/blackbox-tests/test-cases/inline_tests/many-backends-choose/dune similarity index 100% rename from test/blackbox-tests/test-cases/inline_tests/many-backends-choose/jbuild rename to test/blackbox-tests/test-cases/inline_tests/many-backends-choose/dune diff --git a/test/blackbox-tests/test-cases/inline_tests/missing-backend/jbuild b/test/blackbox-tests/test-cases/inline_tests/missing-backend/dune similarity index 100% rename from test/blackbox-tests/test-cases/inline_tests/missing-backend/jbuild rename to test/blackbox-tests/test-cases/inline_tests/missing-backend/dune diff --git a/test/blackbox-tests/test-cases/inline_tests/simple/jbuild b/test/blackbox-tests/test-cases/inline_tests/simple/dune similarity index 100% rename from test/blackbox-tests/test-cases/inline_tests/simple/jbuild rename to test/blackbox-tests/test-cases/inline_tests/simple/dune diff --git a/test/blackbox-tests/test-cases/inline_tests/too-many-backends/jbuild b/test/blackbox-tests/test-cases/inline_tests/too-many-backends/dune similarity index 100% rename from test/blackbox-tests/test-cases/inline_tests/too-many-backends/jbuild rename to test/blackbox-tests/test-cases/inline_tests/too-many-backends/dune diff --git a/test/blackbox-tests/test-cases/installable-dup-private-libs/a1/jbuild b/test/blackbox-tests/test-cases/installable-dup-private-libs/a1/dune similarity index 100% rename from test/blackbox-tests/test-cases/installable-dup-private-libs/a1/jbuild rename to test/blackbox-tests/test-cases/installable-dup-private-libs/a1/dune diff --git a/test/blackbox-tests/test-cases/installable-dup-private-libs/a2/jbuild b/test/blackbox-tests/test-cases/installable-dup-private-libs/a2/dune similarity index 100% rename from test/blackbox-tests/test-cases/installable-dup-private-libs/a2/jbuild rename to test/blackbox-tests/test-cases/installable-dup-private-libs/a2/dune diff --git a/test/blackbox-tests/test-cases/intf-only/a/jbuild b/test/blackbox-tests/test-cases/intf-only/a/dune similarity index 100% rename from test/blackbox-tests/test-cases/intf-only/a/jbuild rename to test/blackbox-tests/test-cases/intf-only/a/dune diff --git a/test/blackbox-tests/test-cases/intf-only/b/jbuild b/test/blackbox-tests/test-cases/intf-only/b/dune similarity index 100% rename from test/blackbox-tests/test-cases/intf-only/b/jbuild rename to test/blackbox-tests/test-cases/intf-only/b/dune diff --git a/test/blackbox-tests/test-cases/intf-only/c/jbuild b/test/blackbox-tests/test-cases/intf-only/c/dune similarity index 100% rename from test/blackbox-tests/test-cases/intf-only/c/jbuild rename to test/blackbox-tests/test-cases/intf-only/c/dune diff --git a/test/blackbox-tests/test-cases/intf-only/d/jbuild b/test/blackbox-tests/test-cases/intf-only/d/dune similarity index 100% rename from test/blackbox-tests/test-cases/intf-only/d/jbuild rename to test/blackbox-tests/test-cases/intf-only/d/dune diff --git a/test/blackbox-tests/test-cases/intf-only/foo/jbuild b/test/blackbox-tests/test-cases/intf-only/foo/dune similarity index 100% rename from test/blackbox-tests/test-cases/intf-only/foo/jbuild rename to test/blackbox-tests/test-cases/intf-only/foo/dune diff --git a/test/blackbox-tests/test-cases/intf-only/foo/test/jbuild b/test/blackbox-tests/test-cases/intf-only/foo/test/dune similarity index 100% rename from test/blackbox-tests/test-cases/intf-only/foo/test/jbuild rename to test/blackbox-tests/test-cases/intf-only/foo/test/dune diff --git a/test/blackbox-tests/test-cases/js_of_ocaml/bin/jbuild b/test/blackbox-tests/test-cases/js_of_ocaml/bin/dune similarity index 100% rename from test/blackbox-tests/test-cases/js_of_ocaml/bin/jbuild rename to test/blackbox-tests/test-cases/js_of_ocaml/bin/dune diff --git a/test/blackbox-tests/test-cases/js_of_ocaml/lib/jbuild b/test/blackbox-tests/test-cases/js_of_ocaml/lib/dune similarity index 100% rename from test/blackbox-tests/test-cases/js_of_ocaml/lib/jbuild rename to test/blackbox-tests/test-cases/js_of_ocaml/lib/dune diff --git a/test/blackbox-tests/test-cases/lib-available/jbuild b/test/blackbox-tests/test-cases/lib-available/dune similarity index 100% rename from test/blackbox-tests/test-cases/lib-available/jbuild rename to test/blackbox-tests/test-cases/lib-available/dune diff --git a/test/blackbox-tests/test-cases/loop/jbuild b/test/blackbox-tests/test-cases/loop/dune similarity index 100% rename from test/blackbox-tests/test-cases/loop/jbuild rename to test/blackbox-tests/test-cases/loop/dune diff --git a/test/blackbox-tests/test-cases/menhir/src/jbuild b/test/blackbox-tests/test-cases/menhir/src/dune similarity index 100% rename from test/blackbox-tests/test-cases/menhir/src/jbuild rename to test/blackbox-tests/test-cases/menhir/src/dune diff --git a/test/blackbox-tests/test-cases/merlin-tests/jbuild b/test/blackbox-tests/test-cases/merlin-tests/dune similarity index 100% rename from test/blackbox-tests/test-cases/merlin-tests/jbuild rename to test/blackbox-tests/test-cases/merlin-tests/dune diff --git a/test/blackbox-tests/test-cases/merlin-tests/exe/jbuild b/test/blackbox-tests/test-cases/merlin-tests/exe/dune similarity index 100% rename from test/blackbox-tests/test-cases/merlin-tests/exe/jbuild rename to test/blackbox-tests/test-cases/merlin-tests/exe/dune diff --git a/test/blackbox-tests/test-cases/merlin-tests/lib/jbuild b/test/blackbox-tests/test-cases/merlin-tests/lib/dune similarity index 100% rename from test/blackbox-tests/test-cases/merlin-tests/lib/jbuild rename to test/blackbox-tests/test-cases/merlin-tests/lib/dune diff --git a/test/blackbox-tests/test-cases/merlin-tests/ppx/jbuild b/test/blackbox-tests/test-cases/merlin-tests/ppx/dune similarity index 100% rename from test/blackbox-tests/test-cases/merlin-tests/ppx/jbuild rename to test/blackbox-tests/test-cases/merlin-tests/ppx/dune diff --git a/test/blackbox-tests/test-cases/merlin-tests/sanitize-dot-merlin/jbuild b/test/blackbox-tests/test-cases/merlin-tests/sanitize-dot-merlin/dune similarity index 100% rename from test/blackbox-tests/test-cases/merlin-tests/sanitize-dot-merlin/jbuild rename to test/blackbox-tests/test-cases/merlin-tests/sanitize-dot-merlin/dune diff --git a/test/blackbox-tests/test-cases/meta-gen/jbuild b/test/blackbox-tests/test-cases/meta-gen/dune similarity index 100% rename from test/blackbox-tests/test-cases/meta-gen/jbuild rename to test/blackbox-tests/test-cases/meta-gen/dune diff --git a/test/blackbox-tests/test-cases/meta-gen/src/jbuild b/test/blackbox-tests/test-cases/meta-gen/src/dune similarity index 100% rename from test/blackbox-tests/test-cases/meta-gen/src/jbuild rename to test/blackbox-tests/test-cases/meta-gen/src/dune diff --git a/test/blackbox-tests/test-cases/misc/blah/jbuild b/test/blackbox-tests/test-cases/misc/blah/dune similarity index 100% rename from test/blackbox-tests/test-cases/misc/blah/jbuild rename to test/blackbox-tests/test-cases/misc/blah/dune diff --git a/test/blackbox-tests/test-cases/misc/jbuild b/test/blackbox-tests/test-cases/misc/dune similarity index 100% rename from test/blackbox-tests/test-cases/misc/jbuild rename to test/blackbox-tests/test-cases/misc/dune diff --git a/test/blackbox-tests/test-cases/multiple-private-libs/a/jbuild b/test/blackbox-tests/test-cases/multiple-private-libs/a/dune similarity index 100% rename from test/blackbox-tests/test-cases/multiple-private-libs/a/jbuild rename to test/blackbox-tests/test-cases/multiple-private-libs/a/dune diff --git a/test/blackbox-tests/test-cases/multiple-private-libs/b/jbuild b/test/blackbox-tests/test-cases/multiple-private-libs/b/dune similarity index 100% rename from test/blackbox-tests/test-cases/multiple-private-libs/b/jbuild rename to test/blackbox-tests/test-cases/multiple-private-libs/b/dune diff --git a/test/blackbox-tests/test-cases/null-dep/jbuild b/test/blackbox-tests/test-cases/null-dep/dune similarity index 100% rename from test/blackbox-tests/test-cases/null-dep/jbuild rename to test/blackbox-tests/test-cases/null-dep/dune diff --git a/test/blackbox-tests/test-cases/ocaml-syntax/jbuild b/test/blackbox-tests/test-cases/ocaml-syntax/dune similarity index 100% rename from test/blackbox-tests/test-cases/ocaml-syntax/jbuild rename to test/blackbox-tests/test-cases/ocaml-syntax/dune diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/jbuild b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/dune similarity index 100% rename from test/blackbox-tests/test-cases/ocamldep-multi-stanzas/jbuild rename to test/blackbox-tests/test-cases/ocamldep-multi-stanzas/dune diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/src/jbuild b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/src/dune similarity index 100% rename from test/blackbox-tests/test-cases/ocamldep-multi-stanzas/src/jbuild rename to test/blackbox-tests/test-cases/ocamldep-multi-stanzas/src/dune diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/jbuild b/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/dune similarity index 100% rename from test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/jbuild rename to test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/dune diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/jbuild b/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/dune similarity index 100% rename from test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/jbuild rename to test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/dune diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib1/jbuild b/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib1/dune similarity index 100% rename from test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib1/jbuild rename to test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib1/dune diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib2/jbuild b/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib2/dune similarity index 100% rename from test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib2/jbuild rename to test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib2/dune diff --git a/test/blackbox-tests/test-cases/odoc/jbuild b/test/blackbox-tests/test-cases/odoc/dune similarity index 100% rename from test/blackbox-tests/test-cases/odoc/jbuild rename to test/blackbox-tests/test-cases/odoc/dune diff --git a/test/blackbox-tests/test-cases/output-obj/jbuild b/test/blackbox-tests/test-cases/output-obj/dune similarity index 100% rename from test/blackbox-tests/test-cases/output-obj/jbuild rename to test/blackbox-tests/test-cases/output-obj/dune diff --git a/test/blackbox-tests/test-cases/package-dep/jbuild b/test/blackbox-tests/test-cases/package-dep/dune similarity index 100% rename from test/blackbox-tests/test-cases/package-dep/jbuild rename to test/blackbox-tests/test-cases/package-dep/dune diff --git a/test/blackbox-tests/test-cases/ppx-rewriter/jbuild b/test/blackbox-tests/test-cases/ppx-rewriter/dune similarity index 100% rename from test/blackbox-tests/test-cases/ppx-rewriter/jbuild rename to test/blackbox-tests/test-cases/ppx-rewriter/dune diff --git a/test/blackbox-tests/test-cases/ppx-rewriter/ppx/jbuild b/test/blackbox-tests/test-cases/ppx-rewriter/ppx/dune similarity index 100% rename from test/blackbox-tests/test-cases/ppx-rewriter/ppx/jbuild rename to test/blackbox-tests/test-cases/ppx-rewriter/ppx/dune diff --git a/test/blackbox-tests/test-cases/private-public-overlap/exes/jbuild b/test/blackbox-tests/test-cases/private-public-overlap/exes/dune similarity index 100% rename from test/blackbox-tests/test-cases/private-public-overlap/exes/jbuild rename to test/blackbox-tests/test-cases/private-public-overlap/exes/dune diff --git a/test/blackbox-tests/test-cases/private-public-overlap/optional/jbuild b/test/blackbox-tests/test-cases/private-public-overlap/optional/dune similarity index 100% rename from test/blackbox-tests/test-cases/private-public-overlap/optional/jbuild rename to test/blackbox-tests/test-cases/private-public-overlap/optional/dune diff --git a/test/blackbox-tests/test-cases/private-public-overlap/private-dep/jbuild b/test/blackbox-tests/test-cases/private-public-overlap/private-dep/dune similarity index 100% rename from test/blackbox-tests/test-cases/private-public-overlap/private-dep/jbuild rename to test/blackbox-tests/test-cases/private-public-overlap/private-dep/dune diff --git a/test/blackbox-tests/test-cases/private-public-overlap/private-rewriter/jbuild b/test/blackbox-tests/test-cases/private-public-overlap/private-rewriter/dune similarity index 100% rename from test/blackbox-tests/test-cases/private-public-overlap/private-rewriter/jbuild rename to test/blackbox-tests/test-cases/private-public-overlap/private-rewriter/dune diff --git a/test/blackbox-tests/test-cases/private-public-overlap/private-runtime-deps/jbuild b/test/blackbox-tests/test-cases/private-public-overlap/private-runtime-deps/dune similarity index 100% rename from test/blackbox-tests/test-cases/private-public-overlap/private-runtime-deps/jbuild rename to test/blackbox-tests/test-cases/private-public-overlap/private-runtime-deps/dune diff --git a/test/blackbox-tests/test-cases/promote/jbuild b/test/blackbox-tests/test-cases/promote/dune similarity index 100% rename from test/blackbox-tests/test-cases/promote/jbuild rename to test/blackbox-tests/test-cases/promote/dune diff --git a/test/blackbox-tests/test-cases/quoting/jbuild b/test/blackbox-tests/test-cases/quoting/dune similarity index 100% rename from test/blackbox-tests/test-cases/quoting/jbuild rename to test/blackbox-tests/test-cases/quoting/dune diff --git a/test/blackbox-tests/test-cases/reason/jbuild b/test/blackbox-tests/test-cases/reason/dune similarity index 100% rename from test/blackbox-tests/test-cases/reason/jbuild rename to test/blackbox-tests/test-cases/reason/dune diff --git a/test/blackbox-tests/test-cases/reason/pp/jbuild b/test/blackbox-tests/test-cases/reason/pp/dune similarity index 100% rename from test/blackbox-tests/test-cases/reason/pp/jbuild rename to test/blackbox-tests/test-cases/reason/pp/dune diff --git a/test/blackbox-tests/test-cases/reason/ppx/jbuild b/test/blackbox-tests/test-cases/reason/ppx/dune similarity index 100% rename from test/blackbox-tests/test-cases/reason/ppx/jbuild rename to test/blackbox-tests/test-cases/reason/ppx/dune diff --git a/test/blackbox-tests/test-cases/redirections/jbuild b/test/blackbox-tests/test-cases/redirections/dune similarity index 100% rename from test/blackbox-tests/test-cases/redirections/jbuild rename to test/blackbox-tests/test-cases/redirections/dune diff --git a/test/blackbox-tests/test-cases/scope-bug/alib/jbuild b/test/blackbox-tests/test-cases/scope-bug/alib/dune similarity index 100% rename from test/blackbox-tests/test-cases/scope-bug/alib/jbuild rename to test/blackbox-tests/test-cases/scope-bug/alib/dune diff --git a/test/blackbox-tests/test-cases/scope-bug/blib/jbuild b/test/blackbox-tests/test-cases/scope-bug/blib/dune similarity index 100% rename from test/blackbox-tests/test-cases/scope-bug/blib/jbuild rename to test/blackbox-tests/test-cases/scope-bug/blib/dune diff --git a/test/blackbox-tests/test-cases/scope-bug/blib/sub/jbuild b/test/blackbox-tests/test-cases/scope-bug/blib/sub/dune similarity index 100% rename from test/blackbox-tests/test-cases/scope-bug/blib/sub/jbuild rename to test/blackbox-tests/test-cases/scope-bug/blib/sub/dune diff --git a/test/blackbox-tests/test-cases/scope-ppx-bug/a/kernel/jbuild b/test/blackbox-tests/test-cases/scope-ppx-bug/a/kernel/dune similarity index 100% rename from test/blackbox-tests/test-cases/scope-ppx-bug/a/kernel/jbuild rename to test/blackbox-tests/test-cases/scope-ppx-bug/a/kernel/dune diff --git a/test/blackbox-tests/test-cases/scope-ppx-bug/a/ppx/jbuild b/test/blackbox-tests/test-cases/scope-ppx-bug/a/ppx/dune similarity index 100% rename from test/blackbox-tests/test-cases/scope-ppx-bug/a/ppx/jbuild rename to test/blackbox-tests/test-cases/scope-ppx-bug/a/ppx/dune diff --git a/test/blackbox-tests/test-cases/scope-ppx-bug/b/jbuild b/test/blackbox-tests/test-cases/scope-ppx-bug/b/dune similarity index 100% rename from test/blackbox-tests/test-cases/scope-ppx-bug/b/jbuild rename to test/blackbox-tests/test-cases/scope-ppx-bug/b/dune diff --git a/test/blackbox-tests/test-cases/select/jbuild b/test/blackbox-tests/test-cases/select/dune similarity index 100% rename from test/blackbox-tests/test-cases/select/jbuild rename to test/blackbox-tests/test-cases/select/dune diff --git a/test/blackbox-tests/test-cases/utop/forutop/jbuild b/test/blackbox-tests/test-cases/utop/forutop/dune similarity index 100% rename from test/blackbox-tests/test-cases/utop/forutop/jbuild rename to test/blackbox-tests/test-cases/utop/forutop/dune diff --git a/test/common/jbuild b/test/common/dune similarity index 100% rename from test/common/jbuild rename to test/common/dune diff --git a/test/jbuild b/test/dune similarity index 100% rename from test/jbuild rename to test/dune diff --git a/test/unit-tests/configurator/jbuild b/test/unit-tests/configurator/dune similarity index 100% rename from test/unit-tests/configurator/jbuild rename to test/unit-tests/configurator/dune diff --git a/test/unit-tests/jbuild b/test/unit-tests/dune similarity index 100% rename from test/unit-tests/jbuild rename to test/unit-tests/dune diff --git a/test/unit-tests/ocaml-config/jbuild b/test/unit-tests/ocaml-config/dune similarity index 100% rename from test/unit-tests/ocaml-config/jbuild rename to test/unit-tests/ocaml-config/dune diff --git a/vendor/cmdliner/src/jbuild b/vendor/cmdliner/src/dune similarity index 100% rename from vendor/cmdliner/src/jbuild rename to vendor/cmdliner/src/dune diff --git a/vendor/opam-file-format/src/jbuild b/vendor/opam-file-format/src/dune similarity index 100% rename from vendor/opam-file-format/src/jbuild rename to vendor/opam-file-format/src/dune diff --git a/vendor/re/src/jbuild b/vendor/re/src/dune similarity index 100% rename from vendor/re/src/jbuild rename to vendor/re/src/dune