summary refs log tree commit diff
diff options
context:
space:
mode:
authorLiliana Marie Prikler <liliana.prikler@gmail.com>2022-07-02 11:07:34 +0200
committerLiliana Marie Prikler <liliana.prikler@gmail.com>2022-07-02 11:13:41 +0200
commitaeb8c4fbea8197f5c568efab800a45aba53d4dd6 (patch)
treefcaefd872884f0f21df874f6662c14547fea2246
parent2533e7f8d151f16cfbc23afa0f262dc7e096ccdf (diff)
downloadguix-aeb8c4fbea8197f5c568efab800a45aba53d4dd6.tar.gz
gnu: curl: Skip failing test on x86-32.
* gnu/packages/curl.scm (curl-7.84.0)[arguments]<#:phases>: When running on
x86-32, add a phase to skip test 3026 “curl_global_init thread-safety”.
-rw-r--r--gnu/packages/curl.scm18
1 files changed, 17 insertions, 1 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index e1aa0bd086..ebc36eead2 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -33,6 +33,7 @@
 (define-module (gnu packages curl)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix utils)
@@ -152,7 +153,22 @@ tunneling, and so on.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1f2xgj0wvys9xw50h7vcbaraavjr9rxx9n06x2xfbgs7ym1qn49d"))))))
+                "1f2xgj0wvys9xw50h7vcbaraavjr9rxx9n06x2xfbgs7ym1qn49d"))))
+    (arguments (substitute-keyword-arguments (package-arguments curl)
+                 ((#:phases phases)
+                  (cond
+                   ((target-x86-32?)
+                    #~(modify-phases #$phases
+                        (add-after 'unpack 'skip-failing-tests
+                          (lambda _
+                            (with-output-to-port
+                                (open-file "tests/data/DISABLED" "a")
+                              (lambda ()
+                                (display "# curl_global_init thread-safety")
+                                (newline)
+                                (display 3026)
+                                (newline)))))))
+                   (else phases)))))))
 
 (define-public curl-minimal
   (deprecated-package "curl-minimal" curl))