From patchwork Wed Aug 18 20:27:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robby Zambito X-Patchwork-Id: 32176 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 CA52B27BC78; Wed, 18 Aug 2021 21:57:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 70C8E27BC6B for ; Wed, 18 Aug 2021 21:57:10 +0100 (BST) Received: from localhost ([::1]:46522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGScX-0004GF-Ez for patchwork@mira.cbaines.net; Wed, 18 Aug 2021 16:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGScQ-0004G4-UL for guix-patches@gnu.org; Wed, 18 Aug 2021 16:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGScQ-0007C1-My for guix-patches@gnu.org; Wed, 18 Aug 2021 16:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mGScQ-0006kg-G4 for guix-patches@gnu.org; Wed, 18 Aug 2021 16:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50084] [PATCH v2] gnu: waypipe: Enable tests. Resent-From: Robby Zambito Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Aug 2021 20:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50084 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50084@debbugs.gnu.org Cc: Robby Zambito Received: via spool by 50084-submit@debbugs.gnu.org id=B50084.162932018525909 (code B ref 50084); Wed, 18 Aug 2021 20:57:02 +0000 Received: (at 50084) by debbugs.gnu.org; 18 Aug 2021 20:56:25 +0000 Received: from localhost ([127.0.0.1]:57717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mGSbl-0006jl-Bo for submit@debbugs.gnu.org; Wed, 18 Aug 2021 16:56:25 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:40865) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mGSJh-0004Aj-6C for 50084@debbugs.gnu.org; Wed, 18 Aug 2021 16:37:42 -0400 Received: (Authenticated sender: contact@robbyzambito.me) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 2935F40004; Wed, 18 Aug 2021 20:37:33 +0000 (UTC) From: Robby Zambito Date: Wed, 18 Aug 2021 16:27:11 -0400 Message-Id: <20210818202710.55244-1-contact@robbyzambito.me> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210817015308.353224-1-contact@robbyzambito.me> References: <20210817015308.353224-1-contact@robbyzambito.me> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 18 Aug 2021 16:56:19 -0400 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xdisorg.scm (waypipe): Don't skip tests. Add dependencies required to run the tests. --- This is my first contribution to guix, I was not aware of how to do what was needed to properly pass the tests for this package. After consulting #guix on IRC, I have believe I have made the necessary changes. gnu/packages/xdisorg.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d79f580b47..ba520d35ae 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -881,13 +881,24 @@ include cursor in the resulting image.") (sha256 (base32 "1qa47ljfvb1vv3h647xwn1j5j8gfmcmdfaz4j8ygnkvj36y87vnz")))) (build-system meson-build-system) - ;; One test fails where the program does not exit cleanly given a bad - ;; setup. Not ideal but probably safe to ignore. Check that no other tests - ;; fail before bumping the version. If all tests pass, remove this. (arguments `(#:phases (modify-phases %standard-phases - (delete 'check)))) + (add-after 'unpack 'fix-sleep-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (coreutils (assoc-ref inputs "coreutils"))) + (substitute* "./test/startup_failure.py" + (("sleep") + (string-append coreutils "/bin/sleep"))) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) + (inputs + ;; For tests + `(("python" ,python) + ("coreutils" ,coreutils))) (home-page "https://gitlab.freedesktop.org/mstoeckl/waypipe") (synopsis "Proxy for Wayland protocol applications") (description "Waypipe is a proxy for Wayland clients, with the aim of