From patchwork Mon Dec 2 21:34:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brett Gilio X-Patchwork-Id: 16347 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 87185177FF; Mon, 2 Dec 2019 21:35:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2BE3B177ED for ; Mon, 2 Dec 2019 21:35:11 +0000 (GMT) Received: from localhost ([::1]:44800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibtLa-0003HG-LB for patchwork@mira.cbaines.net; Mon, 02 Dec 2019 16:35:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41073) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibtLU-0003Gt-AL for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibtLS-0005nk-Ay for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33086) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibtLR-0005n7-Qi for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibtLR-00018Z-O7 for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38463] [PATCH 1/2] gnu: emacs-telega: Use test suites. References: <87r21mh0pt.fsf@posteo.net> In-Reply-To: <87r21mh0pt.fsf@posteo.net> Resent-From: Brett Gilio Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2019 21:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38463 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38463@debbugs.gnu.org Received: via spool by 38463-submit@debbugs.gnu.org id=B38463.15753224884334 (code B ref 38463); Mon, 02 Dec 2019 21:35:01 +0000 Received: (at 38463) by debbugs.gnu.org; 2 Dec 2019 21:34:48 +0000 Received: from localhost ([127.0.0.1]:39056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibtLD-00017p-TG for submit@debbugs.gnu.org; Mon, 02 Dec 2019 16:34:48 -0500 Received: from mout02.posteo.de ([185.67.36.66]:48721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibtLC-00017c-B9 for 38463@debbugs.gnu.org; Mon, 02 Dec 2019 16:34:46 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 64D862400FB for <38463@debbugs.gnu.org>; Mon, 2 Dec 2019 22:34:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1575322480; bh=2Kznb2MfaMHzkYxvZPx8Zt6RizMTgwPG1KP11Ib1fj4=; h=From:To:Subject:Date:From; b=FeTP6ozFXwij1uFkK2Z+dW1y9wS7VqBeRVLACQzq7ENGkpVues3CpQHomE6LiQEun u1Kdn1ppVK6JQSeoXLRr9axcG+Dc4Woz0S5bFd5wVQbEH0JXMqHF7Peta+D7iFl0C3 MxPgrRh9hDVOPTN/YByGnHYQefEEI/rFXWFgBWh+DZj+xSqhDXLqwewrpWu5xqz6Gj F19bRHYwEl6paVjoFggVz1//blAd3ujj6LubqmQ19QwVAG6IUbJ+kYabVagAxaY/0Y +OynpaTg0e00nTY8hDpaFBjgWLuHpQ0Zo5/4ddPdoURRVHGEzQ1RoZ6BX4KVGvS8fy gsdOEjsIhrZww== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47Rdg20nMpz9rxB for <38463@debbugs.gnu.org>; Mon, 2 Dec 2019 22:34:37 +0100 (CET) From: Brett Gilio Date: Mon, 02 Dec 2019 15:34:48 -0600 Message-ID: <87mucah0nb.fsf@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 03a2617b29c92dc83828495305d73ec4074a5102 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 2 Dec 2019 15:26:27 -0600 Subject: [PATCH 1/2] gnu: emacs-telega: Use test suites. * gnu/packages/emacs-xyz.scm (emacs-telega)[arguments]: Adds support for running the ert and server test suites. --- gnu/packages/emacs-xyz.scm | 39 +++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8efa4a17c8..ad78209ebb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19974,7 +19974,7 @@ fish-completion. It can be used in both Eshell and M-x shell.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f + `(#:test-target "test" #:modules ((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) @@ -19984,17 +19984,45 @@ fish-completion. It can be used in both Eshell and M-x shell.") (guix build emacs-utils)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-patch + (add-after 'unpack 'prefix-patch (lambda _ (substitute* "server/Makefile" (("CC=cc") "CC=gcc") (("INSTALL_PREFIX=\\$\\(HOME\\)/.telega") (string-append "INSTALL_PREFIX=" (assoc-ref %outputs "out") - "/bin"))) + "/bin")) + ;; Manually invoke `run_tests.py` after install phase. + (("python3 run_tests.py") + "")) + #t)) + ;; The telega test suite checks for a version of Emacs + ;; compiled with imagemagick and svg support. Since we + ;; are using `emacs-minimal`, this step will fail. + ;; Grok the failing test, and remove problematic assertions. + (add-after 'unpack 'ert-suite-patch + (lambda _ + (substitute* "telega-core.el" + (("\\(image-type-available-p 'imagemagick\\) nil") + "t") + (("\\(image-type-available-p 'svg\\) nil") + "t")) + #t)) + ;; The server test suite has a hardcoded path. + ;; Reset this behavior to use the proper path. + (add-after 'unpack 'server-suite-patch + (lambda _ + (substitute* "server/run_tests.py" + (("~/.telega/telega-server") + (string-append (assoc-ref %outputs "out") + "/bin/telega-server"))) + #t)) + (add-after 'install 'run-server-suite + (lambda _ + (invoke "python3" "server/run_tests.py") #t)) (delete 'configure) - + ;; Build emacs-side using `emacs-build-system' (add-after 'compress-documentation 'emacs-add-source-to-load-path (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) @@ -20008,7 +20036,8 @@ fish-completion. It can be used in both Eshell and M-x shell.") `(("emacs-visual-fill-column" ,emacs-visual-fill-column))) (native-inputs `(("tdlib" ,tdlib) - ("emacs" ,emacs-minimal))) + ("emacs" ,emacs-minimal) + ("python" ,python))) (synopsis "GNU Emacs client for the Telegram messenger") (description "Telega is full-featured, unofficial client for the Telegram messaging -- 2.24.0