From patchwork Sat May 20 21:52:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 50181 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 6688127BBEA; Sat, 20 May 2023 22:53:21 +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=-2.9 required=5.0 tests=BAYES_00,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 4A81327BBE2 for ; Sat, 20 May 2023 22:53:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0UVb-0007Eq-R8; Sat, 20 May 2023 17:53:03 -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 1q0UVb-0007ES-7U for guix-patches@gnu.org; Sat, 20 May 2023 17:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0UVa-0005lY-Vk for guix-patches@gnu.org; Sat, 20 May 2023 17:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q0UVa-0006lL-QW for guix-patches@gnu.org; Sat, 20 May 2023 17:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63618] [PATCH WIP] gnu: socat: Enable tests. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 May 2023 21:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63618@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 63618-submit@debbugs.gnu.org id=B63618.168461956625967 (code B ref 63618); Sat, 20 May 2023 21:53:02 +0000 Received: (at 63618) by debbugs.gnu.org; 20 May 2023 21:52:46 +0000 Received: from localhost ([127.0.0.1]:59485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0UVJ-0006kk-W2 for submit@debbugs.gnu.org; Sat, 20 May 2023 17:52:46 -0400 Received: from smtpm5.myservices.hosting ([185.26.105.236]:43538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0UVH-0006kb-IA for 63618@debbugs.gnu.org; Sat, 20 May 2023 17:52:44 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id A00F320CF1 for <63618@debbugs.gnu.org>; Sat, 20 May 2023 23:52:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id D8CCF80097; Sat, 20 May 2023 23:52:41 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id i_qd0Gd3DJmO; Sat, 20 May 2023 23:52:40 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id AA76680060; Sat, 20 May 2023 23:52:40 +0200 (CEST) From: Bruno Victal Date: Sat, 20 May 2023 22:52:36 +0100 Message-Id: <7c25727597e6730d9caf4f5e9b1b69d8fefd44f5.1684619533.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 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: , 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/networking.scm (socat)[arguments]: Enable tests. [native-inputs]: Add test dependencies: net-tools, which and procps. --- gnu/packages/networking.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) base-commit: cebf0e36d1e5439f43046ec3d6d995fb18f27218 diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 85fb352ebf..4a2ed0e8a5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1204,9 +1204,25 @@ (define-public socat version ".tar.bz2")) (sha256 (base32 - "01w0hpqf5xmgn40s1ablfd4y67dlrx5y9zlx24spc1qm8h81hwyl")))) + "01w0hpqf5xmgn40s1ablfd4y67dlrx5y9zlx24spc1qm8h81hwyl")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "test.sh" + (("/sbin/ifconfig") "ifconfig") + (("^/bin/rm") "rm")))))) (build-system gnu-build-system) - (arguments '(#:tests? #f)) ; no test suite + (arguments + (list + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-test-shebangs + (lambda* (#:key inputs #:allow-other-keys) + ;; test.sh embeds some shell scripts. + (substitute* "test.sh" + (("/usr/bin/env") (search-input-file inputs "/bin/env")))))))) + (native-inputs (list net-tools which procps)) ; for tests (inputs (list openssl)) (home-page "http://www.dest-unreach.org/socat/") (synopsis