GNU logs - #78858, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#78858] [PATCH] gnu: curl: Rework tests.
Resent-From: Tomas Volf <~@wolfsden.cz>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 21 Jun 2025 22:47:02 +0000
Resent-Message-ID: <handler.78858.B.17505459833087 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 78858 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
From: Tomas Volf <~@wolfsden.cz>
Date: Sun, 22 Jun 2025 00:45:02 +0200
Message-ID: <9da01ca7c05dfde59aa9625cffd2811211bce262.1750545902.git.~@wolfsden.cz>
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-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

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Tomas Volf <~@wolfsden.cz>
Subject: bug#78858: Acknowledgement ([PATCH] gnu: curl: Rework tests.)
Message-ID: <handler.78858.B.17505459833087.ack <at> debbugs.gnu.org>
References: <9da01ca7c05dfde59aa9625cffd2811211bce262.1750545902.git.~@wolfsden.cz>
X-Gnu-PR-Message: ack 78858
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 78858 <at> debbugs.gnu.org
Date: Sat, 21 Jun 2025 22:47:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 78858 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
78858: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78858
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, andreas@HIDDEN, janneke@HIDDEN, ludo@HIDDEN, z572@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#78858] [PATCH] gnu: curl: Rework tests.
Resent-From: Simon Tournier <zimon.toutoune@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, andreas@HIDDEN, janneke@HIDDEN, ludo@HIDDEN, z572@HIDDEN, guix-patches@HIDDEN
Resent-Date: Fri, 22 Aug 2025 13:49:02 +0000
Resent-Message-ID: <handler.78858.B78858.175587053318795 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Tomas Volf <~@wolfsden.cz>, 78858 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>, guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, andreas@HIDDEN, janneke@HIDDEN, ludo@HIDDEN, z572@HIDDEN
From: Simon Tournier <zimon.toutoune@HIDDEN>
In-Reply-To: <9da01ca7c05dfde59aa9625cffd2811211bce262.1750545902.git.~@wolfsden.cz>
References: <9da01ca7c05dfde59aa9625cffd2811211bce262.1750545902.git.~@wolfsden.cz>
Date: Fri, 22 Aug 2025 14:00:09 +0200
Message-ID: <87plcny3au.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

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

Last modified: Fri, 22 Aug 2025 14:00:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.