all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 72741@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>,
	Andreas Enge <andreas@enge.fr>, Eric Bavier <bavier@posteo.net>,
	Sharlatan Hellseher <sharlatanus@gmail.com>
Subject: [bug#72741] [PATCH 01/32] gnu: indi-2.0: Adjust package style.
Date: Wed, 21 Aug 2024 01:03:03 +0100	[thread overview]
Message-ID: <3a9d3fd0764d810b84418f0e4d0cebc386b69d18.1724198118.git.sharlatanus@gmail.com> (raw)
In-Reply-To: <cover.1724198118.git.sharlatanus@gmail.com>

* gnu/packages/astronomy.scm (indi-2.0): Apply G-expressions.
[arguments] <tests>: Enable tests on all architectures.
<parallel-tests>: Disable it to make tests more stable.
<configure-flags>: Build all tests, do not set "Release" build type.
<phases>: Add 'patch-udev-rule phase. Refresh custom 'check phase to
include integration tests.'
[inputs]: Add kmod.

Change-Id: I46223344b042e2516065a4382fb0feb36645ebf9
---
 gnu/packages/astronomy.scm | 46 +++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 212650630c..c7c244ed96 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -61,6 +61,7 @@ (define-module (gnu packages astronomy)
   #:use-module (gnu packages jupyter)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages libusb)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages machine-learning)
   #:use-module (gnu packages maths)
@@ -4316,26 +4317,30 @@ (define-public indi-2.0
         (base32 "1rsy6ihwl3fnv502pmycx0xry9qn1qfz13kwdifcf2075wqd1lx9"))))
     (build-system cmake-build-system)
     (arguments
-     ;; TODO: fix failing tests on aarch64-system.
-     `(#:tests? ,(not (or (%current-target-system) (target-aarch64?)))
-       #:configure-flags
-       (let ((out (assoc-ref %outputs "out")))
-         (list
-          "-DINDI_BUILD_UNITTESTS=ON"
-          "-DCMAKE_BUILD_TYPE=Release"
-          (string-append "-DCMAKE_INSTALL_PREFIX=" out)
-          (string-append "-DUDEVRULES_INSTALL_DIR=" out "/lib/udev/rules.d")))
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (with-directory-excursion "test"
-                 (invoke "ctest")))))
-         (add-before 'install 'set-install-directories
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (mkdir-p (string-append out "/lib/udev/rules.d"))))))))
+     (list
+      #:parallel-tests? #f  ; Socket address collisions between tests
+      #:configure-flags
+      #~(list "-DINDI_BUILD_UNITTESTS=ON"
+              "-DINDI_BUILD_INTEGTESTS=ON"
+              "-DCMAKE_INSTALL_LIBDIR=lib"
+              (string-append "-DCMAKE_INSTALL_PREFIX=" #$output)
+              (string-append "-DUDEVRULES_INSTALL_DIR=" #$output "/lib/udev/rules.d"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-udev-rules
+            (lambda _
+              (substitute* (list "drivers/auxiliary/99-indi_auxiliary.rules"
+                                 "drivers/video/80-dbk21-camera.rules")
+                (("/bin/sh") (which "sh"))
+                (("/sbin/modprobe")
+                 (string-append #$(this-package-input "kmod") "/bin/modprobe")))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion "integs"
+                  (invoke "ctest" "-V" "--output-on-failure"))
+                (with-directory-excursion "test"
+                  (invoke "ctest" "-V"))))))))
     (native-inputs
      (list googletest))
     (inputs
@@ -4343,6 +4348,7 @@ (define-public indi-2.0
            curl
            fftw
            gsl
+           kmod
            libev
            libjpeg-turbo
            libnova
-- 
2.41.0





  reply	other threads:[~2024-08-21  0:06 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-21  0:01 [bug#72741] [PATCH 00/32] Astronomy update 2024/08 Sharlatan Hellseher
2024-08-21  0:03 ` Sharlatan Hellseher [this message]
2024-08-21  0:03 ` [bug#72741] [PATCH 02/32] gnu: indi-2.0: Update to 2.0.9 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 03/32] gnu: python-astroplan: Update to 0.10.1 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 04/32] gnu: python-astropy-iers-data: Update to 0.2024.8.12.0.32.58 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 05/32] gnu: python-astropy: Update to 6.1.2 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 06/32] gnu: python-crds: Update to 11.18.1 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 07/32] gnu: python-czml3: Update to 1.0.2 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 08/32] gnu: python-drms: Update to 0.8.0 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 09/32] gnu: python-dust-extinction: Update to 1.5 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 10/32] gnu: python-glue-core: Adjust inputs Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 11/32] gnu: python-glymur: Update to 0.13.5 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 12/32] gnu: python-mpl-animators: Update to 1.2.0 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 13/32] gnu: python-rad: Update to 0.21.0 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 14/32] gnu: python-radiospectra: Update to 0.6.0 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 15/32] gnu: python-reproject: Update to 0.14.0 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 16/32] gnu: python-roman-datamodels: Update to 0.21.0 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 17/32] gnu: python-specutils: Update to 1.16.0 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 18/32] gnu: python-shapely: Update to 2.0.5 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 19/32] gnu: python-shapely: Adjust home page Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 20/32] gnu: python-stcal: Update to 1.8.0 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 21/32] gnu: python-stpipe: Update to 0.7.0 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 22/32] gnu: python-sunpy: Update to 6.0.1 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 23/32] gnu: python-viresclient: Update to 0.12.0 Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 24/32] gnu: Add python-soxs Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 25/32] gnu: Add python-pyxsim Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 26/32] gnu: Add python-specreduce Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 27/32] gnu: Add python-glue-astronomy Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 28/32] gnu: Add python-pvextractor Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 29/32] gnu: Add python-glue-qt Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 30/32] gnu: Add python-sunkit-image Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 31/32] gnu: Add python-zodipy Sharlatan Hellseher
2024-08-21  0:03 ` [bug#72741] [PATCH 32/32] gnu: python-sunkit-image: Disable more failing tests Sharlatan Hellseher
2024-08-27 16:06 ` bug#72741: [PATCH 00/32] Astronomy update 2024/08 Sharlatan Hellseher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3a9d3fd0764d810b84418f0e4d0cebc386b69d18.1724198118.git.sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=72741@debbugs.gnu.org \
    --cc=andreas@enge.fr \
    --cc=bavier@posteo.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.