From 3531597537476c18c203dfc3633593c9e7185ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Wed, 9 Oct 2024 13:59:28 +0200 Subject: [PATCH] Promote more consistent behaviour of overlap checks --- test/blackbox-tests/test-cases/overlapping-deps.t | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/test/blackbox-tests/test-cases/overlapping-deps.t b/test/blackbox-tests/test-cases/overlapping-deps.t index 6fc73cb15b15..5b471d9335a2 100644 --- a/test/blackbox-tests/test-cases/overlapping-deps.t +++ b/test/blackbox-tests/test-cases/overlapping-deps.t @@ -81,7 +81,7 @@ We can fix the error by allow overlapping dependencies: > EOF $ OCAMLPATH=$PWD/../external/_build/install/default/lib dune build %{cma:proj2/bar} --root . -Strangely, the error disappears if we remove the source for the bar lib: +The error does not disappears if we remove the source for the bar lib: $ cat >proj2/dune < (library @@ -90,6 +90,16 @@ Strangely, the error disappears if we remove the source for the bar lib: > EOF $ rm proj2/bar.ml $ OCAMLPATH=$PWD/../external/_build/install/default/lib dune build %{cma:proj2/bar} --root . + Error: Conflict between the following libraries: + - "some_package2" in _build/default/proj1 + - "some_package2" in + $TESTCASE_ROOT/use/../external/_build/install/default/lib/some_package2 + -> required by library "some_package1" in + $TESTCASE_ROOT/use/../external/_build/install/default/lib/some_package1 + -> required by _build/default/proj2/.merlin-conf/lib-bar + -> required by _build/default/proj2/bar.cma + -> required by %{cma:proj2/bar} at command line:1 + [1] We also make sure the error exists for executables: $ cat >proj2/dune <