Subject: [PATCH v2 21/65] gnu: vigra: Fix tests.

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

* gnu/packages/image.scm (vigra)[arguments]: Replace 'check phase to
replace the old cmake-build-system test target.
---
 gnu/packages/image.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 7f17c71aef..75937cf6d8 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1371,8 +1371,7 @@ (define-public vigra
         ("python-nose" ,python-nose)
         ("sphinx" ,python-sphinx)))
      (arguments
-      `(#:test-target "check"
-        #:phases
+      `(#:phases
         (modify-phases %standard-phases
           (add-after 'unpack 'disable-broken-tests
             (lambda _
@@ -1383,7 +1382,16 @@ (define-public vigra
               ;; <https://github.com/ukoethe/vigra/issues/436>.
               (substitute* "vigranumpy/test/CMakeLists.txt"
                 (("test1\\.py") ""))
-              #t)))
+              #t))
+          (replace 'check
+            (lambda* (#:key parallel-tests? tests? #:allow-other-keys)
+              (when tests?
+                 (let ((job-count (if parallel-tests?
+                                      (number->string (parallel-job-count))
+                                      "1")))
+                   ;; Test artifacts and actions are built and run with the
+                   ;; 'check' target.
+                   (invoke "make" "-j" job-count "check"))))))
         #:configure-flags
           (list "-Wno-dev" ; suppress developer mode with lots of warnings
                 (string-append "-DVIGRANUMPY_INSTALL_DIR="
-- 
2.46.1