[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/08: gnu: OpenEXR: Disable failing test on 32-bit systems.
From: |
guix-commits |
Subject: |
06/08: gnu: OpenEXR: Disable failing test on 32-bit systems. |
Date: |
Sat, 19 Oct 2019 18:42:02 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit ae5c63d73f98e6ccdb8905f2f69c563a53fc1ab9
Author: Marius Bakke <address@hidden>
Date: Sat Oct 19 17:52:55 2019 +0200
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.
---
gnu/packages/graphics.scm | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index e453d9f..db328bc 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -433,23 +433,31 @@ graphics.")
#t))))
(build-system cmake-build-system)
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'change-directory
(lambda _
(chdir "OpenEXR")
#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
+ (add-before 'check 'increase-test-timeout
(lambda _
- (substitute* "IlmImfTest/main.cpp"
- (("#include \"testOptimizedInterleavePatterns.h\"")
- "//#include \"testOptimizedInterleavePatterns.h\"")
- (("TEST \\(testOptimizedInterleavePatterns")
- "//TEST (testOptimizedInterleavePatterns"))
- #t)))))
+ ;; On armhf-linux, we need to override the CTest default
+ ;; timeout of 1500 seconds for the OpenEXR.IlmImf test.
+ (setenv "CTEST_TEST_TIMEOUT" "2000")
+ #t))
+ ,@(if (not (target-64bit?))
+ `((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
`(("pkg-config" ,pkg-config)))
(propagated-inputs
- branch master updated (1760c97 -> f19e571), guix-commits, 2019/10/19
- 05/08: gnu: vc: Update to 1.4.1., guix-commits, 2019/10/19
- 02/08: gnu: dav1d: Update to 0.5.0., guix-commits, 2019/10/19
- 01/08: gnu: xapian: Update to 1.4.13., guix-commits, 2019/10/19
- 04/08: gnu: Add virtest., guix-commits, 2019/10/19
- 06/08: gnu: OpenEXR: Disable failing test on 32-bit systems.,
guix-commits <=
- 03/08: gnu: libmpeg2: Fix build on armhf-linux., guix-commits, 2019/10/19
- 08/08: gnu: kodi: Increase test timeout., guix-commits, 2019/10/19
- 07/08: gnu: notmuch: Update to 0.29.2., guix-commits, 2019/10/19