From patchwork Wed Oct 27 04:51:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 34084 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 262DF27BBE6; Wed, 27 Oct 2021 05:54:35 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 6557127BBE1 for ; Wed, 27 Oct 2021 05:54:34 +0100 (BST) Received: from localhost ([::1]:37964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaxN-0002Wn-Fc for patchwork@mira.cbaines.net; Wed, 27 Oct 2021 00:54:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfawu-0001uG-Di for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36614) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfawu-0003oC-4p for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfawu-00058p-3f for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 05/13] gnu: lsof: Disable the LTlock test. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531039419509 (code B ref 51428); Wed, 27 Oct 2021 04:54:04 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:14 +0000 Received: from localhost ([127.0.0.1]:48116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw6-00054P-2d for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:14 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:36359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw1-000536-VN for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:10 -0400 Received: by mail-qk1-f172.google.com with SMTP id i9so843718qki.3 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5i+ADNHXGzUaBr2zeUzoNlc3N1/RYBzUKFfqMjK1ojM=; b=UtBXdDcz7eulf+dOCmCUGEcbvt5TiHYlUDRS80jjMhfmEy7KWTYFZXcbVKQm9JjMxU 18xAFm6qP5EucsTgZrHng8UfY2m5BHWkAEanl+lzwiXtQMl75QNOxmzITxzGxaFSFlgP /bCMwzIMbjZp9mU8RQhX70eYrHvpd6lT5i+u+KfA6OFcGPTHTgDEn1Bn+tkyYZvdR31n M8AewOV5kGiEdfO3kXnH28u/9qUvVnWc33kUNbHIL4JBcGYbW7nyJPNqjubkLtA0no9D f/vDYeIfLqcbrH7PhxZ3cKoIL4XsTVzH1rO6ch4t0LQ5oPzVP9lYECYqIpJAsmA3gGoe fjYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5i+ADNHXGzUaBr2zeUzoNlc3N1/RYBzUKFfqMjK1ojM=; b=tKXXrPe2L+Qklk0I7V63YP69hVllzMaYk+SrZpt+UeGUqTSvmVXmWdqapOvArMsMuV Sj9vfZTsR7NGRw/HVvrX0kjVV7XqmIClcYCbbUYFrd9d7a3fc4VwEP4SazNoz6iOYWBu iyCMisPvIq039zI0pzjjE1kfEglR7rFUVqD7oDXsicuw+GBNrZ6+FTMDFzpezXUvRsS3 UaaFn7Tp53Jszc8DWuPnOTg/qvsfZz7OYrBW7YHV8AQVXBMyocFCJvNCkbteKnMOucsq rUDrSImeHChJc8DCFvFRiXAprA2jpHm5DUjPqERd4MljdD87cYrtU2ydsK7FnXOL7GUN mNzw== X-Gm-Message-State: AOAM532NMoibKJ4WvAeQwIsvNmjS1W9Opv278HKD/yIM9ie6NgBU1cQ/ VvbCrWZB6u3zKnkZtZLHIwL2pn813b8= X-Google-Smtp-Source: ABdhPJy2rbjJw+YMuL9+PgjQKzdZS1k71l3iuCsAWN/dn2l7pxxNgsQ3EPqOR7aV/ROmAQKE7mgxjw== X-Received: by 2002:a05:620a:28d5:: with SMTP id l21mr22477448qkp.98.1635310384301; Tue, 26 Oct 2021 21:53:04 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:03 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:36 -0400 Message-Id: <20211027045151.9889-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@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" X-getmail-retrieved-from-mailbox: Patches Fixes . * gnu/packages/lsof.scm (lsof)[phases]: Remove trailing #t. {disable-failing-tests}: Disable the LTlock test. --- gnu/packages/lsof.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index b317902ee7..7ded6ee726 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ludovic Courtès +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,26 +62,25 @@ (define-public lsof (string-append "GNU/" (utsname:sysname (uname)) " (GNU Guix)")) - (invoke "./Configure" "linux") - #t)) + (invoke "./Configure" "linux"))) (add-after 'configure 'patch-timestamps (lambda _ (substitute* "Makefile" - (("`date`") "`date --date=@1`")) - #t)) + (("`date`") "`date --date=@1`")))) (add-after 'build 'build-man-page (lambda _ (with-output-to-file "lsof.8" - (lambda _ (invoke "soelim" "Lsof.8"))) - #t)) + (lambda _ (invoke "soelim" "Lsof.8"))))) (add-before 'check 'disable-failing-tests (lambda _ (substitute* "tests/Makefile" ;; Fails with ‘ERROR!!! client gethostbyaddr() failure’. (("(STDTST=.*) LTsock" _ prefix) prefix) - ;; Fails without access to a remote NFS server. - (("(OPTTST=.*) LTnfs" _ prefix) prefix)) - #t)) + ;; LTnfs fails without access to a remote NFS server, and LTlock + ;; fails when run on a Btrfs file system (see: + ;; https://github.com/lsof-org/lsof/issues/152). + (("OPTTST=[[:space:]]*LTbigf LTdnlc LTlock LTnfs") + "OPTTST = LTbigf LTdnlc")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -90,14 +90,12 @@ (define-public lsof (invoke "./Add2TestDB") ;; The ‘standard’ tests suggest running ‘optional’ ones as well. - (invoke "make" "standard" "optional"))) - #t)) + (invoke "make" "standard" "optional"))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (install-file "lsof" (string-append out "/bin")) - (install-file "lsof.8" (string-append out "/share/man/man8"))) - #t))))) + (install-file "lsof.8" (string-append out "/share/man/man8")))))))) (synopsis "Display information about open files") (description "Lsof stands for LiSt Open Files, and it does just that.