me/guix
Archived
1
0
Fork 0
Code Activity

gnu: plotutils: Fix tests on i686.

Browse source 
* gnu/packages/plotutils.scm (plotutils)[arguments]: On 32-bit x86, pass
CFLAGS and add 'skip-sloppy-test' phase.
This commit is contained in:
Ludovic Courtès 2021-11-24 17:05:05 +01:00
parent 75c6af85c0
commit dda78c1de7
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/plotutils.scm
View file

@ -22,6 +22,8 @@
(define-module (gnu packages plotutils) (define-module (gnu packages plotutils)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp)
#:use-module ((guix utils) #:select (target-x86-32?))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
@ -83,7 +85,27 @@
(search-patches "plotutils-spline-test.patch")))) (search-patches "plotutils-spline-test.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list "--enable-libplotter"))) (list #:configure-flags
#~(list "--enable-libplotter"
;; On i686 some tests fail due to excess floating point
;; precision; work around it. However, libplotter is C++
;; and thus unaffected by CFLAGS, but '-fexcess-precision'
;; is not implemented for C++ as of GCC 10.
#$@(if (target-x86-32?)
#~("CFLAGS=-g -O2 -fexcess-precision=standard")
#~()))
#:phases
(if (target-x86-32?)
#~(modify-phases %standard-phases
(add-before 'check 'skip-sloppy-test
(lambda _
;; This test reveals a slight difference in the SVG
;; output due to floating point inequalities. Skip it.
(substitute* "test/plot2svg.test"
(("^exit .*") "exit 77")))))
#~%standard-phases)))
(inputs `(("libpng" ,libpng) (inputs `(("libpng" ,libpng)
("libx11" ,libx11) ("libx11" ,libx11)
("libxt" ,libxt) ("libxt" ,libxt)