Subject: [PATCH v2 33/65] gnu: hotspot: Use #:test-exclude.

From: Greg Hogan <[email-masked]>
Date: Tue, 22 Oct 2024 18:09:23 +0000

* 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 2391a79a2a..15b5ab1bed 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7356,6 +7356,24 @@ (define-public hotspot
       #: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
@@ -7391,28 +7409,7 @@ (define-public hotspot
               (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))
-- 
2.46.1