From patchwork Fri Nov 19 22:47:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 34653 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 1B48127BBE3; Fri, 19 Nov 2021 22:49:04 +0000 (GMT) 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, 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 9070727BBE1 for ; Fri, 19 Nov 2021 22:49:03 +0000 (GMT) Received: from localhost ([::1]:47958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moCgo-0001Wl-LD for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 17:49:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moCfq-0007fA-Ag for guix-patches@gnu.org; Fri, 19 Nov 2021 17:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57432) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moCfq-0003OT-2l for guix-patches@gnu.org; Fri, 19 Nov 2021 17:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moCfp-0006P4-Vp for guix-patches@gnu.org; Fri, 19 Nov 2021 17:48:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51987] [PATCH] [core-updates-frozen] gnu: ledger: Remove failing test output. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Nov 2021 22:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51987 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51987@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.163736205824553 (code B ref -1); Fri, 19 Nov 2021 22:48:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2021 22:47:38 +0000 Received: from localhost ([127.0.0.1]:40745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moCfS-0006Nu-9v for submit@debbugs.gnu.org; Fri, 19 Nov 2021 17:47:38 -0500 Received: from lists.gnu.org ([209.51.188.17]:45356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moCfQ-0006Nd-HN for submit@debbugs.gnu.org; Fri, 19 Nov 2021 17:47:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moCfQ-000761-44 for guix-patches@gnu.org; Fri, 19 Nov 2021 17:47:36 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:28387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moCfF-0003IL-RD for guix-patches@gnu.org; Fri, 19 Nov 2021 17:47:35 -0500 Date: Fri, 19 Nov 2021 22:47:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637362031; bh=zLoBxYS8yrJpiX7Ef43LCBaTr8/h8QWfn/hi42b9n5I=; h=Date:To:From:Reply-To:Subject:From; b=knTjhtriXMoA3ULqRS50iLdYsr4SNipMGxuZXIr+JF3S+C8FjPY7Q7hv29xGXyfvW 0/O1CNVi+jbkuGCDWdaIzJliPkvr/yLTQ/l7yPHUrJ9NdF1QoU/uyCw1TJQMRpqopm a/MEY5buvgj/HUudYS7klRk7YJJrp3M7YTMSXfgw= Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.131; envelope-from=john.kehayias@protonmail.com; helo=mail-40131.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, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Hello, I'm not sure why, but ledger started failing one of its test on core-updates-frozen. The test is for the error when trying to use a nonexistent file (as far as I can tell) and it fails in the error message reporting the path of the file without the leading "./". Output of the test below. The patch removes this test from ledger. 359/396 Test #359: RegressTest_BF3C1F82-2 ................................***Failed 0.04 sec FAILURE in error output from /tmp/guix-build-ledger-3.2.1.drv-0/source/test/regress/BF3C1F82-2.test: --- $ledger -f - reg -- @@ -1,2 +1,2 @@ While parsing file "", line 2: -Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82" +Error: File to include was not found: "non-existent-ledger-file-BF3C1F82" E[BF3C1F82-2.test]STDERR: b'' FAILURE in error output from /tmp/guix-build-ledger-3.2.1.drv-0/source/test/regress/BF3C1F82-2.test: -- $ledger -f /dev/stdin reg -- @@ -1,2 +1,2 @@ While parsing file "", line 2: -Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82" +Error: File to include was not found: "non-existent-ledger-file-BF3C1F82" E[BF3C1F82-2.test]STDERR: b'' FAILED (2) Thanks, John From 279743a20221fb9e3454da889500515d6a2ef785 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 19 Nov 2021 17:38:51 -0500 Subject: [PATCH] gnu: ledger: Remove failing test output. Removes a test which doesn't have output matching the expected (it misses the leading "./"). * gnu/packages/finance.scm (php)[source]: Add patch. * gnu/packages/patches/ledger-remove-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/finance.scm | 4 ++- gnu/packages/patches/ledger-remove-test.patch | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ledger-remove-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index d4a6b59e34..4931103ac6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1328,6 +1328,7 @@ dist_patch_DATA = \ %D%/packages/patches/lcalc-lcommon-h.patch \ %D%/packages/patches/lcalc-using-namespace-std.patch \ %D%/packages/patches/ldns-drill-examples.patch \ + %D%/packages/patches/ledger-remove-test.patch \ %D%/packages/patches/leela-zero-gtest.patch \ %D%/packages/patches/less-hurd-path-max.patch \ %D%/packages/patches/liba52-enable-pic.patch \ diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b6c6527aa0..322462a0c5 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 ZmnSCPxj jxPCSnmZ ;;; Copyright © 2021 François J ;;; Copyright © 2021 Foo Chuan Wei +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -305,7 +306,8 @@ (define-public ledger (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6")))) + (base32 "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6")) + (patches (search-patches "ledger-remove-test.patch")))) (build-system cmake-build-system) (arguments `(#:modules (,@%cmake-build-system-modules diff --git a/gnu/packages/patches/ledger-remove-test.patch b/gnu/packages/patches/ledger-remove-test.patch new file mode 100644 index 0000000000..636784c3ac --- /dev/null +++ b/gnu/packages/patches/ledger-remove-test.patch @@ -0,0 +1,28 @@ +This test started failing on core-updates-frozen sometime after this commit: + +https://git.savannah.gnu.org/cgit/guix.git/log/?id=727f05e1e285aa52f5a19ec923fdc2259859b4b1 + +It reports the wrong error message, with a lack of a leading "./" in the file name. So it +passes in that it correctly errors on the missing file, but has the wrong output. This +patch removes the test file to ignore the test. + +diff --git a/test/regress/BF3C1F82-2.test b/test/regress/BF3C1F82-2.test +deleted file mode 100644 +index a7808504..00000000 +--- a/test/regress/BF3C1F82-2.test ++++ /dev/null +@@ -1,14 +0,0 @@ +-; Check that include directives are relative for "-f /dev/stdin" +-include non-existent-ledger-file-BF3C1F82 +- +-test -f - reg -> 1 +-__ERROR__ +-While parsing file "", line 2: +-Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82" +-end test +- +-test -f /dev/stdin reg -> 1 +-__ERROR__ +-While parsing file "", line 2: +-Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82" +-end test -- 2.33.1