diff options
| author | Maxim Cournoyer <[email protected]> | 2022-09-27 15:59:30 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-09-27 15:59:30 -0400 |
| commit | 990a4822f1cb45c1470fe38cbf17fd7bb54d0088 (patch) | |
| tree | 1c1ff41c9264fe5af5ee0b8723d1e367e958c051 /gnu/packages/graphics.scm | |
| parent | 91db77c955cc7ef95dd8b535e40d6b4cf28669ec (diff) | |
| parent | 3c6e220d8100281074c414a43c1efe9a01b53771 (diff) | |
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cran.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/icu4c.scm
gnu/packages/java.scm
gnu/packages/machine-learning.scm
gnu/packages/tex.scm
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 41ef0d8bfb..398c60f6ab 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1153,13 +1153,13 @@ with strong support for multi-part, multi-channel use cases.") (("/var/tmp") "/tmp")))) (add-after 'change-directory 'increase-test-timeout (lambda _ - ;; On armhf-linux, we need to override the CTest default + ;; On some architectures, we need to override the CTest default ;; timeout of 1500 seconds for the OpenEXR.IlmImf test. (substitute* "IlmImfTest/CMakeLists.txt" (("add_test\\(NAME OpenEXR\\.IlmImf.*" all) (string-append all - "set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 2000)"))) + "set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 15000)"))) #t)) ,@(if (not (target-64bit?)) `((add-after 'change-directory 'disable-broken-test |