From patchwork Mon Jul 12 01:01:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 31335 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 19E1427BC84; Mon, 12 Jul 2021 02:02:17 +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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham 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 DE57527BC83 for ; Mon, 12 Jul 2021 02:02:15 +0100 (BST) Received: from localhost ([::1]:51024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2kKs-0006aJ-TF for patchwork@mira.cbaines.net; Sun, 11 Jul 2021 21:02:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2kKg-0006Yr-UW for guix-patches@gnu.org; Sun, 11 Jul 2021 21:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52770) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2kKg-0006IE-Lz for guix-patches@gnu.org; Sun, 11 Jul 2021 21:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2kKg-0005RL-Ho for guix-patches@gnu.org; Sun, 11 Jul 2021 21:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49517] [PATCH] gnu: txr: Build documentation and update to 265. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Jul 2021 01:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49517 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49517@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.162605171020890 (code B ref -1); Mon, 12 Jul 2021 01:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jul 2021 01:01:50 +0000 Received: from localhost ([127.0.0.1]:36083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2kKL-0005Qh-A5 for submit@debbugs.gnu.org; Sun, 11 Jul 2021 21:01:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:38526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2kKG-0005QV-H4 for submit@debbugs.gnu.org; Sun, 11 Jul 2021 21:01:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2kKG-0006YO-0K for guix-patches@gnu.org; Sun, 11 Jul 2021 21:01:36 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:35559) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2kKB-0005sD-85 for guix-patches@gnu.org; Sun, 11 Jul 2021 21:01:35 -0400 Date: Mon, 12 Jul 2021 01:01:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1626051680; bh=U8X8NqDRpdY+D22FEo/uK2cMb8SoeAdPyCd0t1RQPQU=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=Blqe+0rSo2jDAuOgoKXvG1t+tXANyc9q30Dal5/3ciUBSL1HFHPsCzVmfwV4EaMed wNWscbrYf0EjuXrFX9sJncCp/eaWghKjWgWmWSuDVKs/tF9o4haSUx87LezfQBpx8m P+Leyw1SjAhLXOXRMnvimX9cjfc/SU08EbKnu27YS2mQ4rPdK67yy3LwHBfPJt3fi5 7JBgiDsIqEfC4HuJo2TfcF8sXN/uD4ZlM20MqlCymZyeS0GJsYcBWAb7z2/hRJpety SA+IyV4x7MnYKR4nn8/xtZwLhcJomvqFmSa4ynAuvmszrvcogdvpJEvlj9NgGwOLRf PjM1d5G76zprg== From: "Paul A. Patience" Message-ID: In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.18; envelope-from=paul@apatience.com; helo=mail1.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I've managed to fix one of the failing tests and narrowed down the problem of the others. (Only the second patch is different, but I've attached both for your convenience.) Best regards, Paul From 9b9649013442b856d6b5d73e7c8a707d96399306 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sun, 11 Jul 2021 20:56:41 -0400 Subject: [PATCH 2/2] gnu: txr: Update to 265. * gnu/packages/lisp.scm (txr)[version]: Update to 265. [arguments]<#:phases>{disable-failing-tests}: New phase. --- gnu/packages/lisp.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8f3be7dafe..37908f9ed3 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -906,7 +906,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "263") + (version "265") (source (origin (method git-fetch) @@ -915,7 +915,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14zaziymnbr2ld79x4h7sf88bzzzj82w3xpavmcx7mhwannb2swh")))) + (base32 "0v39323rblhl3gr03midxkx9njzzvs0scm3kmfpw5s0n5jd6drr6")))) (build-system gnu-build-system) (native-inputs ;; Required to build the documentation. @@ -938,7 +938,7 @@ the HTML documentation of TXR.") ;; stdlib/doc-syms.tl, which is anyway kept up to date with ;; each release (and is already compiled to stdlib/doc-syms.tlo ;; when genman.txr is run). - (("^@\\(output \"share/txr/stdlib/doc-syms\\.tl\"\\).*" line) + (("^@\\(output \"stdlib/doc-syms\\.tl\"\\).*" line) (string-append "@(do (exit))\n" line))) #t)) (add-after 'unpack 'fix-tests @@ -946,6 +946,21 @@ the HTML documentation of TXR.") (substitute* (list "tests/017/realpath.tl" "tests/017/realpath.expected") (("/usr/bin") "/")) + (substitute* "tests/018/path-test.tl" + (("/bin") (dirname (which "sh")))) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + (for-each delete-file + ;; These tests fail because their calls to some + ;; external commands fail. + ;; (They pass when run manually in the directory + ;; left by --keep-failed.) + (map (lambda (f) (string-append "tests/" f)) + '("002/query-1.txr" ; Calls "ls". + "010/json.tl" ; Calls "cat". + "018/process.tl" ; Calls "echo". + ))) #t)) (replace 'configure ;; ./configure is a hand-written script that can't handle standard -- 2.32.0