GNU bug report logs - #77681
[PATCH 0/6 emacs-team] Run emacs tests

Previous Next

Package: guix-patches;

Reported by: Morgan Smith <Morgan.J.Smith <at> outlook.com>

Date: Wed, 9 Apr 2025 18:56:02 UTC

Severity: normal

Tags: patch

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

To reply to this bug, email your comments to 77681 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 18:56:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Morgan Smith <Morgan.J.Smith <at> outlook.com>:
New bug report received and forwarded. Copy sent to andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org. (Wed, 09 Apr 2025 18:56:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: guix-patches <at> gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH 0/6 emacs-team] Run emacs tests
Date: Wed,  9 Apr 2025 14:54:12 -0400
I got a couple changes here but probably the most important is running the
emacs test suite.

I did want to ask about emacs-xwidgets though.  Recent versions of xwidgets
(like the one we have packaged) does not play well with Emacs.  For more
information see: Bug#66068

I don't think this will be resolved anytime soon though.  Do we make a
deprecated package for emacs-xwidgets or just remove it?

Morgan Smith (6):
  gnu: emacs-next: Update to 31.0.50-1.9663c95.
  gnu: emacs-magit-popup: Skip tests.
  gnu: emacs-guix: Skip tests.
  gnu: emacs-stgit: Skip tests.
  doc: Emacs Packages: Remove outdated commentary on testing.
  gnu: emacs: Run tests.

 doc/contributing.texi                         |  9 +-
 gnu/local.mk                                  |  1 +
 gnu/packages/emacs-xyz.scm                    |  4 +-
 gnu/packages/emacs.scm                        | 97 +++++++++++++++++--
 .../emacs-next-disable-jit-compilation.patch  | 19 ++++
 gnu/packages/version-control.scm              |  1 +
 6 files changed, 115 insertions(+), 16 deletions(-)
 create mode 100644 gnu/packages/patches/emacs-next-disable-jit-compilation.patch


base-commit: ca30726285b6883a3b1fa89db64177460af69c42
-- 
2.49.0





Information forwarded to andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 19:02:01 GMT) Full text and rfc822 format available.

Message #8 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH 1/6] gnu: emacs-next: Update to 31.0.50-1.9663c95.
Date: Wed,  9 Apr 2025 15:00:59 -0400
* gnu/packages/emacs.scm (emacs-next): Update to 31.0.50-1.9663c95.
* gnu/packages/patches/emacs-next-disable-jit-compilation.patch: New file.
* gnu/local.mk: Register new patch.

Change-Id: I2b13ce4c2ef030d8d7911ca524576d5b81e5db73
---
 gnu/local.mk                                  |  1 +
 gnu/packages/emacs.scm                        |  8 ++++----
 .../emacs-next-disable-jit-compilation.patch  | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 gnu/packages/patches/emacs-next-disable-jit-compilation.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 2b08ce42f2..c0b9a76cd2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1233,6 +1233,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/emacs-native-comp-driver-options.patch   \
   %D%/packages/patches/emacs-native-comp-fix-filenames.patch   \
   %D%/packages/patches/emacs-native-comp-pin-packages.patch   \
+  %D%/packages/patches/emacs-next-disable-jit-compilation.patch			\
   %D%/packages/patches/emacs-next-exec-path.patch   \
   %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch   \
   %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch  \
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7a57aad15d..9a020d89aa 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -573,8 +573,8 @@ (define-public emacs-wide-int
         #~(cons "--with-wide-int" #$flags))))))
 
 (define-public emacs-next-minimal
-  (let ((commit "60232a30e360c00fb303cb033d4aec15a9e41342")
-        (revision "0"))
+  (let ((commit "9663c959c73d6cca0c56f833d80ff1d9e9708b70")
+        (revision "1"))
   (package
     (inherit emacs-minimal)
     (name "emacs-next-minimal")
@@ -587,9 +587,9 @@ (define-public emacs-next-minimal
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1n1i20j92a8sqv224yzvyzk804h9x0lgyp3jlny3b6g08ka91034"))
+        (base32 "1a03j9zdn1fl181xcqsw4vg3v8a3sbv1r3d49ld6ysldvfkwiz39"))
        (patches
-        (search-patches "emacs-disable-jit-compilation.patch"
+        (search-patches "emacs-next-disable-jit-compilation.patch"
                         "emacs-next-exec-path.patch"
                         "emacs-fix-scheme-indent-function.patch"
                         "emacs-native-comp-driver-options.patch"
diff --git a/gnu/packages/patches/emacs-next-disable-jit-compilation.patch b/gnu/packages/patches/emacs-next-disable-jit-compilation.patch
new file mode 100644
index 0000000000..0e89e8f506
--- /dev/null
+++ b/gnu/packages/patches/emacs-next-disable-jit-compilation.patch
@@ -0,0 +1,19 @@
+Index: emacs-29.2/src/comp.c
+===================================================================
+--- emacs-29.2.orig/src/comp.c
++++ emacs-29.2/src/comp.c
+@@ -5648,8 +5648,12 @@ For internal use. */);
+     doc: /* If non-nil, compile loaded .elc files asynchronously.
+ 
+ After compilation, each function definition is updated to use the
+-natively compiled one.  */);
+-  native_comp_jit_compilation = true;
++natively compiled one.  This variable is enabled by default upstream,
++but disabled in Guix to better make use of precompiled packages.
++Notably, Guix removes the hashes that prevent inadvertent shadowing
++frm the file names of compiled libraries in order to facilitate grafts.
++Enable at your own risk!  */);
++  native_comp_jit_compilation = false;
+ 
+   DEFSYM (Qnative_comp_speed, "native-comp-speed");
+   DEFSYM (Qnative_comp_debug, "native-comp-debug");
-- 
2.49.0





Information forwarded to andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 19:02:02 GMT) Full text and rfc822 format available.

Message #11 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH 2/6] gnu: emacs-magit-popup: Skip tests.
Date: Wed,  9 Apr 2025 15:01:00 -0400
* gnu/packages/emacs-xyz.scm (emacs-magit-popup): Skip tests.

Change-Id: I170cd63443f1e8ed44d6756cca1ce04caf941e2d
---
 gnu/packages/emacs-xyz.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2a377f5a08..2e43244fa0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2048,7 +2048,8 @@ (define-public emacs-magit-popup
         (base32 "0znp6gx6vpcsybg774ab06mdgxb7sfk3gki1yp2qhkanav13i6q1"))))
     (build-system emacs-build-system)
     (arguments
-     `(#:phases
+     `(#:tests? #f    ; no tests
+       #:phases
        (modify-phases %standard-phases
          (add-before 'install 'make-info
            (lambda _
-- 
2.49.0





Information forwarded to andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 19:02:02 GMT) Full text and rfc822 format available.

Message #14 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH 3/6] gnu: emacs-guix: Skip tests.
Date: Wed,  9 Apr 2025 15:01:01 -0400
* gnu/packages/emacs-xyz.scm (emacs-guix): Skip tests.

Change-Id: I6d1677f3c4d73ac7ed36a6c8a8932ec69e85aaa2
---
 gnu/packages/emacs-xyz.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2e43244fa0..ae45cd4f0b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6825,6 +6825,7 @@ (define-public emacs-guix
         #:imported-modules `(,@%default-gnu-imported-modules
                              (guix build emacs-build-system)
                              (guix build emacs-utils))
+        #:tests? #f    ; no tests
         #:configure-flags
         #~(list (string-append "--with-lispdir="
                                (emacs:elpa-directory #$output)))
-- 
2.49.0





Information forwarded to guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 19:02:03 GMT) Full text and rfc822 format available.

Message #17 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH 4/6] gnu: emacs-stgit: Skip tests.
Date: Wed,  9 Apr 2025 15:01:02 -0400
* gnu/packages/version-control.scm (emacs-stgit): Skip tests.

Change-Id: I075726d0d4737c00799fbcaf4658186974b8257c
---
 gnu/packages/version-control.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 5100102111..6ece5381eb 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2186,6 +2186,7 @@ (define-public emacs-stgit
     (build-system emacs-build-system)
     (arguments
      (list
+      #:tests? #f    ; no tests
       #:lisp-directory "contrib"
       #:phases
       #~(modify-phases %standard-phases
-- 
2.49.0





Information forwarded to ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 19:02:03 GMT) Full text and rfc822 format available.

Message #20 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH 5/6] doc: Emacs Packages: Remove outdated commentary on
 testing.
Date: Wed,  9 Apr 2025 15:01:03 -0400
* doc/contributing.texi (Emacs Packages): Removeoutdated commentary on
testing.  We now run the tests by default like is done in other build systems.

Change-Id: I245a0a412615a1177fbd1b6e723fda3749f7e49f
---
 doc/contributing.texi | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index ab4f30d54b..eb105fc6fb 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -1433,14 +1433,7 @@ Emacs Packages
 Emacs packages should preferably use the Emacs build system
 (@pxref{emacs-build-system}), for uniformity and the benefits provided
 by its build phases, such as the auto-generation of the autoloads file
-and the byte compilation of the sources.  Because there is no
-standardized way to run a test suite for Emacs packages, tests are
-disabled by default.  When a test suite is available, it should be
-enabled by setting the @code{#:tests?} argument to @code{#true}.  By
-default, the command to run the test is @command{make check}, but any
-command can be specified via the @code{#:test-command} argument.  The
-@code{#:test-command} argument expects a list containing a command and
-its arguments, to be invoked during the @code{check} phase.
+and the byte compilation of the sources.
 
 The Elisp dependencies of Emacs packages are typically provided as
 @code{propagated-inputs} when required at run time.  As for other
-- 
2.49.0





Information forwarded to andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 19:02:04 GMT) Full text and rfc822 format available.

Message #23 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH 6/6] gnu: emacs: Run tests.
Date: Wed,  9 Apr 2025 15:01:04 -0400
* gnu/packages/emacs.scm
(emacs-ert-selector): New function.
(emacs-minimal): Run tests.
(emacs-next-minimal): Run tests.
(emacs-next-minimal): Run tests.
(emacs->emacs-next): Run tests.

Change-Id: Ib5ffeae9b7f49b5f1a56d348c15ce4c4fb28f5ec
---
 gnu/packages/emacs.scm | 89 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 86 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9a020d89aa..fbde2bd913 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -98,6 +98,26 @@ (define (%emacs-modules build-system)
       (srfi srfi-1)
       (ice-9 ftw))))
 
+(define* (emacs-ert-selector excluded-tests #:key run-nativecomp run-expensive run-unstable)
+  "Create an ERT selector that excludes tests."
+  (string-append
+   "(not (or "
+   (if run-nativecomp
+       ""
+       "(tag :nativecomp) ")
+   (if run-expensive
+       ""
+       "(tag :expensive-test) ")
+   (if run-unstable
+       ""
+       "(tag :unstable) ")
+   (string-join
+    (map
+     (lambda (test)
+       (string-append "\\\"" test "\\\""))
+     excluded-tests))
+   "))"))
+
 (define-public emacs-minimal
   (package
     (name "emacs-minimal")
@@ -153,9 +173,24 @@ (define-public emacs-minimal
     (build-system gnu-build-system)
     (arguments
      (list
-      #:tests? #f                       ; no check target
       #:modules (%emacs-modules build-system)
       #:configure-flags #~(list "--with-gnutls=no" "--disable-build-details")
+      #:make-flags #~(list
+                      ;; Broken tests.  This is inherited by other Emacs
+                      ;; packages so test them all when changing this value
+                      (string-append
+                       "SELECTOR="
+                       #$(emacs-ert-selector
+                          '("esh-util-test/path/get-remote"
+                            "esh-var-test/path-var/preserve-across-hosts"
+                            "ffap-tests--c-path"
+                            "grep-tests--rgrep-abbreviate-properties-darwin"
+                            "grep-tests--rgrep-abbreviate-properties-gnu-linux"
+                            "grep-tests--rgrep-abbreviate-properties-windows-nt-dos-semantics"
+                            "grep-tests--rgrep-abbreviate-properties-windows-nt-sh-semantics"
+                            "info-xref-test-makeinfo"
+                            "man-tests-find-header-file"
+                            "tramp-test48-remote-load-path"))))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'enable-elogind
@@ -240,6 +275,13 @@ (define-public emacs-minimal
               (substitute* (find-files "." "^Makefile\\.in$")
                 (("/bin/pwd")
                  "pwd"))))
+          (add-after 'unpack 'fix-tests
+            (lambda* (#:key tests? inputs #:allow-other-keys)
+              (when tests?
+                (substitute* "test/src/process-tests.el"
+                  (("/bin//sh") (search-input-file inputs "bin/sh")))
+                (substitute* "test/lisp/eshell/em-script-tests.el"
+                  (("/usr/bin/env") (search-input-file inputs "bin/env"))))))
           (add-after 'install 'install-site-start
             ;; Use 'guix-emacs' in "site-start.el", which is used autoload the
             ;; Elisp packages found in EMACSLOADPATH.
@@ -595,7 +637,27 @@ (define-public emacs-next-minimal
                         "emacs-native-comp-driver-options.patch"
                         "emacs-next-native-comp-fix-filenames.patch"
                         "emacs-native-comp-pin-packages.patch"
-                        "emacs-pgtk-super-key-fix.patch")))))))
+                        "emacs-pgtk-super-key-fix.patch"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments emacs-minimal)
+       ((#:make-flags _)
+        #~(list
+           (string-append
+            "SELECTOR="
+            #$(emacs-ert-selector
+               '("bytecomp--fun-value-as-head"
+                 "esh-util-test/path/get-remote"
+                 "esh-var-test/path-var/preserve-across-hosts"
+                 "ffap-tests--c-path"
+                 "find-func-tests--locate-macro-generated-symbols"
+                 "grep-tests--rgrep-abbreviate-properties-darwin"
+                 "grep-tests--rgrep-abbreviate-properties-gnu-linux"
+                 "grep-tests--rgrep-abbreviate-properties-windows-nt-dos-semantics"
+                 "grep-tests--rgrep-abbreviate-properties-windows-nt-sh-semantics"
+                 "info-xref-test-makeinfo"
+                 "man-tests-find-header-file"
+                 "tab-bar-tests-quit-restore-window"
+                 "tramp-test48-remote-load-path"))))))))))
 
 (define* (emacs->emacs-next emacs #:optional name
                             #:key (version (package-version emacs-next-minimal))
@@ -608,7 +670,28 @@ (define* (emacs->emacs-next emacs #:optional name
                                   (string-drop (package-name emacs)
                                                (string-length "emacs"))))))
     (version version)
-    (source source)))
+    (source source)
+    (arguments
+     (substitute-keyword-arguments (package-arguments emacs)
+       ((#:make-flags _)
+        #~(list
+           (string-append
+            "SELECTOR="
+            #$(emacs-ert-selector
+               '("bytecomp--fun-value-as-head"
+                 "esh-util-test/path/get-remote"
+                 "esh-var-test/path-var/preserve-across-hosts"
+                 "ffap-tests--c-path"
+                 "find-func-tests--locate-macro-generated-symbols"
+                 "find-func-tests--locate-macro-generated-symbols"
+                 "grep-tests--rgrep-abbreviate-properties-darwin"
+                 "grep-tests--rgrep-abbreviate-properties-gnu-linux"
+                 "grep-tests--rgrep-abbreviate-properties-windows-nt-dos-semantics"
+                 "grep-tests--rgrep-abbreviate-properties-windows-nt-sh-semantics"
+                 "info-xref-test-makeinfo"
+                 "man-tests-find-header-file"
+                 "tab-bar-tests-quit-restore-window"
+                 "tramp-test48-remote-load-path")))))))))
 
 (define-public emacs-next (emacs->emacs-next emacs))
 (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
-- 
2.49.0





Information forwarded to guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 20:02:01 GMT) Full text and rfc822 format available.

Message #26 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Gabriel Santos <gabrielsantosdesouza <at> disroot.org>
To: guix-patches <at> gnu.org, Morgan Smith <Morgan.J.Smith <at> outlook.com>,
 77681 <at> debbugs.gnu.org
Cc: Ian Eure <ian <at> retrospec.tv>,
 Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>,
 Cayetano Santos <csantosb <at> inventati.org>, Andrew Tropin <andrew <at> trop.in>,
 Hilton Chain <hako <at> ultrarare.space>,
 Divya Ranjan Pattanaik <divya <at> subvertising.org>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: Re: [bug#77681] [PATCH 0/6 emacs-team] Run emacs tests
Date: Wed, 09 Apr 2025 16:05:32 -0300
Em 9 de abril de 2025 15:54:12 BRT, Morgan Smith <Morgan.J.Smith <at> outlook.com> escreveu:
>I got a couple changes here but probably the most important is running the
>emacs test suite.
>
>I did want to ask about emacs-xwidgets though.  Recent versions of xwidgets
>(like the one we have packaged) does not play well with Emacs.  For more
>information see: Bug#66068
>
>I don't think this will be resolved anytime soon though.  Do we make a
>deprecated package for emacs-xwidgets or just remove it?
>
>Morgan Smith (6):
>  gnu: emacs-next: Update to 31.0.50-1.9663c95.
>  gnu: emacs-magit-popup: Skip tests.
>  gnu: emacs-guix: Skip tests.
>  gnu: emacs-stgit: Skip tests.
>  doc: Emacs Packages: Remove outdated commentary on testing.
>  gnu: emacs: Run tests.
>
> doc/contributing.texi                         |  9 +-
> gnu/local.mk                                  |  1 +
> gnu/packages/emacs-xyz.scm                    |  4 +-
> gnu/packages/emacs.scm                        | 97 +++++++++++++++++--
> .../emacs-next-disable-jit-compilation.patch  | 19 ++++
> gnu/packages/version-control.scm              |  1 +
> 6 files changed, 115 insertions(+), 16 deletions(-)
> create mode 100644 gnu/packages/patches/emacs-next-disable-jit-compilation.patch
>
>
>base-commit: ca30726285b6883a3b1fa89db64177460af69c42

In #77225[1], I removed emacs(-next)-xwidgets entirely.

[1] <https://issues.guix.gnu.org/77225>

-- 
Gabriel Santos




Information forwarded to guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 20:02:02 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 20:19:03 GMT) Full text and rfc822 format available.

Message #32 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Morgan Smith <Morgan.J.Smith <at> outlook.com>, 77681 <at> debbugs.gnu.org
Cc: Ian Eure <ian <at> retrospec.tv>,
 Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>,
 Cayetano Santos <csantosb <at> inventati.org>, Andrew Tropin <andrew <at> trop.in>,
 Hilton Chain <hako <at> ultrarare.space>,
 Divya Ranjan Pattanaik <divya <at> subvertising.org>
Subject: Re: [bug#77681] [PATCH 6/6] gnu: emacs: Run tests.
Date: Wed, 09 Apr 2025 22:17:58 +0200
Am Mittwoch, dem 09.04.2025 um 15:01 -0400 schrieb Morgan Smith:
> * gnu/packages/emacs.scm
> (emacs-ert-selector): New function.
> (emacs-minimal): Run tests.
> (emacs-next-minimal): Run tests.
> (emacs-next-minimal): Run tests.
> (emacs->emacs-next): Run tests.
Looks like some changes here are duplicated.

> Change-Id: Ib5ffeae9b7f49b5f1a56d348c15ce4c4fb28f5ec
> ---
>  gnu/packages/emacs.scm | 89
> ++++++++++++++++++++++++++++++++++++++++--
>  1 file changed, 86 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 9a020d89aa..fbde2bd913 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -98,6 +98,26 @@ (define (%emacs-modules build-system)
>        (srfi srfi-1)
>        (ice-9 ftw))))
>  
> +(define* (emacs-ert-selector excluded-tests #:key run-nativecomp
> run-expensive run-unstable)
> +  "Create an ERT selector that excludes tests."
> +  (string-append
> +   "(not (or "
> +   (if run-nativecomp
> +       ""
> +       "(tag :nativecomp) ")
> +   (if run-expensive
> +       ""
> +       "(tag :expensive-test) ")
> +   (if run-unstable
> +       ""
> +       "(tag :unstable) ")
> +   (string-join
> +    (map
> +     (lambda (test)
> +       (string-append "\\\"" test "\\\""))
> +     excluded-tests))
> +   "))"))
> +
>  (define-public emacs-minimal
>    (package
>      (name "emacs-minimal")
> @@ -153,9 +173,24 @@ (define-public emacs-minimal
>      (build-system gnu-build-system)
>      (arguments
>       (list
> -      #:tests? #f                       ; no check target
>        #:modules (%emacs-modules build-system)
>        #:configure-flags #~(list "--with-gnutls=no" "--disable-build-
> details")
> +      #:make-flags #~(list
> +                      ;; Broken tests.  This is inherited by other
> Emacs
> +                      ;; packages so test them all when changing
> this value
> +                      (string-append
> +                       "SELECTOR="
> +                       #$(emacs-ert-selector
> +                          '("esh-util-test/path/get-remote"
> +                            "esh-var-test/path-var/preserve-across-
> hosts"
> +                            "ffap-tests--c-path"
> +                            "grep-tests--rgrep-abbreviate-
> properties-darwin"
> +                            "grep-tests--rgrep-abbreviate-
> properties-gnu-linux"
> +                            "grep-tests--rgrep-abbreviate-
> properties-windows-nt-dos-semantics"
> +                            "grep-tests--rgrep-abbreviate-
> properties-windows-nt-sh-semantics"
> +                            "info-xref-test-makeinfo"
> +                            "man-tests-find-header-file"
> +                            "tramp-test48-remote-load-path"))))
Can we bind this selector (or one of its supersets below) to a variable
so as to use (string-append "SELECTOR=" %selector)?  

Cheers

Information forwarded to guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 20:19:03 GMT) Full text and rfc822 format available.

Message #35 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Morgan Smith <Morgan.J.Smith <at> outlook.com>, 77681 <at> debbugs.gnu.org
Cc: Ian Eure <ian <at> retrospec.tv>,
 Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>,
 Cayetano Santos <csantosb <at> inventati.org>, Andrew Tropin <andrew <at> trop.in>,
 Hilton Chain <hako <at> ultrarare.space>,
 Divya Ranjan Pattanaik <divya <at> subvertising.org>
Subject: Re: [bug#77681] [PATCH 1/6] gnu: emacs-next: Update to
 31.0.50-1.9663c95.
Date: Wed, 09 Apr 2025 22:18:51 +0200
Am Mittwoch, dem 09.04.2025 um 15:00 -0400 schrieb Morgan Smith:
> * gnu/packages/emacs.scm (emacs-next): Update to 31.0.50-1.9663c95.
> * gnu/packages/patches/emacs-next-disable-jit-compilation.patch: New
> file.
> * gnu/local.mk: Register new patch.
> 
> Change-Id: I2b13ce4c2ef030d8d7911ca524576d5b81e5db73
> ---
>  gnu/local.mk                                  |  1 +
>  gnu/packages/emacs.scm                        |  8 ++++----
>  .../emacs-next-disable-jit-compilation.patch  | 19
> +++++++++++++++++++
>  3 files changed, 24 insertions(+), 4 deletions(-)
>  create mode 100644 gnu/packages/patches/emacs-next-disable-jit-
> compilation.patch
> 
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 2b08ce42f2..c0b9a76cd2 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1233,6 +1233,7 @@ dist_patch_DATA
> =						\
>    %D%/packages/patches/emacs-native-comp-driver-options.patch   \
>    %D%/packages/patches/emacs-native-comp-fix-filenames.patch   \
>    %D%/packages/patches/emacs-native-comp-pin-packages.patch   \
> +  %D%/packages/patches/emacs-next-disable-jit-
> compilation.patch			\
>    %D%/packages/patches/emacs-next-exec-path.patch   \
>    %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch  
> \
>    %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch  \
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 7a57aad15d..9a020d89aa 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -573,8 +573,8 @@ (define-public emacs-wide-int
>          #~(cons "--with-wide-int" #$flags))))))
>  
>  (define-public emacs-next-minimal
> -  (let ((commit "60232a30e360c00fb303cb033d4aec15a9e41342")
> -        (revision "0"))
> +  (let ((commit "9663c959c73d6cca0c56f833d80ff1d9e9708b70")
> +        (revision "1"))
>    (package
>      (inherit emacs-minimal)
>      (name "emacs-next-minimal")
> @@ -587,9 +587,9 @@ (define-public emacs-next-minimal
>               (commit commit)))
>         (file-name (git-file-name name version))
>         (sha256
> -        (base32
> "1n1i20j92a8sqv224yzvyzk804h9x0lgyp3jlny3b6g08ka91034"))
> +        (base32
> "1a03j9zdn1fl181xcqsw4vg3v8a3sbv1r3d49ld6ysldvfkwiz39"))
>         (patches
> -        (search-patches "emacs-disable-jit-compilation.patch"
> +        (search-patches "emacs-next-disable-jit-compilation.patch"
>                          "emacs-next-exec-path.patch"
>                          "emacs-fix-scheme-indent-function.patch"
>                          "emacs-native-comp-driver-options.patch"
> diff --git a/gnu/packages/patches/emacs-next-disable-jit-
> compilation.patch b/gnu/packages/patches/emacs-next-disable-jit-
> compilation.patch
> new file mode 100644
> index 0000000000..0e89e8f506
> --- /dev/null
> +++ b/gnu/packages/patches/emacs-next-disable-jit-compilation.patch
> @@ -0,0 +1,19 @@
> +Index: emacs-29.2/src/comp.c
> +===================================================================
> +--- emacs-29.2.orig/src/comp.c
> ++++ emacs-29.2/src/comp.c
> +@@ -5648,8 +5648,12 @@ For internal use. */);
> +     doc: /* If non-nil, compile loaded .elc files asynchronously.
> + 
> + After compilation, each function definition is updated to use the
> +-natively compiled one.  */);
> +-  native_comp_jit_compilation = true;
> ++natively compiled one.  This variable is enabled by default
> upstream,
> ++but disabled in Guix to better make use of precompiled packages.
> ++Notably, Guix removes the hashes that prevent inadvertent shadowing
> ++frm the file names of compiled libraries in order to facilitate
Ye olde typo is still there :<
> grafts.
> ++Enable at your own risk!  */);
> ++  native_comp_jit_compilation = false;
> + 
> +   DEFSYM (Qnative_comp_speed, "native-comp-speed");
> +   DEFSYM (Qnative_comp_debug, "native-comp-debug");





Information forwarded to guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 21:10:02 GMT) Full text and rfc822 format available.

Message #38 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: Morgan Smith <Morgan.J.Smith <at> outlook.com>, 77681 <at> debbugs.gnu.org
Subject: Re: [bug#77681] [PATCH 0/6 emacs-team] Run emacs tests
Date: Wed, 09 Apr 2025 23:09:11 +0200
On 2025-04-09 14:54, Morgan Smith wrote:

> I got a couple changes here but probably the most important is running the
> emacs test suite.
>
> I did want to ask about emacs-xwidgets though.  Recent versions of xwidgets
> (like the one we have packaged) does not play well with Emacs.  For more
> information see: Bug#66068
>
> I don't think this will be resolved anytime soon though.  Do we make a
> deprecated package for emacs-xwidgets or just remove it?
>
> Morgan Smith (6):
>   gnu: emacs-next: Update to 31.0.50-1.9663c95.
>   gnu: emacs-magit-popup: Skip tests.
>   gnu: emacs-guix: Skip tests.
>   gnu: emacs-stgit: Skip tests.
>   doc: Emacs Packages: Remove outdated commentary on testing.
>   gnu: emacs: Run tests.

I recently resumed some development efforts on emacs-guix, and will
probably come back to it from time to time.  Do you have an intuitive
assessment about how bad the situation is on emacs-guix tests?

TY Morgan!

-- 
Best regards,
Nicolas Graves




Information forwarded to guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 21:22:01 GMT) Full text and rfc822 format available.

Message #41 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <morgan.j.smith <at> outlook.com>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 77681 <at> debbugs.gnu.org
Subject: Re: [bug#77681] [PATCH 0/6 emacs-team] Run emacs tests
Date: Wed, 09 Apr 2025 17:20:59 -0400
Nicolas Graves <ngraves <at> ngraves.fr> writes:

> On 2025-04-09 14:54, Morgan Smith wrote:
>
> I recently resumed some development efforts on emacs-guix, and will
> probably come back to it from time to time.  Do you have an intuitive
> assessment about how bad the situation is on emacs-guix tests?
>
> TY Morgan!

I'd love to see some development there!

As for the tests, I believe they don't exist.  I get no results from
running these commands:

find . -iname '*test*'
grep -r '\Wert\W' # looking for ert tests




Information forwarded to guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 21:40:01 GMT) Full text and rfc822 format available.

Message #44 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Gabriel Santos <gabrielsantosdesouza <at> disroot.org>
To: guix-patches <at> gnu.org, Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 Morgan Smith <Morgan.J.Smith <at> outlook.com>, 77681 <at> debbugs.gnu.org
Cc: Ian Eure <ian <at> retrospec.tv>,
 Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>,
 Cayetano Santos <csantosb <at> inventati.org>, Andrew Tropin <andrew <at> trop.in>,
 Hilton Chain <hako <at> ultrarare.space>,
 Divya Ranjan Pattanaik <divya <at> subvertising.org>
Subject: Re: [bug#77681] [PATCH 1/6] gnu: emacs-next: Update to 31.0.50-1.9663c95.
Date: Wed, 09 Apr 2025 18:04:57 -0300
Em 9 de abril de 2025 17:18:51 BRT, Liliana Marie Prikler <liliana.prikler <at> gmail.com> escreveu:
>Am Mittwoch, dem 09.04.2025 um 15:00 -0400 schrieb Morgan Smith:
>> * gnu/packages/emacs.scm (emacs-next): Update to 31.0.50-1.9663c95.
>> * gnu/packages/patches/emacs-next-disable-jit-compilation.patch: New
>> file.
>> * gnu/local.mk: Register new patch.
>> 
>> Change-Id: I2b13ce4c2ef030d8d7911ca524576d5b81e5db73
>> ---
>>  gnu/local.mk                                  |  1 +
>>  gnu/packages/emacs.scm                        |  8 ++++----
>>  .../emacs-next-disable-jit-compilation.patch  | 19
>> +++++++++++++++++++
>>  3 files changed, 24 insertions(+), 4 deletions(-)
>>  create mode 100644 gnu/packages/patches/emacs-next-disable-jit-
>> compilation.patch
>> 
>> diff --git a/gnu/local.mk b/gnu/local.mk
>> index 2b08ce42f2..c0b9a76cd2 100644
>> --- a/gnu/local.mk
>> +++ b/gnu/local.mk
>> @@ -1233,6 +1233,7 @@ dist_patch_DATA
>> =						\
>>    %D%/packages/patches/emacs-native-comp-driver-options.patch   \
>>    %D%/packages/patches/emacs-native-comp-fix-filenames.patch   \
>>    %D%/packages/patches/emacs-native-comp-pin-packages.patch   \
>> +  %D%/packages/patches/emacs-next-disable-jit-
>> compilation.patch			\
>>    %D%/packages/patches/emacs-next-exec-path.patch   \
>>    %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch  
>> \
>>    %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch  \
>> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
>> index 7a57aad15d..9a020d89aa 100644
>> --- a/gnu/packages/emacs.scm
>> +++ b/gnu/packages/emacs.scm
>> @@ -573,8 +573,8 @@ (define-public emacs-wide-int
>>          #~(cons "--with-wide-int" #$flags))))))
>>  
>>  (define-public emacs-next-minimal
>> -  (let ((commit "60232a30e360c00fb303cb033d4aec15a9e41342")
>> -        (revision "0"))
>> +  (let ((commit "9663c959c73d6cca0c56f833d80ff1d9e9708b70")
>> +        (revision "1"))
>>    (package
>>      (inherit emacs-minimal)
>>      (name "emacs-next-minimal")
>> @@ -587,9 +587,9 @@ (define-public emacs-next-minimal
>>               (commit commit)))
>>         (file-name (git-file-name name version))
>>         (sha256
>> -        (base32
>> "1n1i20j92a8sqv224yzvyzk804h9x0lgyp3jlny3b6g08ka91034"))
>> +        (base32
>> "1a03j9zdn1fl181xcqsw4vg3v8a3sbv1r3d49ld6ysldvfkwiz39"))
>>         (patches
>> -        (search-patches "emacs-disable-jit-compilation.patch"
>> +        (search-patches "emacs-next-disable-jit-compilation.patch"
>>                          "emacs-next-exec-path.patch"
>>                          "emacs-fix-scheme-indent-function.patch"
>>                          "emacs-native-comp-driver-options.patch"
>> diff --git a/gnu/packages/patches/emacs-next-disable-jit-
>> compilation.patch b/gnu/packages/patches/emacs-next-disable-jit-
>> compilation.patch
>> new file mode 100644
>> index 0000000000..0e89e8f506
>> --- /dev/null
>> +++ b/gnu/packages/patches/emacs-next-disable-jit-compilation.patch
>> @@ -0,0 +1,19 @@
>> +Index: emacs-29.2/src/comp.c
>> +===================================================================
>> +--- emacs-29.2.orig/src/comp.c
>> ++++ emacs-29.2/src/comp.c
>> +@@ -5648,8 +5648,12 @@ For internal use. */);
>> +     doc: /* If non-nil, compile loaded .elc files asynchronously.
>> + 
>> + After compilation, each function definition is updated to use the
>> +-natively compiled one.  */);
>> +-  native_comp_jit_compilation = true;
>> ++natively compiled one.  This variable is enabled by default
>> upstream,
>> ++but disabled in Guix to better make use of precompiled packages.
>> ++Notably, Guix removes the hashes that prevent inadvertent shadowing
>> ++frm the file names of compiled libraries in order to facilitate
>Ye olde typo is still there :<
>> grafts.
>> ++Enable at your own risk!  */);
>> ++  native_comp_jit_compilation = false;
>> + 
>> +   DEFSYM (Qnative_comp_speed, "native-comp-speed");
>> +   DEFSYM (Qnative_comp_debug, "native-comp-debug");
>
>
>
>

I noticed that the commit here is newer than the one in #7725[1].

Should I close it?

[1] <https://issues.guix.gnu.org/77225>

-- 
Gabriel Santos




Information forwarded to guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 21:40:02 GMT) Full text and rfc822 format available.

Information forwarded to andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 21:55:01 GMT) Full text and rfc822 format available.

Message #50 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH v2 1/6] gnu: emacs-next: Update to 31.0.50-1.9663c95.
Date: Wed,  9 Apr 2025 17:52:56 -0400
* gnu/packages/emacs.scm (emacs-next): Update to 31.0.50-1.9663c95.
* gnu/packages/patches/emacs-next-disable-jit-compilation.patch: New file.
* gnu/local.mk: Register new patch.

Change-Id: I2b13ce4c2ef030d8d7911ca524576d5b81e5db73
---
 gnu/local.mk                                  |  1 +
 gnu/packages/emacs.scm                        |  8 ++++----
 .../emacs-next-disable-jit-compilation.patch  | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 gnu/packages/patches/emacs-next-disable-jit-compilation.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 2b08ce42f2..c0b9a76cd2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1233,6 +1233,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/emacs-native-comp-driver-options.patch   \
   %D%/packages/patches/emacs-native-comp-fix-filenames.patch   \
   %D%/packages/patches/emacs-native-comp-pin-packages.patch   \
+  %D%/packages/patches/emacs-next-disable-jit-compilation.patch			\
   %D%/packages/patches/emacs-next-exec-path.patch   \
   %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch   \
   %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch  \
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7a57aad15d..9a020d89aa 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -573,8 +573,8 @@ (define-public emacs-wide-int
         #~(cons "--with-wide-int" #$flags))))))
 
 (define-public emacs-next-minimal
-  (let ((commit "60232a30e360c00fb303cb033d4aec15a9e41342")
-        (revision "0"))
+  (let ((commit "9663c959c73d6cca0c56f833d80ff1d9e9708b70")
+        (revision "1"))
   (package
     (inherit emacs-minimal)
     (name "emacs-next-minimal")
@@ -587,9 +587,9 @@ (define-public emacs-next-minimal
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1n1i20j92a8sqv224yzvyzk804h9x0lgyp3jlny3b6g08ka91034"))
+        (base32 "1a03j9zdn1fl181xcqsw4vg3v8a3sbv1r3d49ld6ysldvfkwiz39"))
        (patches
-        (search-patches "emacs-disable-jit-compilation.patch"
+        (search-patches "emacs-next-disable-jit-compilation.patch"
                         "emacs-next-exec-path.patch"
                         "emacs-fix-scheme-indent-function.patch"
                         "emacs-native-comp-driver-options.patch"
diff --git a/gnu/packages/patches/emacs-next-disable-jit-compilation.patch b/gnu/packages/patches/emacs-next-disable-jit-compilation.patch
new file mode 100644
index 0000000000..0bac7a25fb
--- /dev/null
+++ b/gnu/packages/patches/emacs-next-disable-jit-compilation.patch
@@ -0,0 +1,19 @@
+Index: emacs-29.2/src/comp.c
+===================================================================
+--- emacs-29.2.orig/src/comp.c
++++ emacs-29.2/src/comp.c
+@@ -5648,8 +5648,12 @@ For internal use. */);
+     doc: /* If non-nil, compile loaded .elc files asynchronously.
+ 
+ After compilation, each function definition is updated to use the
+-natively compiled one.  */);
+-  native_comp_jit_compilation = true;
++natively compiled one.  This variable is enabled by default upstream,
++but disabled in Guix to better make use of precompiled packages.
++Notably, Guix removes the hashes that prevent inadvertent shadowing
++from the file names of compiled libraries in order to facilitate grafts.
++Enable at your own risk!  */);
++  native_comp_jit_compilation = false;
+ 
+   DEFSYM (Qnative_comp_speed, "native-comp-speed");
+   DEFSYM (Qnative_comp_debug, "native-comp-debug");

base-commit: ca30726285b6883a3b1fa89db64177460af69c42
-- 
2.49.0





Information forwarded to andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 21:55:02 GMT) Full text and rfc822 format available.

Message #53 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH v2 2/6] gnu: emacs-magit-popup: Skip tests.
Date: Wed,  9 Apr 2025 17:52:57 -0400
* gnu/packages/emacs-xyz.scm (emacs-magit-popup): Skip tests.

Change-Id: I170cd63443f1e8ed44d6756cca1ce04caf941e2d
---
 gnu/packages/emacs-xyz.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2a377f5a08..2e43244fa0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2048,7 +2048,8 @@ (define-public emacs-magit-popup
         (base32 "0znp6gx6vpcsybg774ab06mdgxb7sfk3gki1yp2qhkanav13i6q1"))))
     (build-system emacs-build-system)
     (arguments
-     `(#:phases
+     `(#:tests? #f    ; no tests
+       #:phases
        (modify-phases %standard-phases
          (add-before 'install 'make-info
            (lambda _
-- 
2.49.0





Information forwarded to andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 21:55:02 GMT) Full text and rfc822 format available.

Message #56 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH v2 3/6] gnu: emacs-guix: Skip tests.
Date: Wed,  9 Apr 2025 17:52:58 -0400
* gnu/packages/emacs-xyz.scm (emacs-guix): Skip tests.

Change-Id: I6d1677f3c4d73ac7ed36a6c8a8932ec69e85aaa2
---
 gnu/packages/emacs-xyz.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2e43244fa0..ae45cd4f0b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6825,6 +6825,7 @@ (define-public emacs-guix
         #:imported-modules `(,@%default-gnu-imported-modules
                              (guix build emacs-build-system)
                              (guix build emacs-utils))
+        #:tests? #f    ; no tests
         #:configure-flags
         #~(list (string-append "--with-lispdir="
                                (emacs:elpa-directory #$output)))
-- 
2.49.0





Information forwarded to guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 21:55:03 GMT) Full text and rfc822 format available.

Message #59 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH v2 4/6] gnu: emacs-stgit: Skip tests.
Date: Wed,  9 Apr 2025 17:52:59 -0400
* gnu/packages/version-control.scm (emacs-stgit): Skip tests.

Change-Id: I075726d0d4737c00799fbcaf4658186974b8257c
---
 gnu/packages/version-control.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 5100102111..6ece5381eb 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2186,6 +2186,7 @@ (define-public emacs-stgit
     (build-system emacs-build-system)
     (arguments
      (list
+      #:tests? #f    ; no tests
       #:lisp-directory "contrib"
       #:phases
       #~(modify-phases %standard-phases
-- 
2.49.0





Information forwarded to ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 21:55:03 GMT) Full text and rfc822 format available.

Message #62 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH v2 5/6] doc: Emacs Packages: Remove outdated commentary on
 testing.
Date: Wed,  9 Apr 2025 17:53:00 -0400
* doc/contributing.texi (Emacs Packages): Removeoutdated commentary on
testing.  We now run the tests by default like is done in other build systems.

Change-Id: I245a0a412615a1177fbd1b6e723fda3749f7e49f
---
 doc/contributing.texi | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index ab4f30d54b..eb105fc6fb 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -1433,14 +1433,7 @@ Emacs Packages
 Emacs packages should preferably use the Emacs build system
 (@pxref{emacs-build-system}), for uniformity and the benefits provided
 by its build phases, such as the auto-generation of the autoloads file
-and the byte compilation of the sources.  Because there is no
-standardized way to run a test suite for Emacs packages, tests are
-disabled by default.  When a test suite is available, it should be
-enabled by setting the @code{#:tests?} argument to @code{#true}.  By
-default, the command to run the test is @command{make check}, but any
-command can be specified via the @code{#:test-command} argument.  The
-@code{#:test-command} argument expects a list containing a command and
-its arguments, to be invoked during the @code{check} phase.
+and the byte compilation of the sources.
 
 The Elisp dependencies of Emacs packages are typically provided as
 @code{propagated-inputs} when required at run time.  As for other
-- 
2.49.0





Information forwarded to andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:
bug#77681; Package guix-patches. (Wed, 09 Apr 2025 21:55:04 GMT) Full text and rfc822 format available.

Message #65 received at 77681 <at> debbugs.gnu.org (full text, mbox):

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 77681 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH v2 6/6] gnu: emacs: Run tests.
Date: Wed,  9 Apr 2025 17:53:01 -0400
Due to inheritance this enables tests on most of the Emacs packages.

* gnu/packages/emacs.scm:
(emacs-ert-selector): New function.
(%selector): New variable.
(emacs-minimal): Run tests.

Change-Id: Ib5ffeae9b7f49b5f1a56d348c15ce4c4fb28f5ec
---
 gnu/packages/emacs.scm | 45 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9a020d89aa..26bb0c7005 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -98,6 +98,42 @@ (define (%emacs-modules build-system)
       (srfi srfi-1)
       (ice-9 ftw))))
 
+(define* (emacs-ert-selector excluded-tests #:key run-nativecomp run-expensive run-unstable)
+  "Create an ERT selector that excludes tests."
+  (string-append
+   "(not (or "
+   (if run-nativecomp
+       ""
+       "(tag :nativecomp) ")
+   (if run-expensive
+       ""
+       "(tag :expensive-test) ")
+   (if run-unstable
+       ""
+       "(tag :unstable) ")
+   (string-join
+    (map
+     (lambda (test)
+       (string-append "\\\"" test "\\\""))
+     excluded-tests))
+   "))"))
+
+(define %selector
+  (emacs-ert-selector
+   '("bytecomp--fun-value-as-head"
+     "esh-util-test/path/get-remote"
+     "esh-var-test/path-var/preserve-across-hosts"
+     "ffap-tests--c-path"
+     "find-func-tests--locate-macro-generated-symbols"
+     "grep-tests--rgrep-abbreviate-properties-darwin"
+     "grep-tests--rgrep-abbreviate-properties-gnu-linux"
+     "grep-tests--rgrep-abbreviate-properties-windows-nt-dos-semantics"
+     "grep-tests--rgrep-abbreviate-properties-windows-nt-sh-semantics"
+     "info-xref-test-makeinfo"
+     "man-tests-find-header-file"
+     "tab-bar-tests-quit-restore-window"
+     "tramp-test48-remote-load-path")))
+
 (define-public emacs-minimal
   (package
     (name "emacs-minimal")
@@ -153,9 +189,9 @@ (define-public emacs-minimal
     (build-system gnu-build-system)
     (arguments
      (list
-      #:tests? #f                       ; no check target
       #:modules (%emacs-modules build-system)
       #:configure-flags #~(list "--with-gnutls=no" "--disable-build-details")
+      #:make-flags #~(list (string-append "SELECTOR=" #$%selector))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'enable-elogind
@@ -240,6 +276,13 @@ (define-public emacs-minimal
               (substitute* (find-files "." "^Makefile\\.in$")
                 (("/bin/pwd")
                  "pwd"))))
+          (add-after 'unpack 'fix-tests
+            (lambda* (#:key tests? inputs #:allow-other-keys)
+              (when tests?
+                (substitute* "test/src/process-tests.el"
+                  (("/bin//sh") (search-input-file inputs "bin/sh")))
+                (substitute* "test/lisp/eshell/em-script-tests.el"
+                  (("/usr/bin/env") (search-input-file inputs "bin/env"))))))
           (add-after 'install 'install-site-start
             ;; Use 'guix-emacs' in "site-start.el", which is used autoload the
             ;; Elisp packages found in EMACSLOADPATH.
-- 
2.49.0





Reply sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
You have taken responsibility. (Sat, 12 Apr 2025 21:12:01 GMT) Full text and rfc822 format available.

Notification sent to Morgan Smith <Morgan.J.Smith <at> outlook.com>:
bug acknowledged by developer. (Sat, 12 Apr 2025 21:12:02 GMT) Full text and rfc822 format available.

Message #70 received at 77681-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Morgan Smith <Morgan.J.Smith <at> outlook.com>, 77681-done <at> debbugs.gnu.org
Cc: Ian Eure <ian <at> retrospec.tv>,
 Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>,
 Cayetano Santos <csantosb <at> inventati.org>, Andrew Tropin <andrew <at> trop.in>,
 Hilton Chain <hako <at> ultrarare.space>,
 Divya Ranjan Pattanaik <divya <at> subvertising.org>
Subject: Re: [bug#77681] [PATCH v2 6/6] gnu: emacs: Run tests.
Date: Sat, 12 Apr 2025 23:11:14 +0200
Am Mittwoch, dem 09.04.2025 um 17:53 -0400 schrieb Morgan Smith:
> Due to inheritance this enables tests on most of the Emacs packages.
> 
> * gnu/packages/emacs.scm:
> (emacs-ert-selector): New function.
> (%selector): New variable.
> (emacs-minimal): Run tests.
> 
> Change-Id: Ib5ffeae9b7f49b5f1a56d348c15ce4c4fb28f5ec
> ---
Pushed to emacs-team earlier today.

Cheers




This bug report was last modified today.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.