From patchwork Sun Feb 10 13:36:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Hondet X-Patchwork-Id: 1012 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8594816BF2; Sun, 10 Feb 2019 13:41:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1ADF416BED for ; Sun, 10 Feb 2019 13:41:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:59565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gspM4-0000bF-HN for patchwork@mira.cbaines.net; Sun, 10 Feb 2019 08:41:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gspLz-0000ax-Ch for guix-patches@gnu.org; Sun, 10 Feb 2019 08:41:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gspLy-0006xc-CC for guix-patches@gnu.org; Sun, 10 Feb 2019 08:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42553) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gspLy-0006xW-9C for guix-patches@gnu.org; Sun, 10 Feb 2019 08:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gspLy-00011l-3a for guix-patches@gnu.org; Sun, 10 Feb 2019 08:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests Resent-From: Gabriel Hondet Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Feb 2019 13:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34412 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34412@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15498060533922 (code B ref -1); Sun, 10 Feb 2019 13:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Feb 2019 13:40:53 +0000 Received: from localhost ([127.0.0.1]:41834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gspLp-00011B-FK for submit@debbugs.gnu.org; Sun, 10 Feb 2019 08:40:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gspLo-00010z-7F for submit@debbugs.gnu.org; Sun, 10 Feb 2019 08:40:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:51305) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gspLi-0006tI-5h for submit@debbugs.gnu.org; Sun, 10 Feb 2019 08:40:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gspLh-0000YT-3j for guix-patches@gnu.org; Sun, 10 Feb 2019 08:40:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gspLf-0006qw-8q for guix-patches@gnu.org; Sun, 10 Feb 2019 08:40:45 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:34651) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gspLc-0006mN-Jk for guix-patches@gnu.org; Sun, 10 Feb 2019 08:40:41 -0500 Received: by mail-wm1-x32e.google.com with SMTP id y185so11743729wmd.1 for ; Sun, 10 Feb 2019 05:40:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=user-agent:from:to:subject:date:message-id:mime-version; bh=YM4oEQsdeVQv+IkJ/Q/Xg/z3QuehgGgn6szSixkyLU0=; b=MUX2xhx0bctsWmImu+SmTAyRP728Wlz7TeNQUznzoNzfuyh8aoeMoyhaZeu26JGZDW 6jASPPQ7Rkj9SamA0tAdfVWIWF3MXtN+Tnp9RKE9DGtZssASM4QMzCydL0QhzvXJVlP+ IXLH05Cu2hUAvVeuwcCoNhYX4ojuycuPIyh3VyENWzKC/WaHPZlytr/2Wotf3+TVQ4oT oWkNtfPPkHbRNsWXKz47S8+q2Z1nwp7eAGuKeNwgQDXY5bMub1BzgzV9NwTe1zqt9jD1 EZ6sYdEJRBWSLL8+dDJi21+HXdCj9MXJM0cnk+EKG8XcPBt3oj+hETTDECsmVlHgKANw df4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :mime-version; bh=YM4oEQsdeVQv+IkJ/Q/Xg/z3QuehgGgn6szSixkyLU0=; b=fu6YHe6zAwLHrBrqloYAaF8t7si7aoi3G8GyP9X5nPjjrjJiDzt53FrLAu3vQC4JO9 ePupfSz5fFF9pQfCR3GZS6cx64zqEVvQhmCm95eK7Vu4d7S/OS537wbFR9xfo9AOMu3m buO/rfXlVU7cmY7lgV11l+lOJaESaBDFs8pRzLvVGkBoGhHjmelINNCcWCPwUID54i2Q 2BttTCP52a8vJ/CEyhKqWYivUNEb2zapfgZSVQgLti+gA7NjoFcNwACOQUkV8o3YwxZj AiBz08dmCOWruYWc4awy/IXr1JPhe9twlFLi2wD58D/EnEh4yfrkupulbDW80ygtrFcY PGSQ== X-Gm-Message-State: AHQUAuYJtdc8KaKwARnXmQwVYT0V2Rw08w6qdHXp0unBY+j9xGUuFxI7 IJz81lUwOGyhgq78zKWVNOWIJ3x9 X-Google-Smtp-Source: AHgI3IaUg8SE34GDfYg5eV3AaM2fgopQQo7z5rUmU8XHuDJZhzSMkmRYfLiZaQzYNB0RvZHHloNHTw== X-Received: by 2002:a7b:c75a:: with SMTP id w26mr6137006wmk.35.1549806031275; Sun, 10 Feb 2019 05:40:31 -0800 (PST) Received: from glht-aurore.gmail.com (2a01cb04062c860082fa5bfffe3823d7.ipv6.abo.wanadoo.fr. [2a01:cb04:62c:8600:82fa:5bff:fe38:23d7]) by smtp.gmail.com with ESMTPSA id m4sm4308820wml.2.2019.02.10.05.40.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Feb 2019 05:40:30 -0800 (PST) User-agent: mu4e 1.0; emacs 26.1 From: Gabriel Hondet Date: Sun, 10 Feb 2019 14:36:15 +0100 Message-ID: <877ee74v93.fsf@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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.