[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/21: gnu: vulkan-loader: Enable tests.
From: |
guix-commits |
Subject: |
08/21: gnu: vulkan-loader: Enable tests. |
Date: |
Fri, 22 May 2020 18:10:18 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit a8c7f8fb2a198ba173f2ff92d1456aa6c706a0ff
Author: Marius Bakke <address@hidden>
AuthorDate: Fri May 22 16:57:46 2020 +0200
gnu: vulkan-loader: Enable tests.
* gnu/packages/vulkan.scm (vulkan-loader)[arguments]: Remove #:tests? and
#:configure-flags. Add #:phases to unpack googletest and disable tests
that
cannot run in the build container.
[native-inputs]: Add (PACKAGE-SOURCE GOOGLETEST).
---
gnu/packages/vulkan.scm | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 30a8949..2239131 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -175,16 +175,29 @@ interpretation of the specifications for these
languages.")
"0rhyz0qgp0i7pcx6wlvgwy7j33d4cs0xx39f0b6igpfk0vk70r1w"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh".
- #:configure-flags (list
- "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest'
submodule.
- (string-append "-DCMAKE_INSTALL_LIBDIR="
- (assoc-ref %outputs "out") "/lib"))))
- (native-inputs `(("libxrandr" ,libxrandr)
- ("pkg-config" ,pkg-config)
- ("python" ,python)
- ("vulkan-headers" ,vulkan-headers)
- ("wayland" ,wayland)))
+ `(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'unpack-googletest
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((gtest (assoc-ref inputs "googletest:source")))
+ (when gtest
+ (copy-recursively gtest "external/googletest"))
+ #t)))
+ (add-after 'unpack 'disable-loader-tests
+ (lambda _
+ ;; Many tests require a Vulkan driver. Skip those.
+ (substitute* "tests/loader_validation_tests.cpp"
+ ((".*= vkCreateInstance.*" all)
+ (string-append "GTEST_SKIP();\n" all))
+ (("TEST_F.*InstanceExtensionEnumerated.*" all)
+ (string-append all "\nGTEST_SKIP();\n")))
+ #t)))))
+ (native-inputs
+ `(("googletest:source" ,(package-source googletest))
+ ("libxrandr" ,libxrandr)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python)
+ ("vulkan-headers" ,vulkan-headers)
+ ("wayland" ,wayland)))
(home-page
"https://github.com/KhronosGroup/Vulkan-Loader")
(synopsis "Khronos official ICD loader and validation layers for Vulkan")
- 11/21: gnu: shaderc: Enable (some) tests., (continued)
- 11/21: gnu: shaderc: Enable (some) tests., guix-commits, 2020/05/22
- 10/21: gnu: shaderc: Update to 2020.0., guix-commits, 2020/05/22
- 12/21: gnu: Mesa: Install scripts to a separate output., guix-commits, 2020/05/22
- 17/21: gnu: vkd3d: Fix build with newer Vulkan headers., guix-commits, 2020/05/22
- 18/21: gnu: libdrm: Update to 2.4.101., guix-commits, 2020/05/22
- 13/21: gnu: Mesa: Remove unused input., guix-commits, 2020/05/22
- 14/21: gnu: Mesa: Remove obsolete phase., guix-commits, 2020/05/22
- 15/21: gnu: Mesa: Fix substitutions for absolute library references., guix-commits, 2020/05/22
- 16/21: gnu: vkquake: Fix build with newer Vulkan headers., guix-commits, 2020/05/22
- 20/21: gnu: mtxclient: Update to 0.3.0., guix-commits, 2020/05/22
- 08/21: gnu: vulkan-loader: Enable tests.,
guix-commits <=
- 19/21: gnu: qtdeclarative: Fix reference on qmlcachegen., guix-commits, 2020/05/22
- 21/21: gnu: nheko: Update to 0.7.1., guix-commits, 2020/05/22