From ce999ae3a2e73c69d29e1e88c6537f90f813e1ea Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 28 Mar 2024 19:20:04 +0100 Subject: gnu: emacs-no-x: Skip integrity test on armhf-linux. * gnu/packages/emacs.scm (emacs-no-x)[#:phases]: 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 @@ (define (first-subdirectory/absolute directory) (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 -- cgit v1.2.3