From e26d0ceb6c5730d8aaef74475f697c6857069b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Fri, 4 Oct 2024 18:19:19 +0200 Subject: [PATCH] Promote test results for OCaml 5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulysse Gérard --- .../test-cases/merlin/implicit-transitive-deps.t/bin/main.ml | 2 +- .../test-cases/merlin/implicit-transitive-deps.t/run.t | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/blackbox-tests/test-cases/merlin/implicit-transitive-deps.t/bin/main.ml b/test/blackbox-tests/test-cases/merlin/implicit-transitive-deps.t/bin/main.ml index 2f5fb3b592da..cf8e7bb1fbb1 100644 --- a/test/blackbox-tests/test-cases/merlin/implicit-transitive-deps.t/bin/main.ml +++ b/test/blackbox-tests/test-cases/merlin/implicit-transitive-deps.t/bin/main.ml @@ -1 +1 @@ -type t = Lib1.t \ No newline at end of file +type _t = Lib1.t diff --git a/test/blackbox-tests/test-cases/merlin/implicit-transitive-deps.t/run.t b/test/blackbox-tests/test-cases/merlin/implicit-transitive-deps.t/run.t index da37e048b603..a38c92adc498 100644 --- a/test/blackbox-tests/test-cases/merlin/implicit-transitive-deps.t/run.t +++ b/test/blackbox-tests/test-cases/merlin/implicit-transitive-deps.t/run.t @@ -28,13 +28,11 @@ Merlin. ?:B?:$TESTCASE_ROOT/_build/default/src/lib2/.lib2.objs/byte) ?:S?:$TESTCASE_ROOT/src/lib1) ?:S?:$TESTCASE_ROOT/src/lib2) - ?:S?:$TESTCASE_ROOT/src/lib_dep) $ FILE=$PWD/src/lib2/lib2.ml $ printf "(4:File%d:%s)" ${#FILE} $FILE | dune ocaml-merlin | > sed -E "s/[[:digit:]]+:/\?:/g" | tr '(' '\n' | grep -E ":[BS]H?\?" - ?:B?:/STDLIB) ?:B?:$TESTCASE_ROOT/_build/default/src/lib2/.lib2.objs/byte) - ?:S?:/STDLIB) + ?:B?:$TESTCASE_ROOT/_build/default/src/lib_dep/.dep.objs/byte) ?:S?:$TESTCASE_ROOT/src/lib2) ?:S?:$TESTCASE_ROOT/src/lib_dep)