From 2e6d363c5e87569efc23848513e71f2233b7e9d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Oct 2022 15:50:26 +0100 Subject: gentoo auto-resync : 23:10:2022 - 15:50:25 --- dev-ml/merlin/merlin-4.6.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'dev-ml/merlin/merlin-4.6.ebuild') diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild index fa661a5ad042..8086c63f9c25 100644 --- a/dev-ml/merlin/merlin-4.6.ebuild +++ b/dev-ml/merlin/merlin-4.6.ebuild @@ -66,8 +66,11 @@ src_prepare() { # Handle installation via the eclass rm emacs/dune || die - # This test runs only inside a git repo - rm -r tests/test-dirs/occurrences/issue1404.t || die + # This test runs only inside a git repo, + # it is not included in merlin release for ocaml 4.12. + if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then + rm tests/test-dirs/occurrences/issue1404.t || die + fi rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die } -- cgit v1.2.3