aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiliana Marie Prikler <liliana.prikler@gmail.com>2024-03-28 19:20:04 +0100
committerLiliana Marie Prikler <liliana.prikler@gmail.com>2024-03-28 19:21:57 +0100
commitce999ae3a2e73c69d29e1e88c6537f90f813e1ea (patch)
tree560e7b572749914655a832a5df216dbfc3c01185
parent4c70f5242befb5786cb437559a4d8701e630bd29 (diff)
downloadguix-ce999ae3a2e73c69d29e1e88c6537f90f813e1ea.tar
guix-ce999ae3a2e73c69d29e1e88c6537f90f813e1ea.tar.gz
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.
-rw-r--r--gnu/packages/emacs.scm22
1 files 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