diff --git a/test/blackbox-tests/test-cases/deprecated-library-name/run.t b/test/blackbox-tests/test-cases/deprecated-library-name/run.t index cf50c08f4738..1ae02cf380b6 100644 --- a/test/blackbox-tests/test-cases/deprecated-library-name/run.t +++ b/test/blackbox-tests/test-cases/deprecated-library-name/run.t @@ -126,11 +126,13 @@ First the motivating case. > EOF $ cd d && dune build --root . @install + $ find d/_build/install/default -name 'META' | sort d/_build/install/default/lib/dummy/META d/_build/install/default/lib/menhir/META d/_build/install/default/lib/menhirLib/META d/_build/install/default/lib/menhirSdk/META + $ cat d/_build/install/default/lib/dummy/META @@ -139,21 +141,23 @@ First the motivating case. $ cat d/_build/install/default/lib/menhirSdk/META requires = "menhir.sdk" - $ find d/_build/install/default -name 'dune-package' | sort d/_build/install/default/lib/dummy/dune-package d/_build/install/default/lib/menhir/dune-package d/_build/install/default/lib/menhirLib/dune-package d/_build/install/default/lib/menhirSdk/dune-package + $ cat d/_build/install/default/lib/dummy/dune-package (lang dune 2.0) (name dummy) + $ cat d/_build/install/default/lib/menhirLib/dune-package (lang dune 2.0) (name menhirLib) (deprecated_library_name (old_public_name menhirLib) (new_public_name menhir.lib)) + $ cat d/_build/install/default/lib/menhirSdk/dune-package (lang dune 2.0) (name menhirSdk) @@ -195,6 +199,7 @@ Checks that we can migrate top-level libraries across packages. > EOF $ cd d && dune build --root . @install + $ cat d/_build/install/default/lib/top1/META requires = "q.bar" @@ -213,6 +218,7 @@ old public name: > EOF $ cd d && dune build --root . @all + $ cat d/_build/install/default/lib/top2/META requires = "q.top2" @@ -284,16 +290,20 @@ Qualified, deprecated old_public_name: > EOF $ cd d && dune build --root . @all + $ find d/_build/install/default -name 'META' | sort d/_build/install/default/lib/p/META d/_build/install/default/lib/q/META + $ cat d/_build/install/default/lib/q/META package "foo" ( requires = "p" ) + $ find d/_build/install/default -name 'dune-package' | sort d/_build/install/default/lib/p/dune-package d/_build/install/default/lib/q/dune-package + $ cat d/_build/install/default/lib/q/dune-package (lang dune 2.0) (name q) @@ -321,9 +331,11 @@ Two libraries redirecting to the same library: > EOF $ cd d && dune build --root . @all + $ find d/_build/install/default -name 'META' | sort d/_build/install/default/lib/p/META d/_build/install/default/lib/q/META + $ cat d/_build/install/default/lib/q/META package "bar" ( requires = "p" @@ -331,11 +343,53 @@ Two libraries redirecting to the same library: package "foo" ( requires = "p" ) + $ find d/_build/install/default -name 'dune-package' | sort d/_build/install/default/lib/p/dune-package d/_build/install/default/lib/q/dune-package + $ cat d/_build/install/default/lib/q/dune-package (lang dune 2.0) (name q) (deprecated_library_name (old_public_name q.bar) (new_public_name p)) (deprecated_library_name (old_public_name q.foo) (new_public_name p)) + +Check that we can use deprecated packages from within the same project and +across projects. + + $ mkdir -p d/p/a d/p/b + + $ cat >d/p/a/dune-project < (lang dune 2.0) + > (package (name a) (deprecated_package_names aa)) + > EOF + + $ cat >d/p/b/dune-project < (lang dune 2.0) + > (package (name b)) + > EOF + + $ cat >d/p/a/dune < (rule (with-stdout-to empty1.ml (progn))) + > (rule (with-stdout-to empty2.ml (progn))) + > (deprecated_library_name + > (old_public_name aa.foo) + > (new_public_name a.p)) + > (library + > (name p) + > (public_name a.p) + > (modules empty1)) + > (library + > (name q) + > (libraries aa.foo) + > (modules empty2)) + > EOF + + $ cat >d/p/b/dune < (rule (with-stdout-to empty.ml (progn))) + > (library + > (name b) + > (libraries aa.foo)) + > EOF + + $ cd d/p && dune build --root . @all