01/08: gnu: curl@7.84.0: Reduce lib3026 resource use on 32-bit platforms.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 3759b71dc8b175ba02bc2f87e4f426ceed342d42
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Jul 6 18:00:13 2022 +0200

    gnu: curl@7.84.0: Reduce lib3026 resource use on 32-bit platforms.
    
    This is a followup to c145e51844bf52eb77cdc969a0fe30a48755b29e.
    
    See discussion at
    <https://lists.gnu.org/archive/html/guix-devel/2022-07/msg00011.html>.
    
    * gnu/packages/curl.scm (curl-7.84.0)[arguments]: Remove
    'skip-failing-tests' and add 'tweak-lib3026-test'.
---
 gnu/packages/curl.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 6d1cc9a572..d82d94abff 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
-;;; Copyright © 2015, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2020, 2021, 2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2017, 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
@@ -161,15 +161,13 @@ tunneling, and so on.")
                   (cond
                    ((not (target-64bit?))
                     #~(modify-phases #$phases
-                        (add-after 'unpack 'skip-failing-tests
+                        (add-after 'unpack 'tweak-lib3026-test
                           (lambda _
-                            (with-output-to-port
-                                (open-file "tests/data/DISABLED" "a")
-                              (lambda ()
-                                (display "# curl_global_init thread-safety")
-                                (newline)
-                                (display 3026)
-                                (newline)))))))
+                            ;; Have that test create a hundred threads, not a
+                            ;; thousand.
+                            (substitute* "tests/libtest/lib3026.c"
+                              (("NUM_THREADS .*$")
+                               "NUM_THREADS 100\n"))))))
                    (else phases)))))))
 
 (define-public curl-minimal