From patchwork Sat Jun 21 22:45:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 43217 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 8F4DC27BC4B; Sat, 21 Jun 2025 23:47:22 +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=-5.6 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 E8C6327BC49 for ; Sat, 21 Jun 2025 23:47:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uT6zM-0006fA-N1; Sat, 21 Jun 2025 18:47:08 -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 1uT6zH-0006eh-Aq for guix-patches@gnu.org; Sat, 21 Jun 2025 18:47:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uT6zG-0007BX-Ul for guix-patches@gnu.org; Sat, 21 Jun 2025 18:47:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=irltRgPpxjVNxMurQBnWBGdCLpluHmOe0GKSSRhxM7g=; b=hmMYuD/vfrm04+Ul/UU5L+M1rkxDtgsuT3EzJqi4hY6jHuszWogWxWninWL0vyROVmrWl2wjgBpW51TWfDWg9WzT7KopKO0XEyZCy1aYivh81oUy0FkuV7gD8x2fRfOdIUFr54d79jhtcCriWICfPtVtyZlKcLm5eyWVN6qiPP6Zppx9E9JoYj/s4epW2wVIv9scvwTaWISziKzeps/ysoGvE6UZRY5q6CG48iWX/nevELVctdZxxd2qBxTnPl9ZFJUKvVPt3pZQVvGx/aRk+S8HHsDmYvJnfYU8kaXg6qt9Kbc2gT+p+U7tsBAi9LEvf25Oc9ZvgMHyM6FPj2i11Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uT6zG-0000sm-El for guix-patches@gnu.org; Sat, 21 Jun 2025 18:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78858] [PATCH] gnu: curl: Rework tests. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Jun 2025 22:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78858 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78858@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17505459833087 (code B ref -1); Sat, 21 Jun 2025 22:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jun 2025 22:46:23 +0000 Received: from localhost ([127.0.0.1]:44167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uT6yb-0000ni-PP for submit@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@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@gnu.org; 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@gnu.org; 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= 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> 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 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-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/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(-) -- 2.49.0 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 - ;; . - (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