[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: emacs-ess: Fix build (part 2).
From: |
guix-commits |
Subject: |
branch master updated: gnu: emacs-ess: Fix build (part 2). |
Date: |
Fri, 05 Jan 2024 04:58:38 -0500 |
This is an automated email from the git hooks/post-receive script.
ngz pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new cc0fb54f77 gnu: emacs-ess: Fix build (part 2).
cc0fb54f77 is described below
commit cc0fb54f7794bf770bff21c0d56c709bf2578b7f
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Fri Jan 5 10:55:25 2024 +0100
gnu: emacs-ess: Fix build (part 2).
* gnu/packages/statistics.scm (emacs-ess)[arguments]<#:phases>: Use
a different process in order to disable two tests.
This is a followup to 3c1f25fc7b3cd1942c33a48e71697f94c4c86bc2.
Change-Id: I78ee735ef7ee1dea86af602dc714d88bf8185da5
---
gnu/packages/statistics.scm | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index d5747ef9f7..712b1a9c37 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -6805,6 +6805,12 @@ Java package that provides routines for various
statistical distributions.")
(arguments
(let ((base-directory "/share/emacs/site-lisp"))
(list
+ #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ (guix build emacs-utils))
+ #:imported-modules `(,@%gnu-build-system-modules
+ (guix build emacs-build-system)
+ (guix build emacs-utils))
#:make-flags
#~(list (string-append "PREFIX=" #$output)
(string-append "ETCDIR=" #$output #$base-directory "/etc")
@@ -6828,18 +6834,26 @@ Java package that provides routines for various
statistical distributions.")
(string-append all "(skip-unless nil)\n"))
...)))))
(disable-tests (list "test/ess-test-inf.el"
- "test/ess-test-r.el"
- "test/ess-test-r-eval.el")
+ "test/ess-test-r.el")
("ess--derive-connection-path"
"ess-eval-line-test"
"ess-eval-region-test"
"ess-mock-remote-process"
"ess-r-load-ESSR-github-fetch-no"
"ess-r-load-ESSR-github-fetch-yes"
- "ess-r-eval-ns-env-roxy-tracebug-test"
- "ess-r-eval-sink-freeze-test"
"ess-set-working-directory-test"
- "ess-test-r-startup-directory")))))
+ "ess-test-r-startup-directory")))
+ ;; The two tests below use a different syntax.
+ (emacs-batch-edit-file "test/ess-test-r-eval.el"
+ '(progn
+ (mapc (lambda (test)
+ (goto-char (point-min))
+ (search-forward (format "etest-deftest %s "
test))
+ (beginning-of-line)
+ (kill-sexp))
+ '("ess-r-eval-ns-env-roxy-tracebug-test"
+ "ess-r-eval-sink-freeze-test"))
+ (basic-save-buffer)))))
(replace 'check
(lambda _ (invoke "make" "test")))))))
(native-inputs
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: emacs-ess: Fix build (part 2).,
guix-commits <=