gnu: OpenEXR: Disable failing test on 32-bit systems.

* gnu/packages/graphics.scm (openexr)[arguments]: Patch out one more test.
While at it, simplify substitutions, and enable them on 64-bit systems.
This commit is contained in:
Marius Bakke 2019-10-19 17:52:55 +02:00
parent 9d731fb61d
commit ae5c63d73f
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -433,23 +433,31 @@ (define-public openexr
#t)))) #t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'change-directory (add-after 'unpack 'change-directory
(lambda _ (lambda _
(chdir "OpenEXR") (chdir "OpenEXR")
#t)) #t))
(add-after 'change-directory 'disable-broken-test (add-before 'check 'increase-test-timeout
;; This test fails on i686. Upstream developers suggest that
;; this test is broken on i686 and can be safely disabled:
;; https://github.com/openexr/openexr/issues/67#issuecomment-21169748
(lambda _ (lambda _
(substitute* "IlmImfTest/main.cpp" ;; On armhf-linux, we need to override the CTest default
(("#include \"testOptimizedInterleavePatterns.h\"") ;; timeout of 1500 seconds for the OpenEXR.IlmImf test.
"//#include \"testOptimizedInterleavePatterns.h\"") (setenv "CTEST_TEST_TIMEOUT" "2000")
(("TEST \\(testOptimizedInterleavePatterns") #t))
"//TEST (testOptimizedInterleavePatterns")) ,@(if (not (target-64bit?))
#t))))) `((add-after 'change-directory 'disable-broken-test
;; This test fails on i686. Upstream developers suggest that
;; this test is broken on i686 and can be safely disabled:
;; https://github.com/openexr/openexr/issues/67#issuecomment-21169748
(lambda _
(substitute* "IlmImfTest/main.cpp"
((".*testOptimizedInterleavePatterns.*") "")
;; This test is broken in 2.4.0 and will be fixed in a later
;; release: <https://github.com/openexr/openexr/issues/571>.
((".*testLargeDataWindowOffsets.*") ""))
#t)))
'()))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(propagated-inputs (propagated-inputs