From patchwork Wed Apr 12 17:09:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 49111 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 5EE30174BC; Wed, 12 Apr 2023 18:10:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E6B90174AE for ; Wed, 12 Apr 2023 18:10:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmdz4-0007yv-Bo; Wed, 12 Apr 2023 13:10:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmdys-0007yd-Dx for guix-patches@gnu.org; Wed, 12 Apr 2023 13:10:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pmdys-0006Gm-54 for guix-patches@gnu.org; Wed, 12 Apr 2023 13:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmdys-0002I1-0N for guix-patches@gnu.org; Wed, 12 Apr 2023 13:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62796] [PATCH core-updates v2 1/2] gnu: ocaml-ppxlib: Fix tests. References: <20230412160010.3232633-1-zimon.toutoune@gmail.com> In-Reply-To: <20230412160010.3232633-1-zimon.toutoune@gmail.com> Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Apr 2023 17:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62796 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62796@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 62796-submit@debbugs.gnu.org id=B62796.16813193968768 (code B ref 62796); Wed, 12 Apr 2023 17:10:01 +0000 Received: (at 62796) by debbugs.gnu.org; 12 Apr 2023 17:09:56 +0000 Received: from localhost ([127.0.0.1]:41675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmdym-0002HM-Am for submit@debbugs.gnu.org; Wed, 12 Apr 2023 13:09:56 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:41230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmdyj-0002H2-Ky for 62796@debbugs.gnu.org; Wed, 12 Apr 2023 13:09:54 -0400 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3f080fc6994so4220725e9.1 for <62796@debbugs.gnu.org>; Wed, 12 Apr 2023 10:09:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681319388; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZkfW34ZvVBM3pDNWU3FZSDPdgjuVU/ZWeTCVzDUlO6s=; b=gVTcrE0JZTW+q2t/r82T31z3OSBJYvv1USbA4RkqGPIkesgpf3WclYFeVXm4z/YnUA Jg5D98eVdy+fQWLzCbsPReSRurvyjQTVj4V+y3l4BK894z71KY5e+ej798RXzSFsXJLr Vz3MVJFtFbSEz5pUx2oI7iME5RkOoVNfap94+7V6OIImaJmUBi/ejpwBuv5y9VijTkNl 218liLFf4M0eh+qezRY8hebrHjTtYx4Xx8Se/UiUeyLcndDfSjWPm5o2qYLZg5qYJvMV FameIESNxA3Ph5eK7yYwt7nfA49FgpPpZb7Ug7uHzoRPtSsB1RUsesEyZxaHhSbXrd5W 2vIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681319388; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZkfW34ZvVBM3pDNWU3FZSDPdgjuVU/ZWeTCVzDUlO6s=; b=UCcX+DE5Y6OXg8dmGnFfag/4m3kBb8aI9xzc0Onek3S62fFW4UAyb0EVxCXmsZqt9Q 6cS+07iZmKJ/rpSV4Gtvff4KLO37B1Zucup40Mxl737URzlGaMAqVRej+2h897T//AWn FArRV2JFTWhO64JHkC8+wNpDhJdfMTgR4nsbQsawmr/Wpn1rwCFcGgo1TpEYaendYPz/ My5lUBfXjENmh43oAMUGk7DtMOkkLLKG2DOtLHIxdQblk1uMmHjsRGZI+Mqc9nn9leDC Rh08iNL6HILkPOAFSJ6dpYr/84cozsEl/NpR7Owd5GT5LHj+HKCUc2gntQAZa/2RIU20 99ow== X-Gm-Message-State: AAQBX9dslRSWQAYJg7GOqxkmVogCLf0Di+y9JNg97Y+DBwM2vJIHuSOp tgUh6OmzPzg3OWWGFuc2uZcIU8rhAcQ= X-Google-Smtp-Source: AKy350aTxdmz4+PZHMOrxg2+DAKqfUuAPH/N66A0Qijr/44WkWiyVWSi57nf7KM0b1tC+wjq6yXLzg== X-Received: by 2002:a05:600c:1f0e:b0:3f0:7d5a:9cc1 with SMTP id bd14-20020a05600c1f0e00b003f07d5a9cc1mr2743284wmb.3.1681319387729; Wed, 12 Apr 2023 10:09:47 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id t15-20020a05600c198f00b003f0a007b802sm2024940wmq.12.2023.04.12.10.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 10:09:47 -0700 (PDT) From: Simon Tournier Date: Wed, 12 Apr 2023 19:09:39 +0200 Message-Id: <20230412170940.3333419-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppxlib)[arguments]: Substitue obsolete 'egrep' by 'grep -E'. --- gnu/packages/ocaml.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) base-commit: a3bfb867380f1e5ce157334d7d9877297ef509ab diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c6dca2874f..f1c4e35044 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6660,7 +6660,12 @@ (define-public ocaml-ppxlib (substitute* "test/ppx_import_support/test.ml" (("\\(Failure") "Failure") ((" \"(Some ppx-es.*)\")" _ m) - (string-append " \"" m "\".")))))))) + (string-append " \"" m "\"."))))) + (add-after 'fix-test-format 'fix-egrep + (lambda _ + ;; egrep is obsolescent; using grep -E + (substitute* "test/expansion_context/run.t" + (("egrep") "grep -E"))))))) (propagated-inputs (list ocaml-compiler-libs ocaml-ppx-derivers From patchwork Wed Apr 12 17:09:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 49110 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 D8D84174E8; Wed, 12 Apr 2023 18:10:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 51A3F17494 for ; Wed, 12 Apr 2023 18:10:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmdzA-000804-Lo; Wed, 12 Apr 2023 13:10:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmdz5-0007zG-HF for guix-patches@gnu.org; Wed, 12 Apr 2023 13:10:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pmdys-0006H6-TR for guix-patches@gnu.org; Wed, 12 Apr 2023 13:10:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmdys-0002IG-Ox for guix-patches@gnu.org; Wed, 12 Apr 2023 13:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62796] [PATCH core-updates v2 2/2] gnu: ocaml-mdx: Fix tests. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Apr 2023 17:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62796 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62796@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 62796-submit@debbugs.gnu.org id=B62796.16813193998787 (code B ref 62796); Wed, 12 Apr 2023 17:10:02 +0000 Received: (at 62796) by debbugs.gnu.org; 12 Apr 2023 17:09:59 +0000 Received: from localhost ([127.0.0.1]:41678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmdyo-0002Ha-Ky for submit@debbugs.gnu.org; Wed, 12 Apr 2023 13:09:58 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:38202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmdyk-0002H5-4q for 62796@debbugs.gnu.org; Wed, 12 Apr 2023 13:09:57 -0400 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-2f4b604e234so44411f8f.1 for <62796@debbugs.gnu.org>; Wed, 12 Apr 2023 10:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681319388; x=1683911388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zjUXCtKeA6QBFE+CqOVNUktFBT9dc9YiGw7dU0nHkiY=; b=IlHoWvVBhnHBJIR7mL+yu8yCl+74+UmqnLv159uePo4LvfAwEe+j8gnJzX5nPiF6Bs BK2WCv6aM1TLDbkQl+bUcSDJpxGXx7qc/m4BF6STtlsL/0CiwEsRccqj87RuOUZj2dQd qV1GCAtgglEZbeQ29S0OE7n692Bi7HWcCloRs6po+LQTAXX+sFFZDGaWMLSdTgghcGlX apbTlVq9FykAi9vWRpARFgYNTlSu4YMudnV3HSNVxKMGMeYhcipRYPg4sxRdmwqzUbvA 3CdNJpUleQ/H6OAVtcaLir/WsVzQFaHANq9+wMOkZouX0Isx8qm6Nz+5ey/COrgQOq3s 8Xsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681319388; x=1683911388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zjUXCtKeA6QBFE+CqOVNUktFBT9dc9YiGw7dU0nHkiY=; b=SwHweOdJHRl78GttHgcKV175aYl3vTcodk021jyQk4j0ZkIBtfAlgABmHQg/UZAY9M qzVwaXGNy9fL8CLsciz6KduD6fICx+QMqYqngt2zg3r//+FpZHh/0hbrQfFS77G4rG9P UcsJADCa3Oi7uoK05MgyClDEPuTn2g0D7h4hAy3MDoRaPeGnLei7cuoKRgELBaohNHSH Oz2XgmyIOexGuKCAvmTJqBdCLGBu2rvsZEloYVXHdq60RPyPB/P+mqNdGsACIsLcDTHA VEapV6ZHhgpOii8MpAXFEeB5Jag3yPn3QiI4sY1tyarbHk+xw3SrOseqH4Hv4XGRncKR HRXA== X-Gm-Message-State: AAQBX9ccVavLjWMpYR4dWpmVwc6PSSD1N3CaBKanu8pc5jHnQ/y4y2rT jDpvwNKrXmifisnWn+S02op5slrw+IE= X-Google-Smtp-Source: AKy350bXcGFma8/ZVwdv1ylpoJqiNm2BVicL7WtItSZj7Uthu6xSTQknGWfY48BtV619jkAzxP0jXg== X-Received: by 2002:a05:600c:3109:b0:3ef:7795:e5b1 with SMTP id g9-20020a05600c310900b003ef7795e5b1mr12895711wmo.4.1681319388171; Wed, 12 Apr 2023 10:09:48 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id t15-20020a05600c198f00b003f0a007b802sm2024940wmq.12.2023.04.12.10.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 10:09:47 -0700 (PDT) From: Simon Tournier Date: Wed, 12 Apr 2023 19:09:40 +0200 Message-Id: <20230412170940.3333419-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230412170940.3333419-1-zimon.toutoune@gmail.com> References: <20230412170940.3333419-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-mdx)[arguments]: Substitue obsolete 'egrep' by 'grep -E'. --- gnu/packages/ocaml.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f1c4e35044..b462d315e1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -9230,7 +9230,12 @@ (define-public ocaml-mdx "test/bin/mdx-test/misc/no-such-prelude/test.expected") (("`") "'") (("COMMAND") "[COMMAND]") - (("\\.\\.\\.") "…"))))))) + (("\\.\\.\\.") "…")))) + (add-after 'fix-test-format 'fix-egrep + (lambda _ + ;; egrep is obsolescent; using grep -E + (substitute* "test/bin/mdx-test/expect/padding/test-case.md" + (("egrep") "grep -E"))))))) (propagated-inputs (list ocaml-fmt ocaml-astring