guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch emacs-team updated: gnu: emacs-no-x: Skip integrity test on armhf


From: guix-commits
Subject: branch emacs-team updated: gnu: emacs-no-x: Skip integrity test on armhf-linux.
Date: Thu, 28 Mar 2024 15:49:38 -0400

This is an automated email from the git hooks/post-receive script.

lilyp pushed a commit to branch emacs-team
in repository guix.

The following commit(s) were added to refs/heads/emacs-team by this push:
     new ce999ae3a2 gnu: emacs-no-x: Skip integrity test on armhf-linux.
ce999ae3a2 is described below

commit ce999ae3a2e73c69d29e1e88c6537f90f813e1ea
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Thu Mar 28 19:20:04 2024 +0100

    gnu: emacs-no-x: Skip integrity test on armhf-linux.
    
    * gnu/packages/emacs.scm (emacs-no-x)[#:phases]<validate-runpath>: Move
    checks to GExpression expansion.  Add check against armhf-linux.
---
 gnu/packages/emacs.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 40a44f6e0c..a30e0b9b40 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -384,15 +384,19 @@ editor (console only)")
                 (apply invoke "make" "trampolines" make-flags)))
             (add-after 'validate-runpath 'validate-comp-integrity
               (lambda* (#:key outputs #:allow-other-keys)
-                (if #$(%current-target-system)
-                    (display "Cannot validate native-comp on cross builds.\n")
-                    (invoke
-                     (string-append (assoc-ref outputs "out") "/bin/emacs")
-                     "--batch"
-                     "--load"
-                     #$(local-file
-                        (search-auxiliary-file "emacs/comp-integrity.el"))
-                     "-f" "ert-run-tests-batch-and-exit"))))))))
+                #$(cond
+                   ((%current-target-system)
+                    #~(display "Cannot validate native-comp on cross 
builds.\n"))
+                   ((string=? (%current-system) "armhf-linux")
+                    #~(display "Integrity test is broken on armhf.\n"))
+                   (else
+                    #~(invoke
+                       (string-append (assoc-ref outputs "out") "/bin/emacs")
+                       "--batch"
+                       "--load"
+                       #$(local-file
+                          (search-auxiliary-file "emacs/comp-integrity.el"))
+                       "-f" "ert-run-tests-batch-and-exit")))))))))
     (inputs
      (modify-inputs (package-inputs emacs-minimal)
        (prepend gnutls



reply via email to

[Prev in Thread] Current Thread [Next in Thread]