ocamlPackages.merlin: fix tests on darwin

main
Vincent Laporte 3 years ago committed by Vincent Laporte
parent 631e658ed7
commit 81797521af
  1. 3
      pkgs/development/tools/ocaml/merlin/4.x.nix
  2. 19
      pkgs/development/tools/ocaml/merlin/test.patch

@ -47,6 +47,9 @@ buildDunePackage {
dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader";
dune = "${dune_2}/bin/dune";
})
# This fixes the test-suite on macOS
# See https://github.com/ocaml/merlin/pull/1399
./test.patch
];
useDune2 = true;

@ -0,0 +1,19 @@
commit 282eed37f39ff216add8d53766fd59f3737eb87f
Author: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu Nov 4 06:24:07 2021 +0100
Ignore dune stderr in tests
diff --git a/tests/test-dirs/document/src-documentation.t/run.t b/tests/test-dirs/document/src-documentation.t/run.t
index 2c9e1419..4f4c4327 100644
--- a/tests/test-dirs/document/src-documentation.t/run.t
+++ b/tests/test-dirs/document/src-documentation.t/run.t
@@ -42,7 +42,7 @@ documentation for the non-last defined value (in the same file) is show
> jq '.value'
" List reversal. "
- $ dune build --root=. ./doc.exe
+ $ dune build --root=. ./doc.exe 2> /dev/null
$ cat >.merlin <<EOF
> B _build/default/.doc.eobjs/byte
> S .
Loading…
Cancel
Save