From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 72045@debbugs.gnu.org
Cc: Suhail Singh <suhailsingh247@gmail.com>,
andrew@trop.in, cox.katherine.e+guix@gmail.com,
liliana.prikler@gmail.com
Subject: bug#72045: [PATCH v2 1/2] gnu: Add system test for Emacs.
Date: Fri, 19 Jul 2024 09:35:34 +0200 [thread overview]
Message-ID: <6c20a4fd1a6225f062b019d79e090399785470ea.1721377800.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <b4c6ff2fb41f53b3567e8da9e158a44fbea1ec93.camel@gmail.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 4746 bytes --]
* gnu/tests/emacs.scm: New file.
---
Hi Guix,
this series adds a system test to ensure that Emacs grafts are meaningful.
With this, we can make safe decisions as to whether or not place
(replacement …)
Cheers
gnu/tests/emacs.scm | 100 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
create mode 100644 gnu/tests/emacs.scm
diff --git a/gnu/tests/emacs.scm b/gnu/tests/emacs.scm
new file mode 100644
index 0000000000..fba27cefd8
--- /dev/null
+++ b/gnu/tests/emacs.scm
@@ -0,0 +1,100 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Liliana Marie Prikler <liliana.prikler@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu tests emacs)
+ #:use-module (gnu tests)
+ #:use-module (gnu packages emacs)
+ #:use-module (gnu packages vim)
+ #:use-module (gnu services)
+ #:use-module (gnu system)
+ #:use-module (gnu system vm)
+ #:use-module (guix packages)
+ #:use-module (guix gexp)
+ #:use-module (srfi srfi-1)
+ #:export (%test-emacs-native-comp-replacable))
+
+(define (run-native-comp-replacable-test old-emacs new-emacs)
+ (define vm (virtual-machine (marionette-operating-system %simple-os)))
+
+ (define test
+ (with-imported-modules '((gnu build marionette))
+ #~(begin
+ (use-modules (gnu build marionette)
+ (srfi srfi-1)
+ (srfi srfi-64))
+
+ (define marionette (make-marionette (list #$vm)))
+ (define (emacs-native-comp-dir emacs)
+ (marionette-eval
+ `(begin
+ (use-modules (ice-9 rdelim) (ice-9 popen))
+ (read-line
+ (open-pipe*
+ OPEN_READ
+ ,emacs "--batch"
+ "--eval=(princ comp-native-version-dir)")))
+ marionette))
+ (define (emacs-effective-version emacs)
+ (marionette-eval
+ `(begin
+ (use-modules (ice-9 rdelim) (ice-9 popen))
+ (read-line
+ (open-pipe*
+ OPEN_READ
+ ,emacs "--batch"
+ "--eval=(princ (format \"%s.%s\" \
+ emacs-major-version emacs-minor-version))")))
+ marionette))
+ (define old-emacs-bin #$(file-append old-emacs "/bin/emacs"))
+ (define new-emacs-bin #$(file-append new-emacs "/bin/emacs"))
+
+ (test-runner-current (system-test-runner #$output))
+ (test-begin "emacs-native-comp-replacable")
+ (test-equal "native-comp-dir"
+ (emacs-native-comp-dir
+ #$(file-append old-emacs "/bin/emacs"))
+ (emacs-native-comp-dir
+ #$(file-append new-emacs "/bin/emacs")))
+ (test-assert "old emacs has hierarchical layout"
+ (file-exists?
+ (string-append #$new-emacs "/lib/emacs/"
+ (emacs-effective-version old-emacs-bin)
+ "/native-lisp/"
+ (emacs-native-comp-dir old-emacs-bin)
+ "/preloaded/emacs-lisp/comp.eln")))
+ (test-assert "new emacs has hierarchical layout"
+ (file-exists?
+ (string-append #$new-emacs "/lib/emacs/"
+ (emacs-effective-version new-emacs-bin)
+ "/native-lisp/"
+ (emacs-native-comp-dir new-emacs-bin)
+ "/preloaded/emacs-lisp/comp.eln")))
+ (test-end))))
+
+ (gexp->derivation "emacs-native-comp-compatible" test))
+
+(define (package-without-replacement pkg)
+ (package (inherit pkg) (replacement #f)))
+
+(define %test-emacs-native-comp-replacable
+ (system-test
+ (name "emacs-native-comp")
+ (description "Test whether an emacs replacement (if any) is valid.")
+ (value (run-native-comp-replacable-test
+ (package-without-replacement emacs)
+ emacs))))
base-commit: e3dfed59d39ac60dd2e2b9ef9f4ef63a2a081f41
--
2.45.2
next prev parent reply other threads:[~2024-07-19 15:51 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 20:06 bug#72045: Emacs graft lookup still fails Liliana Marie Prikler
2024-07-13 5:49 ` bug#72045: [PATCH RFC 1/2] gnu: emacs: Compute ABI hash and native version dir without version Liliana Marie Prikler
2024-07-13 5:53 ` bug#72045: [PATCH 2/2] gnu: emacs-minimal: Ungraft Liliana Marie Prikler
2024-07-13 16:14 ` Suhail Singh
2024-07-13 16:59 ` Liliana Marie Prikler
2024-07-13 16:08 ` bug#72045: [PATCH RFC 1/2] gnu: emacs: Compute ABI hash and native version dir without version Suhail Singh
2024-07-13 17:26 ` Liliana Marie Prikler
2024-07-13 17:59 ` Suhail Singh
2024-07-13 23:22 ` bug#72045: Emacs graft lookup still fails Suhail Singh
2024-07-14 8:50 ` Liliana Marie Prikler
2024-07-14 16:27 ` Suhail Singh
2024-07-14 16:46 ` Liliana Marie Prikler
2024-07-14 16:56 ` Suhail Singh
2024-07-14 16:59 ` Suhail Singh
2024-07-19 7:35 ` Liliana Marie Prikler [this message]
2024-07-19 15:23 ` bug#72045: [PATCH v2 1/2] gnu: Add system test for Emacs Suhail Singh
2024-07-19 15:42 ` Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6c20a4fd1a6225f062b019d79e090399785470ea.1721377800.git.liliana.prikler@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=72045@debbugs.gnu.org \
--cc=andrew@trop.in \
--cc=cox.katherine.e+guix@gmail.com \
--cc=suhailsingh247@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).