[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
49/63: gnu: shaderc: Enable (some) tests.
From: |
guix-commits |
Subject: |
49/63: gnu: shaderc: Enable (some) tests. |
Date: |
Tue, 26 May 2020 17:18:13 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit 18ac48364cb7e17da120b4b296aa06de5f159497
Author: Marius Bakke <address@hidden>
AuthorDate: Fri May 22 17:52:15 2020 +0200
gnu: shaderc: Enable (some) tests.
* gnu/packages/vulkan.scm (shaderc)[arguments]: Remove #:tests?. Add
substitution to use "spirv-dis" from inputs instead of bundled.
---
gnu/packages/vulkan.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index a96b33c..59dbfae 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -266,7 +266,8 @@ API.")
"1kqqvsvib01bsmfbdy3fbwwpvkcdlfb6k71kjvzb3crql7w0rxff"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; FIXME: Tests fail.
+ `(;; FIXME: Skip most of the tests, because enabling system gtest breaks
+ ;; the build: <https://github.com/google/shaderc/issues/470>.
#:configure-flags '("-DSHADERC_SKIP_TESTS=ON")
#:phases
(modify-phases %standard-phases
@@ -276,6 +277,10 @@ API.")
(("add_subdirectory\\(third_party\\)")
""))
+ (substitute* "glslc/test/CMakeLists.txt"
+ (("\\$<TARGET_FILE:spirv-dis>")
+ (which "spirv-dis")))
+
;; Do not attempt to use git to encode version information.
(substitute* "glslc/CMakeLists.txt"
(("add_dependencies\\(glslc_exe build-version\\)")
- 52/63: gnu: Mesa: Remove obsolete phase., (continued)
- 52/63: gnu: Mesa: Remove obsolete phase., guix-commits, 2020/05/26
- 30/63: gnu: json-c: Update to 0.14., guix-commits, 2020/05/26
- 54/63: gnu: vkquake: Fix build with newer Vulkan headers., guix-commits, 2020/05/26
- 56/63: gnu: libdrm: Update to 2.4.101., guix-commits, 2020/05/26
- 59/63: gnu: nheko: Update to 0.7.1., guix-commits, 2020/05/26
- 62/63: gnu: qtwebengine: Fix build failure., guix-commits, 2020/05/26
- 60/63: gnu: mutter: Fix build with Mesa 20., guix-commits, 2020/05/26
- 20/63: gnu: python-cryptography: Update to 2.9.2., guix-commits, 2020/05/26
- 27/63: gnu: python-mako: Update to 1.1.2., guix-commits, 2020/05/26
- 33/63: gnu: Qt: Update to 5.14.2., guix-commits, 2020/05/26
- 49/63: gnu: shaderc: Enable (some) tests.,
guix-commits <=
- 26/63: gnu: python-idna: Update to 2.9., guix-commits, 2020/05/26
- 28/63: gnu: NSS: Update to 3.52., guix-commits, 2020/05/26
- 32/63: gnu: KDE Frameworks: Update to 5.70., guix-commits, 2020/05/26
- 35/63: gnu: NSS: Update to 3.52.1 [fixes CVE-2020-12399]., guix-commits, 2020/05/26
- 40/63: gnu: spirv-tools: Update to 2020.2., guix-commits, 2020/05/26
- 34/63: gnu: Mesa: Fix ineffective substitution on i686-linux., guix-commits, 2020/05/26
- 42/63: gnu: glslang: Update to 8.13.3743., guix-commits, 2020/05/26
- 44/63: gnu: vulkan-headers: Update to 1.2.141., guix-commits, 2020/05/26
- 48/63: gnu: shaderc: Update to 2020.0., guix-commits, 2020/05/26
- 53/63: gnu: Mesa: Fix substitutions for absolute library references., guix-commits, 2020/05/26