From patchwork Tue Apr 22 10:31:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 41922 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 30A5827BC4B; Tue, 22 Apr 2025 11:33:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 473A427BC49 for ; Tue, 22 Apr 2025 11:33:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7Aw7-0000J6-2v; Tue, 22 Apr 2025 06:33:07 -0400 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 1u7Aw4-0000Ii-QZ for guix-patches@gnu.org; Tue, 22 Apr 2025 06:33:05 -0400 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 1u7Aw4-0000yc-Fy for guix-patches@gnu.org; Tue, 22 Apr 2025 06:33:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=fK3z5IHeMtPTq437xYIKS+hh9oKMgmwHfzPRosc/xqU=; b=CXJCkTevtpHVnA2W/RIHYbqfObuXt5tLKnu6zCyx2sOOmU0DTnTheY65TjiQdhBZjZtL5PSux1gNy1D/elUn9t1eMhNpQ70PmYJ3+X+2H0YPg8VdnNVfPkJ4CJAf81P4bpwfj06+t65CuiVFbUNrVYQghoFiN3ZuQsSQr/fAsznIjGoBb8hIFrvJYtK4zftILsm5ryLJjYmHO2c2slrLk3wz+vCgq1cDBZmSOMvaiKyw4hKjluOrMtsQvpA+rSaRliQ4AI5dc47EisF9FmpBuiaxRhGr07VucHlm/AayYookno/WoZHsECDTwBH3jPGR1hIfG6hZ12rPWzni3piAGQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7Aw1-0007Gd-WC; Tue, 22 Apr 2025 06:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76686] [PATCH emacs-team] gnu: emacs-plantuml-mode: Fix tests. References: In-Reply-To: Resent-From: Cayetano Santos Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, csantosb@inventati.org, divya@subvertising.org, hako@ultrarare.space, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 22 Apr 2025 10:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76686@debbugs.gnu.org Cc: Cayetano Santos , Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 76686-submit@debbugs.gnu.org id=B76686.174531792427727 (code B ref 76686); Tue, 22 Apr 2025 10:33:01 +0000 Received: (at 76686) by debbugs.gnu.org; 22 Apr 2025 10:32:04 +0000 Received: from localhost ([127.0.0.1]:46087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7Av5-0007D6-7J for submit@debbugs.gnu.org; Tue, 22 Apr 2025 06:32:03 -0400 Received: from devianza.investici.org ([2c0f:f930:0:4::108]:51295) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7Av1-0007C3-D1 for 76686@debbugs.gnu.org; Tue, 22 Apr 2025 06:32:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1745317915; bh=fK3z5IHeMtPTq437xYIKS+hh9oKMgmwHfzPRosc/xqU=; h=From:To:Cc:Subject:Date:From; b=ltv6CtPRJcq4Z3zE91y4Z61ZrcgBNyfN7hYDLBcVTmBZy4o7Rns+qBFgEy78hi6RT uvn161QHgpedd7GbK5rfid8YG53bzlYxUfWVvu1FKptSNhRHqDs76D0f7zfar1K5vQ Blx5gLxqrQ9xk9m4B0tCPR2gj4EywngBrmvfDsiM= Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id 4Zhdp374bjz6v6K; Tue, 22 Apr 2025 10:31:55 +0000 (UTC) Received: from [198.167.222.108] (mx2.investici.org [198.167.222.108]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4Zhdp35Yl3z6v6J; Tue, 22 Apr 2025 10:31:55 +0000 (UTC) Date: Tue, 22 Apr 2025 12:31:40 +0200 Message-ID: <05543b633e139c051a0b2ada3e0b6d8dad4830b8.1745317900.git.csantosb@inventati.org> X-Mailer: git-send-email 2.49.0 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: Cayetano Santos X-ACL-Warn: , Cayetano Santos via Guix-patches X-Patchwork-Original-From: Cayetano Santos via Guix-patches via From: Cayetano Santos 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/emacs-xyz.scm (emacs-plantuml-mode): Fix tests. Change-Id: I17fe62eddcb683a81ad19dc7fa4ea5dced7c5cbd --- gnu/packages/emacs-xyz.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) base-commit: 5e1ae1d2041255cb0da37071482f2af86ed84ba3 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ad9add40f5..6d19b53fe9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -40856,8 +40856,22 @@ (define-public emacs-plantuml-mode (sha256 (base32 "0yp41d2dmf3sx7qnl5x0zdjcr9y71b2wwc9m0q31v22xqn938ipc")))) (arguments - '(#:phases + '(#:test-command '("make" "unit") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + (let* ((plantuml (assoc-ref inputs "plantuml")) + (jar (string-append plantuml "/share/java/plantuml.jar"))) + (emacs-substitute-variables "test/test-helper.el" + ("plantuml-test-jar-path" jar)) + (substitute* "test/plantuml-mode-test.el" + (("\\~\\/plantuml\\.jar") jar))) + ;; Do not use cask to run tests. + (substitute* "Makefile" + (("\\$\\{CASK\\} exec ") "")) + ;; returns PLANTUML Preview failed: exited abnormally with code 1 + (delete-file "test/plantuml-preview-test.el"))) (add-after 'unpack 'use-local-plantuml (lambda* (#:key inputs #:allow-other-keys) (let ((plantuml (assoc-ref inputs "plantuml")) @@ -40882,6 +40896,7 @@ (define-public emacs-plantuml-mode (list plantuml)) (propagated-inputs (list emacs-dash)) + (native-inputs (list emacs-ert-runner icedtea)) (build-system emacs-build-system) (home-page "https://github.com/skuro/plantuml-mode") (synopsis "Major mode for editing PlantUML sources")