From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37140) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgkDv-0005CG-UJ for guix-patches@gnu.org; Fri, 28 Jun 2019 02:19:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgkDu-00023e-Ks for guix-patches@gnu.org; Fri, 28 Jun 2019 02:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hgkDu-00023Z-Hq for guix-patches@gnu.org; Fri, 28 Jun 2019 02:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hgkDu-0002ya-CM for guix-patches@gnu.org; Fri, 28 Jun 2019 02:19:02 -0400 Subject: [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests Resent-Message-ID: Date: Fri, 28 Jun 2019 08:17:54 +0200 In-Reply-To: References: <877ee74v93.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Julien Lepiller Message-ID: <670267B2-5EA9-44E4-85DB-D48206DBED4A@lepiller.eu> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34412@debbugs.gnu.org, swedebugia@riseup.net Sorry for not having seen that! Le 28 juin 2019 07:41:38 GMT+02:00, swedebugia a= =C3=A9crit : >On 2019-02-10 14:36, Gabriel Hondet wrote: >> * gnu/packages/ocaml=2Escm (ocaml-merlin): Added tests >> --- >> gnu/packages/ocaml=2Escm | 23 +++++++++++++++++++++-- >> 1 file changed, 21 insertions(+), 2 deletions(-) >>=20 >> diff --git a/gnu/packages/ocaml=2Escm b/gnu/packages/ocaml=2Escm >> index 07fcf92ae=2E=2E0b33c257a 100644 >> --- a/gnu/packages/ocaml=2Escm >> +++ b/gnu/packages/ocaml=2Escm >> @@ -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}=2E @code{craml} is released as a single >binary (called @code{craml})=2E") >> (url"https://github=2Ecom/ocaml/merlin=2Egit") >> (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=2Eml a=2Emli") "")))) >> (sha256 >> (base32 >> "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb")))) >> @@ -4794,9 +4800,22 @@ format}=2E @code{craml} is released as a single >binary (called @code{craml})=2E") >> ("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=2E2=2E2 >> + '(#: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/") Can we try and fix the shebang then? >> + #t)) >> + (replace 'check >> + (lambda _ >> + (invoke "make" "test") >> + #t))))) I think #:test-target "test" would be enough, no? >> (synopsis "Context sensitive completion for OCaml in Vim and >Emacs") >> (description "Merlin is an editor service that provides modern >IDE >> features for OCaml=2E Emacs and Vim support is provided >out-of-the-box=2E >> -- 2=2E20=2E1 >>=20 > >This has slipped through the cracks=2E Could you rebase to current master > >and send an updated patch?