Received: (at 78858) by debbugs.gnu.org; 22 Aug 2025 13:48:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Aug 22 09:48:53 2025
Received: from localhost ([127.0.0.1]:35748 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1upS8T-0004sz-1T
for submit <at> debbugs.gnu.org; Fri, 22 Aug 2025 09:48:53 -0400
Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:51507)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>)
id 1upS7p-0004pJ-2a
for 78858 <at> debbugs.gnu.org; Fri, 22 Aug 2025 09:48:14 -0400
Received: by mail-wm1-x334.google.com with SMTP id
5b1f17b1804b1-45a1b0c52f3so13090445e9.3
for <78858 <at> debbugs.gnu.org>; Fri, 22 Aug 2025 06:48:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1755870487; x=1756475287; darn=debbugs.gnu.org;
h=mime-version:message-id:date:references:in-reply-to:subject:cc:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=e8UKCFrmsdwrv/6n4L+xcrLZcz020k84efQjuaMQisQ=;
b=EWrcl3w+xOZb3C/uuGXxU1JRQd4y1Pf7btMjomGcAvs+53mpZJmzv5S0KtBlgWNhfy
bDykB9eegiGYpRW89kCxVYqd6v+VdWLBFAE7yUQeq4Isvaan1NuHiX4noyH64IBPT7rn
j+8B6yW3y/aHHa/L3fSOzwZyK6OKGBzNYfKzSBMlD5N9Qr7sP2Hw4iQSXr7v0uodwaR5
zsaaGh2SzMDXiuz5yCUhrER9ut1c/qPTit4alC2rC61pE6sxD/8G8nGVhy+gQD87zyFw
kqVxXPm4NtvCTqOn1mSHaFEXsvQeYSQIQk0zW2U/cqcknRgTvD2ouaHkwq3XWXcZLOVN
ClSg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1755870487; x=1756475287;
h=mime-version:message-id:date:references:in-reply-to:subject:cc:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=e8UKCFrmsdwrv/6n4L+xcrLZcz020k84efQjuaMQisQ=;
b=mTXag8DtS7nkSs/AOxPeu8GFwJM7oKKRy7YatlP6NAPilxR/hAr+e5nbkj588I1GmD
yXzOqbaiK9hGSVrbQundlsJ/2nS9FenIbPNnnhHdCJoq1QYg9SkS6OcERWGlbbkPCD8o
hgygvwj9tEzTCLRDq+0lVvFzq0v2RXE7LuEUL4Sv7duLKpdJ8fvDgFfoL8Jm0aLL3VdZ
LmzvntKGSF6Sn+8BHTWekdqehF9afUER2DUXkP+NZxhU6hYLyG514Ef88VtMZHbwBtRM
/rCKVMe4g7tmP+5CsOaQhEuX6NsOax3gYS7NlQekJJ32G5Pqf0HYxzk5Er4QkJasrh8s
ZILA==
X-Forwarded-Encrypted: i=1;
AJvYcCUNGC3OqfoFgYVleF7gLliYGjrvTFgM4aED9GBb0Ou0M+axRWcM4zG6fCWohJQNm1r6zBP6IQ==@debbugs.gnu.org
X-Gm-Message-State: AOJu0Yz2HjZaAwdFkaa/GluPsDrmos0xoWHIhQetaxRxaOXN7rw3oSAJ
i1tz1XkkBcOiX9JFvn5THK+EwUE8mvJA6j2pMWkZH+74LDSjpfgM9t8UkYEhFw==
X-Gm-Gg: ASbGncvOH17mnFbt23STbdZjqYVaOkUD1ajU7F0CmrSsskCx4489IAFUaesNoM7cZOa
37ubTU85pfZ760z7UQKq/Sy+IP/UpD/x2S4Fa2eAmm0f0/QHZiWjzmCSKFoN9dGQ2HRecn6avFw
atF9rvwHgCIgEKKfJScOvj/CwEjE8M4SNI4NJ1B/kBVLgVVm24UzjhvEv8jcHbir2r0dd858CgX
HMVWK7RJUkeey7E4pfGxg79wJU6eScVhOAuK122BQpyu7QTAbfkyXvLCF4E5aIOfhDh2Apdq5rf
V3R8yJOBit75k5cMJNU9CaytVGMiz75ZK3IAxXkDawbCcHTeMkbCnwFSJVGoKQJRTNnmv3unG7z
BSDvaSV0S3jCU0O+pOByS39BaDrvf+ycH2wqAtqZgAkwoGczaX+tCGwLm+Uo=
X-Google-Smtp-Source: AGHT+IGV3G7fgNuWhKzNMBlsutSKkhROnQzEq4QU1/IZL72pU+aGNI7Oy+e7l/MfS9JikDalOHIrXw==
X-Received: by 2002:a05:600c:5249:b0:450:d4a6:799e with SMTP id
5b1f17b1804b1-45b517ca685mr22666305e9.20.1755870486608;
Fri, 22 Aug 2025 06:48:06 -0700 (PDT)
Received: from lili (nat-dsi-209.net.univ-paris-diderot.fr. [81.194.30.209])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-45b57455986sm13445e9.18.2025.08.22.06.48.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 22 Aug 2025 06:48:06 -0700 (PDT)
From: Simon Tournier <zimon.toutoune@HIDDEN>
To: Tomas Volf <~@wolfsden.cz>, 78858 <at> debbugs.gnu.org
Subject: Re: [bug#78858] [PATCH] gnu: curl: Rework tests.
In-Reply-To: <9da01ca7c05dfde59aa9625cffd2811211bce262.1750545902.git.~@wolfsden.cz>
References: <9da01ca7c05dfde59aa9625cffd2811211bce262.1750545902.git.~@wolfsden.cz>
X-Debbugs-Cc: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN,
othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, andreas@HIDDEN,
janneke@HIDDEN, ludo@HIDDEN, z572@HIDDEN
Date: Fri, 22 Aug 2025 14:00:09 +0200
Message-ID: <87plcny3au.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 78858
Cc: Tomas Volf <~@wolfsden.cz>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
This patch target the core-packages team or maybe the core team.
On Sun, 22 Jun 2025 at 00:45, Tomas Volf <~@wolfsden.cz> wrote:
> * gnu/packages/curl.scm (curl)[arguments]<#:phases>{'check}: Do not replace.
> {'patch-runtests}: New phase.
> {'skip-tests}: Always add, do work conditionally based on the system.
>
> Change-Id: I78e2bf40cbb29f45568b62c5e63bc7ceea5e13ef
> ---
> Simplify the tests, there is no need to replace the 'check phase. This should
> go to core-updates due to number of packages that depend on curl.
>
> gnu/packages/curl.scm | 65 +++++++++++++++----------------------------
> 1 file changed, 22 insertions(+), 43 deletions(-)
A very quick look to this patch, LGTM.
Cheers,
simon
guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, andreas@HIDDEN, janneke@HIDDEN, ludo@HIDDEN, z572@HIDDEN, guix-patches@HIDDEN:bug#78858; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 21 Jun 2025 22:46:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jun 21 18:46:23 2025
Received: from localhost ([127.0.0.1]:44167 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uT6yb-0000ni-PP
for submit <at> debbugs.gnu.org; Sat, 21 Jun 2025 18:46:22 -0400
Received: from lists.gnu.org ([2001:470:142::17]:51664)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1uT6yW-0000lg-BH
for submit <at> debbugs.gnu.org; Sat, 21 Jun 2025 18:46:19 -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 <~@wolfsden.cz>) id 1uT6yP-0006bm-0I
for guix-patches@HIDDEN; Sat, 21 Jun 2025 18:46:09 -0400
Received: from wolfsden.cz ([37.205.8.62])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1uT6yJ-00079E-Pd
for guix-patches@HIDDEN; Sat, 21 Jun 2025 18:46:08 -0400
Received: by wolfsden.cz (Postfix, from userid 104)
id 32CDC26B078; Sat, 21 Jun 2025 22:45:59 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail;
t=1750545959; bh=sD7wXfK4h8DYeSF25NhAp3qUjNCIg1F5Ws8rvJXbH/w=;
h=From:To:Cc:Subject:Date;
b=VPxYKqKZ/0YmmRnA/dhkEPfqD7vLpt53/9VkNHXGIt/jo6Juy9dh51/zS8lbEehTG
XscmmLaxROEw2IsmYXF1HNvZJHZ+80xY2VRQu3AaSJIl0aZ4XE2KNIeUMc2KrxpuOR
YdkjxYnAEFfH3abMyjnDZzoRuXBR01jV16kVrNAkEBR9mHonnlV+FoN9gUorV1RH+p
1DonkNV/Lm4ENVPy1ecfISCNEPMXc8IRgpFmXcB6dqpyYustNjsOzbpAgUD4287qOu
vIxJgSo8X/99w9XFthIIiUp7k65b+GNqBMiD+JEAWma0yl9TdzHcm5Gu4SwYAqQLMU
7h8dK26cBtCiqyOKVfr9Zj2cuIL7GdU0fNgLMYsL6h9CrKRPbx2Lx6gN3zkDbGjZfd
lcqtDYvjLq/41mnK1iyuaDxA6kBTxe/qpXCt0/l24P/l9Sndi09WmVYgo7Haxa+pu6
OjgimCwbRRw/F4Tqz9rHpAmDLYscIdqIFIbbGkrxUnsUQuriFC6Zd+8E9s5q4Tqqge
3sppvZ4SjmAGG9yVRL1GCzO9it3vg7+Es9zRxtv1kDnXD7HohswXQc/qI//LjENN0i
Bv6vZvjKDvHvPnFFwJxu5ZNXN5RlJ9lmaKy4uORp9SfQa6l+zf0SOpLsmNFxxhw1SL
8079yyKTnPXAxBuYNIYy29lg=
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden
X-Spam-Level:
X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF autolearn=ham
autolearn_force=no version=3.4.6
Received: from localhost (unknown [128.0.188.242])
by wolfsden.cz (Postfix) with ESMTPSA id 5648526BB52;
Sat, 21 Jun 2025 22:45:58 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail;
t=1750545958; bh=sD7wXfK4h8DYeSF25NhAp3qUjNCIg1F5Ws8rvJXbH/w=;
h=From:To:Cc:Subject:Date;
b=gPU6YLPDBe/u2wSg2+51OorsjjzdyVOn0Ev/yd4BLKWYs5KUlk8+Q06T8G4dGn1RO
C4yANP53I3FMyLzLOqNBUxcVJRHHvUyrkMZYolY8liOHxh/lMLlHHHDRGhLLMsnOBW
6xZfDbcDNFmcwDYJBf6AeJ2BD2oDUvukKsovqYRfAfVBY+WG5yQRUcez8p6Lqdh+1/
NlwbRONkKV5HdW309qQ0PA6gyS+WYe0qTE10COKhwtqmDTqt7HquGMQGaKyRo4PDN0
pPcTPeLxcXTkVeVSJpQs47feHolKH/SGTY8M640/T84HGVhbyWTwSFSogBWUhKs1Dw
QPJtxE3RiHEZnu/yIBxu0L2Ug4MMhMd4j7cbDMNWa8yXtJxJaywSukWne1yf9a+D7p
HdPp9SV5yRvM4r7pdB7+euZai2rauuM8KPQ8d7ZDN0r/px4KLM/eecT/s0oTlwSuKQ
kc4fdQWMZ1QzrKXbaqlaZoVPN+E27uzbTICMycSvBusy16DxCDlpDMim632AEVnfyZ
+pSZkzCZvKQQzTRwMGGmbyjbcFVY84+px5gYDA6YiUjYZEZnOr2EAmS4AaWTAmeqXs
AyGJ0XwMdkFRN8bP44/eZKTSA6gn11l2xe7RAngICkuMA9IqpQJ2poW5zax2TsL+kY
oPLU42zmwCRlbO8Oa/iUAjkU=
From: Tomas Volf <~@wolfsden.cz>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: curl: Rework tests.
Date: Sun, 22 Jun 2025 00:45:02 +0200
Message-ID: <9da01ca7c05dfde59aa9625cffd2811211bce262.1750545902.git.~@wolfsden.cz>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz;
helo=wolfsden.cz
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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
Cc: Tomas Volf <~@wolfsden.cz>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
* gnu/packages/curl.scm (curl)[arguments]<#:phases>{'check}: Do not replace.
{'patch-runtests}: New phase.
{'skip-tests}: Always add, do work conditionally based on the system.
Change-Id: I78e2bf40cbb29f45568b62c5e63bc7ceea5e13ef
---
Simplify the tests, there is no need to replace the 'check phase. This should
go to core-updates due to number of packages that depend on curl.
gnu/packages/curl.scm | 65 +++++++++++++++----------------------------
1 file changed, 22 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 3e9cd517a2..d9d6bde891 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -106,50 +106,29 @@ (define-public curl
(mkdir-p (string-append #$output:doc "/share/man"))
(rename-file (string-append #$output "/share/man/man3")
(string-append #$output:doc "/share/man/man3"))))
- (replace 'check
- (lambda* (#:key tests? parallel-tests? make-flags #:allow-other-keys)
+ (add-after 'unpack 'patch-runtests
+ (lambda _
(substitute* "tests/runtests.pl"
- (("/bin/sh") (which "sh")))
- (when tests?
- (let* ((job-count (string-append
- "-j"
- (if parallel-tests?
- (number->string (parallel-job-count))
- "1")))
- ;; Ignore test 1477 due to a missing file in the 8.5.0
- ;; release. See
- ;; <https://github.com/curl/curl/issues/12462>.
- (arguments `("-C" "tests" "test"
- ,@make-flags
- ,(if #$(or (system-hurd?)
- (target-arm32?)
- (target-aarch64?))
- ;; protocol FAIL
- (string-append "TFLAGS=~1474 "
- "!1477 "
- job-count)
- (string-append "TFLAGS=\"~1477 "
- job-count "\"")))))
- ;; The top-level "make check" does "make -C tests quiet-test", which
- ;; is too quiet. Use the "test" target instead, which is more
- ;; verbose.
- (apply invoke "make" arguments)))))
- #$@(if (system-hurd?)
- #~((add-after 'unpack 'skip-tests
- (lambda _
- (let ((port (open-file "tests/data/DISABLED" "a")))
- (display "526\n" port)
- (display "527\n" port)
- (display "532\n" port)
- (display "533\n" port)
- (display "537\n" port)
- (display "546\n" port)
- (display "564\n" port)
- (display "575\n" port)
- (display "1021\n" port)
- (display "1501\n" port)
- (close port)))))
- #~()))))
+ (("/bin/sh") (which "sh")))))
+ (add-after 'unpack 'skip-tests
+ (lambda _
+ (let ((port (open-file "tests/data/DISABLED" "a")))
+ (when #$(or (system-hurd?)
+ (target-arm32?)
+ (target-aarch64?))
+ (display "1474\n" port))
+ (when #$(system-hurd?)
+ (display "526\n" port)
+ (display "527\n" port)
+ (display "532\n" port)
+ (display "533\n" port)
+ (display "537\n" port)
+ (display "546\n" port)
+ (display "564\n" port)
+ (display "575\n" port)
+ (display "1021\n" port)
+ (display "1501\n" port))
+ (close port)))))))
(native-inputs
(list nghttp2 perl pkg-config python-minimal-wrapper))
(inputs
--
2.49.0
Tomas Volf <~@wolfsden.cz>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#78858; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.