unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Jean-Pierre De Jesus DIAZ via Guix-patches via <guix-patches@gnu.org>
To: 68060@debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean@foundationdevices.com>
Subject: [bug#68060] [PATCH 4/5] gnu: vim-coqtail: Allow using neovim for tests.
Date: Wed, 27 Dec 2023 16:31:49 +0100	[thread overview]
Message-ID: <83ea421b25a6ee40b499d5efd7d0298685d425bd.1703690765.git.jean@foundationdevices.com> (raw)
In-Reply-To: <cover.1703690765.git.jean@foundationdevices.com>

* gnu/packages/vim.scm (vim-coqtail): Allow using neovim for tests.

Change-Id: I114b07dd9cf525a5571a37f51b2e6b2a57d5be46
---
 gnu/packages/vim.scm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index e27feb13f7..5f211b120d 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -475,7 +475,8 @@ (define-public vim-coqtail
          #:phases
          (modify-phases %standard-phases
            (add-before 'install 'check
-             (lambda* (#:key inputs native-inputs tests? #:allow-other-keys)
+             (lambda* (#:key inputs native-inputs tests? vim? neovim?
+                       #:allow-other-keys)
                (when tests?
                  (display "Running Python unit tests.\n")
                  (setenv "PYTHONPATH" (string-append (getcwd) "/python"))
@@ -489,12 +490,19 @@ (define-public vim-coqtail
                                               "vim-vader"))
                         (vader-path (string-append
                                       vim-vader
-                                      "/share/vim/vimfiles/pack/guix/start/vader")))
+                                      (if vim?
+                                        "/share/vim/vimfiles"
+                                        "/share/nvim/site")
+                                      "/pack/guix/start/vader"))
+                        (command `(,@(if vim? '("vim" "-E") '())
+                                   ,@(if neovim? '("nvim" "--headless") '())
+                                   "-Nu" "vimrc"
+                                   "-c" "Vader! *.vader")))
                    (with-directory-excursion "tests/vim"
+                     (when neovim?
+                       (setenv "HOME" (getcwd)))
                      (setenv "VADER_PATH" vader-path)
-                     (invoke "vim"
-                             "-E" "-Nu" "vimrc"
-                             "-c" "Vader! *.vader")))
+                     (apply invoke command)))
 
                  ;; Remove __pycache__ files generated during testing so that
                  ;; they don't get installed.
-- 
2.41.0





  parent reply	other threads:[~2023-12-27 15:33 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-27 15:28 [bug#68060] [PATCH 0/5] gnu: Add neovim-coqtail Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-12-27 15:31 ` [bug#68060] [PATCH 1/5] gnu: vim-vader: Allow using neovim for tests Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-12-27 15:31 ` [bug#68060] [PATCH 2/5] gnu: Add neovim-vader Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-12-27 15:31 ` [bug#68060] [PATCH 3/5] gnu: vim-coqtail: Move vim-full to arguments Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-12-27 15:31 ` Jean-Pierre De Jesus DIAZ via Guix-patches via [this message]
2023-12-27 15:31 ` [bug#68060] [PATCH 5/5] gnu: Add neovim-coqtail Jean-Pierre De Jesus DIAZ via Guix-patches via
2024-01-01  9:00 ` bug#68060: [PATCH 0/5] " Efraim Flashner

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=83ea421b25a6ee40b499d5efd7d0298685d425bd.1703690765.git.jean@foundationdevices.com \
    --to=guix-patches@gnu.org \
    --cc=68060@debbugs.gnu.org \
    --cc=jean@foundationdevices.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).