From patchwork Wed Dec 27 15:31:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 58102 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3288427BBE2; Wed, 27 Dec 2023 15:33:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C329427BBEA for ; Wed, 27 Dec 2023 15:33:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIVu7-0007B0-6S; Wed, 27 Dec 2023 10:33:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rIVu5-00079e-3g for guix-patches@gnu.org; Wed, 27 Dec 2023 10:33:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rIVu4-0001EE-Qw for guix-patches@gnu.org; Wed, 27 Dec 2023 10:33:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIVu3-0007GI-Bo for guix-patches@gnu.org; Wed, 27 Dec 2023 10:33:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68060] [PATCH 4/5] gnu: vim-coqtail: Allow using neovim for tests. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Dec 2023 15:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68060 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68060@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 68060-submit@debbugs.gnu.org id=B68060.170369113427830 (code B ref 68060); Wed, 27 Dec 2023 15:33:03 +0000 Received: (at 68060) by debbugs.gnu.org; 27 Dec 2023 15:32:14 +0000 Received: from localhost ([127.0.0.1]:37606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIVtD-0007Ek-T5 for submit@debbugs.gnu.org; Wed, 27 Dec 2023 10:32:14 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIVt7-0007DQ-JB for 68060@debbugs.gnu.org; Wed, 27 Dec 2023 10:32:06 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-336f2c88361so820337f8f.3 for <68060@debbugs.gnu.org>; Wed, 27 Dec 2023 07:32:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1703691121; x=1704295921; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dQT4C6gJ9/Z3bgZkUSXabj2uzHXe+1NlIEPxjNur73U=; b=RgKVq9Gx47/8mL1rimvybWytYFD7o6CnPsrVzQGoo+lqxjXrOoRElp/Het79u/jH4q QQprjn7Eqhg+wkwXw7q5HQOjxVNybVCu0sP1wsJ4wYkMuH3h9BGsUQf+lIlbYJgYIRqo u7p0gyoR5h3/XgLnFdn+4h3dAXWmQHr6Z8Kkp1Nv6APMPJz+LaV7Gsfr3WB8qES8TD3S TgwjPXYTmVE7ZFFJ73BC6r/i2h0XkUR1CY7c8IIPxB7p3V/QGPG+ry9fPrLFB9C/qfP5 MbCeFeh/GOOVlkAwjQwcODj6OvmLM8xWL4L5U79SA8DMROnGTk0rGCJGOqXHclqGCJQQ WetA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703691121; x=1704295921; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dQT4C6gJ9/Z3bgZkUSXabj2uzHXe+1NlIEPxjNur73U=; b=n6Axty2fI8Te8PcVE0L3qlwVO3Wm02DuGe+fAQye8e61umRSg+pF4UaJ5ouaLq3UKD My6l6/0vwnKKyzQHzBWfMZ4P5ryF7pEvBkxNDAWxcpdFoCgvaeWloSdbLNkI6XtSyHHZ YjaUWdNkwTAENIPRtewikZGd3DYBCKt0lnWq3fb5Lb7BgbQ5a6LkQ8zX9jjOlfwC3P44 tFIToO47ReOi80ULg6LP3I4jVlqkFFIShsTzx3Krar8J6Pm8sMK+ASiNupOCHvVaMU4S +oI5dhGSFlBZEZK5/FMQBpav9pQxV+ySBy1WxWqSLwsu3Yuon0qIwRTxfuQ06RIyu5hr y47Q== X-Gm-Message-State: AOJu0YyGvaEQqohd0ws8D71aAjY3Zj588ZimV56uNlGUbV0Wv2Z8/HD5 Gs7KeD45y4hv3sZ15D7T6RV+ArDgGT0ueuSG2Twq4lyed07Uyg== X-Google-Smtp-Source: AGHT+IE5/o5FoEHY8oYlda4fLZx+Sz3/stz35HSJqZloH0kW5kOfzOSHvjOXwIv4fsp4Mx9MtKd7Vg== X-Received: by 2002:adf:efc5:0:b0:336:b52d:30cf with SMTP id i5-20020adfefc5000000b00336b52d30cfmr3580370wrp.61.1703691120974; Wed, 27 Dec 2023 07:32:00 -0800 (PST) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id e17-20020a5d5311000000b0033672cfca96sm15025139wrv.89.2023.12.27.07.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 07:32:00 -0800 (PST) Date: Wed, 27 Dec 2023 16:31:49 +0100 Message-ID: <83ea421b25a6ee40b499d5efd7d0298685d425bd.1703690765.git.jean@foundationdevices.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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.