branch master updated: gnu: check2: Fix tests on i686-linux.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

podiki pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 18393fcddd gnu: check2: Fix tests on i686-linux.
18393fcddd is described below

commit 18393fcdddf5c3d834fa89ebf5f3925fc5b166ed
Author: John Kehayias <john.kehayias@protonmail.com>
AuthorDate: Sat Jan 13 17:20:55 2024 -0500

    gnu: check2: Fix tests on i686-linux.
    
    Reported upstream to <https://github.com/catchorg/Catch2/issues/2796>.  It 
is
    expected that SSE2 is enabled for i686 builds or tests fail.
    
    * gnu/packages/check.scm (check2)[arguments]: Enable SSE2 for x86_64-linux 
and
    i686-linux in configure-flags.
    
    Co-authored-by: Richard Sent <richard@freakingpenguin.com>
    Co-authored-by: Jo Gay <@jane.lx.gay>
    Change-Id: I99205f92b66ab3d10affbfb58918f37069ba82ec
---
 gnu/packages/check.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 449340f331..b475aea8ae 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -108,6 +108,7 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix deprecation)
+  #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
 
 (define-public pict
@@ -621,7 +622,14 @@ pattern.")
     (arguments
      (list
       #:configure-flags
-      #~(list "-DCATCH_DEVELOPMENT_BUILD=ON"
+      #~(list #$@(match (%current-system)
+                   ((or "x86_64-linux" "i686-linux")
+                    ;; Tests fail on i686-linux without SSE2 for floats, see
+                    ;; upstream report
+                    ;; <https://github.com/catchorg/Catch2/issues/2796>.
+                    '("-DCMAKE_CXX_FLAGS=-msse2 -mfpmath=sse"))
+                   (_ '()))
+              "-DCATCH_DEVELOPMENT_BUILD=ON"
               "-DCATCH_ENABLE_WERROR=OFF"
               "-DBUILD_SHARED_LIBS=ON")))
     (inputs (list python-wrapper))