From patchwork Wed Jun 23 08:52:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 30637 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 27E8827BC81; Wed, 23 Jun 2021 09:56:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F316E27BC78 for ; Wed, 23 Jun 2021 09:56:05 +0100 (BST) Received: from localhost ([::1]:39380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvyg0-000067-Kq for patchwork@mira.cbaines.net; Wed, 23 Jun 2021 04:56:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvyd3-0003sM-TQ for guix-patches@gnu.org; Wed, 23 Jun 2021 04:53:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57080) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lvyd3-0002Dg-Lw for guix-patches@gnu.org; Wed, 23 Jun 2021 04:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lvyd3-00053f-LR for guix-patches@gnu.org; Wed, 23 Jun 2021 04:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49183] [PATCH] gnu: ocaml-dose3: Fix tests. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Jun 2021 08:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49183 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49183@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162443837619430 (code B ref -1); Wed, 23 Jun 2021 08:53:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jun 2021 08:52:56 +0000 Received: from localhost ([127.0.0.1]:40393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvycx-00053J-S1 for submit@debbugs.gnu.org; Wed, 23 Jun 2021 04:52:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:48444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvycv-00053B-SA for submit@debbugs.gnu.org; Wed, 23 Jun 2021 04:52:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvycv-0003s8-GS for guix-patches@gnu.org; Wed, 23 Jun 2021 04:52:53 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:41364 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvyct-0001vp-Oc for guix-patches@gnu.org; Wed, 23 Jun 2021 04:52:53 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1624438359; bh=nes3S8BfN1230rp216rZygKoNvsiHsA+jh/j58d2WbY=; h=From:To:Subject:Date; b=VI4g2T0OjnP9B7q0x9AoPvcjsnWeg3cY/+f7XJm/mH/GKjfIlpBXhMncJlMO84Uj9 PDN5fq8LfDj7WeuMRWCKHFjurEycM5uNEqIE8YseRUUO7KnKCHxZEVrXQXvRGWwyME /md//JnMvnXaYUr5WIXZsuPQypnl8iTm4wAsvWS8= Message-Id: <4598abb91f7f610e062f34931fe988d04b5d43c1.1624438202.git.public@yoctocell.xyz> Date: Wed, 23 Jun 2021 10:52:38 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 29 X-Spam_score: 2.9 X-Spam_bar: ++ X-Spam_report: (2.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.5, FROM_SUSPICIOUS_NTLD_FP=1.489, PDS_OTHER_BAD_TLD=1.999, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-dose3)[arguments]<#:phases>: Add phase to patch tests script. --- The test script was failing to run without this, which also caused emacs-tuareg to not build. No idea why one would use Python to test OCaml code... gnu/packages/ocaml.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) base-commit: 4605ea1a780ff5889b7273d27a255294d7a08327 diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index dd30f4cc97..1262c0e303 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -647,7 +647,14 @@ underlying solvers like Cplex, Gurobi, Lpsolver, Glpk, CbC, SCIP or WBO.") #:make-flags (list (string-append "LIBDIR=" (assoc-ref %outputs "out") - "/lib/ocaml/site-lib")))) + "/lib/ocaml/site-lib")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-test-script + (lambda _ + (substitute* "applications/dose-tests.py" + (("warning\\(") + "from warnings import warn\nwarn("))))))) (propagated-inputs `(("ocaml-graph" ,ocaml-graph) ("ocaml-cudf" ,ocaml-cudf)