From cc0fb54f7794bf770bff21c0d56c709bf2578b7f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 5 Jan 2024 10:55:25 +0100
Subject: 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(-)

(limited to 'gnu/packages/statistics.scm')

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 @@ (define-public emacs-ess
       (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 @@ (define-public emacs-ess
                               (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
-- 
cgit v1.2.3