guix_mirror_bot pushed a commit to branch master
in repository guix.

commit bbf9c9f56cb36d428f8558366cc504469d79c2ff
Author: Morgan Smith <[email protected]>
AuthorDate: Mon Sep 14 17:01:01 2026 -0400

    gnu: emacs-compat: Update to 31.1.0.0.
    
    * gnu/packages/emacs-build.scm (emacs-compat): Update to 31.1.0.0.
    [#:phases]: Rename ‘skip-failing-test’ to ‘fix-tests’.
    Add ‘tramp-own-remote-path’ to ‘tramp-remote-path’ in tests that require 
tramp.
    
    Signed-off-by: Liliana Marie Prikler <[email protected]>
---
 gnu/packages/emacs-build.scm | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/emacs-build.scm b/gnu/packages/emacs-build.scm
index f304edbb0d7..6c96deaefe1 100644
--- a/gnu/packages/emacs-build.scm
+++ b/gnu/packages/emacs-build.scm
@@ -94,7 +94,7 @@ functions to ensure they are called with the right arguments 
during testing.")
 (define-public emacs-compat
   (package
     (name "emacs-compat")
-    (version "31.0.0.2")
+    (version "31.1.0.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -103,22 +103,28 @@ functions to ensure they are called with the right 
arguments during testing.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0bcdibsxw5m6ia2krfnan1b8gjfccdg6i8z316z32f4r9y1r3nd6"))))
+                "19706p8g1pq1dgp2j8a5bl1a62f288ksanbb09901q874g32n0my"))))
     (build-system emacs-build-system)
     (arguments
      (list
       #:test-command #~(list "make" "test")
       #:phases
       #~(modify-phases %standard-phases
-          (add-before 'check 'skip-failing-test
+          (add-before 'check 'fix-tests
             (lambda _
-              (for-each
-               (lambda (f)
-                 (substitute* "compat-tests.el"
-                   (((format #f "\\(ert-deftest compat-~a.*" f) all)
-                    (string-append all " (skip-unless nil)"))))
-               (list "exec-path" "executable-find" "make-nearby-temp-file"
-                     "package-get-version" "temporary-file-directory"))))
+              (setenv "HOME" (getcwd))
+              (substitute* "compat-tests.el"
+                ;; Tell tramp to our local PATH for the mock remote PATH
+                (("\\(require 'tramp\\)" all)
+                 (string-append
+                  all "\n"
+                  "(add-to-list 'tramp-remote-path 'tramp-own-remote-path)"))
+                ;; Skip some tests.
+                ;; The "package-get-version" test would pass if we
+                ;; byte-compiled the tests.
+                ;; The "exec-path" test looks for "/bin" in out PATH.
+                (("\\(ert-deftest compat-(package-get-version|exec-path) .*" 
all)
+                   (string-append all " (skip-unless nil)")))))
           (add-before 'install 'make-doc
             (lambda _
               (invoke "make" "compat.info"))))))

Reply via email to