From: swedebugia <swedebugia@riseup.net>
To: 34412@debbugs.gnu.org
Subject: [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests
Date: Fri, 28 Jun 2019 07:41:38 +0200 [thread overview]
Message-ID: <b30ce794-44a6-a689-c469-0e989210f0d4@riseup.net> (raw)
In-Reply-To: <877ee74v93.fsf@gmail.com>
On 2019-02-10 14:36, Gabriel Hondet wrote:
> * gnu/packages/ocaml.scm (ocaml-merlin): Added tests
> ---
> gnu/packages/ocaml.scm | 23 +++++++++++++++++++++--
> 1 file changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
> index 07fcf92ae..0b33c257a 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -66,6 +66,7 @@
> #:use-module (gnu packages version-control)
> #:use-module (gnu packages virtualization)
> #:use-module (gnu packages web-browsers)
> + #:use-module (gnu packages web)
> #:use-module (gnu packages xml)
> #:use-module (gnu packages xorg)
> #:use-module (guix build-system dune)
> @@ -4785,6 +4786,11 @@ format}. @code{craml} is released as a single binary (called @code{craml}).")
> (url"https://github.com/ocaml/merlin.git")
> (commit (string-append "v" version))))
> (file-name (git-file-name name version))
> + (modules '((guix build utils)))
> + (snippet '(begin
> + ;; fix a dune file calling missing dependencies
> + (substitute* "tests/locate/partial-cmt/dune"
> + (("a.ml a.mli") ""))))
> (sha256
> (base32
> "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb"))))
> @@ -4794,9 +4800,22 @@ format}. @code{craml} is released as a single binary (called @code{craml}).")
> ("ocaml-yojson" ,ocaml-yojson)
> ("ocaml-easy-format" ,ocaml-easy-format)))
> (native-inputs
> - `(("ocaml-findlib" ,ocaml-findlib)))
> + `(("ocaml-findlib" ,ocaml-findlib)
> + ("ocaml-craml" ,ocaml-craml)
> + ("jq" ,jq)))
> (arguments
> - '(#:tests? #f)) ;; Errors in tests in version 3.2.2
> + '(#:phases
> + (modify-phases %standard-phases
> + (add-before 'check 'remove-failing
> + (lambda _
> + (delete-file-recursively "tests/warnings/")
> + (delete-file-recursively ;fail because of shebang patching
> + "tests/locate/context-detection/")
> + #t))
> + (replace 'check
> + (lambda _
> + (invoke "make" "test")
> + #t)))))
> (synopsis "Context sensitive completion for OCaml in Vim and Emacs")
> (description "Merlin is an editor service that provides modern IDE
> features for OCaml. Emacs and Vim support is provided out-of-the-box.
> -- 2.20.1
>
This has slipped through the cracks. Could you rebase to current master
and send an updated patch?
--
Cheers Swedebugia
next prev parent reply other threads:[~2019-06-28 5:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-10 13:36 [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests Gabriel Hondet
2019-06-28 5:41 ` swedebugia [this message]
2019-06-28 6:17 ` Julien Lepiller
2021-10-08 2:57 ` Julien Lepiller
2021-10-11 11:35 ` zimoun
2022-04-07 12:14 ` bug#34412: " zimoun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b30ce794-44a6-a689-c469-0e989210f0d4@riseup.net \
--to=swedebugia@riseup.net \
--cc=34412@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).