oom pushed a commit to branch c++-team
in repository guix.
commit 9130da1e3461c45febcaee42c29430a582c1c608
Author: Greg Hogan <c...@greghogan.com>
AuthorDate: Tue Oct 22 18:09:23 2024 +0000
gnu: hotspot: Use #:test-exclude.
* gnu/packages/linux.scm (hotspot)[arguments]
<#:test-exclude>: Move exclude regex here from 'check phase.
<#:phases>: Remove 'check phase.
Change-Id: Iae9c98693a30c94c472a2f4056dfaa53b988c20c
---
gnu/packages/linux.scm | 41 +++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d206d1a9f0..ad8324fc83 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7716,6 +7716,24 @@ not as a replacement for it.")
#:configure-flags #~(list "-DINSTALL_KAUTH_HELPER=OFF"
"-DQT6_BUILD=ON")
#:qtbase qtbase
+ ;; The 'tst_models' and 'tst_callgraphgenerator' fail, with
+ ;; the later seemingly requiring sudo or access to the kernel
+ ;; trace points.
+ #:test-exclude
+ (string-append
+ "("
+ (string-join
+ ;; The 'tst_models' expected output doesn't exactly
+ ;; match.
+ '("tst_models"
+ ;; The 'tst_callgraphgenerator' perf invocation
+ ;; fails when run in the build container.
+ "tst_callgraphgenerator"
+ ;; The 'tst_perfparser' test requires sudo/access
+ ;; to the kernel scheduler trace points.
+ "tst_perfparser")
+ "|")
+ ")")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-perfparser
@@ -7751,28 +7769,7 @@ not as a replacement for it.")
(substitute* "src/perfrecord.cpp"
(("\"perf( )?\"" _ space)
(string-append "\"" (search-input-file inputs "bin/perf")
- (or space "") "\"")))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- ;; The 'tst_models' and 'tst_callgraphgenerator' fail, with
- ;; the later seemingly requiring sudo or access to the kernel
- ;; trace points.
- (invoke "ctest" "-E"
- (string-append
- "("
- (string-join
- ;; The 'tst_models' expected output doesn't exactly
- ;; match.
- '("tst_models"
- ;; The 'tst_callgraphgenerator' perf invocation
- ;; fails when run in the build container.
- "tst_callgraphgenerator"
- ;; The 'tst_perfparser' test requires sudo/access
- ;; to the kernel scheduler trace points.
- "tst_perfparser")
- "|")
- ")"))))))))
+ (or space "") "\""))))))))
(native-inputs
(list extra-cmake-modules
vulkan-headers))
