From aeb8c4fbea8197f5c568efab800a45aba53d4dd6 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Jul 2022 11:07:34 +0200 Subject: gnu: curl: Skip failing test on x86-32. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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”. --- gnu/packages/curl.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu/packages/curl.scm') 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)) -- cgit 1.4.1