From patchwork Fri Apr 29 05:17:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 39007 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 C679227BBEB; Fri, 29 Apr 2022 06:19:57 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 83C9127BBE9 for ; Fri, 29 Apr 2022 06:19:57 +0100 (BST) Received: from localhost ([::1]:36034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nkJ2q-0008DA-Ly for patchwork@mira.cbaines.net; Fri, 29 Apr 2022 01:19:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkJ20-0007yn-HE for guix-patches@gnu.org; Fri, 29 Apr 2022 01:19:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56743) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nkJ1z-0000js-C4 for guix-patches@gnu.org; Fri, 29 Apr 2022 01:19:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nkJ1z-0007CT-7e for guix-patches@gnu.org; Fri, 29 Apr 2022 01:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55179] [WIP PATCH 08/30] gnu: perl6-tap-harness: Update to 0.3.5. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Apr 2022 05:19:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55179 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55179@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 55179-submit@debbugs.gnu.org id=B55179.165120948927485 (code B ref 55179); Fri, 29 Apr 2022 05:19:03 +0000 Received: (at 55179) by debbugs.gnu.org; 29 Apr 2022 05:18:09 +0000 Received: from localhost ([127.0.0.1]:50600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkJ17-00079A-Dx for submit@debbugs.gnu.org; Fri, 29 Apr 2022 01:18:09 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:11356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkJ13-00077V-DY for 55179@debbugs.gnu.org; Fri, 29 Apr 2022 01:18:05 -0400 Date: Fri, 29 Apr 2022 05:17:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1651209479; bh=8uhzRcYNF9vBEHkxQvQVSda2MCUKdGa/2SvGEMTWC0Q=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=b3fdBv/ujyMpFWED+UIf3V6BEf8rtNfolhFJCC0+TIyU+j0EB6xUKAGARrXNYAZqI P5HpDohjtyz8+BlodsBHLg88ZoQCC+idGQA1zm7pcB3GoQMUPHQx5zhguoP0aZOtui IkI2E/gnakH68XE/ZB93oMwW7eUG50+jS4NuvvtGrzANHG9QVjmhBZxKoGQWmRg5ri irHvVszKKNIjgqpCsmelF+Eewz26j5kyRB+afmvWtBVbrmFLotCfnStwF1vxQTqQ0o +6CTwNo3MFxAa6zxO++1CHfPIBGijEs23gEuF7w65mGHRiRYt6VOYJVhNBGZX77mWw F/Z1SPWSbViTA== From: "Paul A. Patience" Message-ID: <20220429051700.373076-8-paul@apatience.com> In-Reply-To: <20220429051700.373076-1-paul@apatience.com> References: <20220429051700.373076-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/perl6.scm (perl6-tap-harness): Update to 0.3.5. [source]: Update URL. Reindent. [arguments]: Replace obsolete prove6 script with manual Raku invocation in 'check' phase. [home-page]: Update. [synopsis]: Replace mention of Perl with Raku. * gnu/packages/rakudo-build-system.scm (check): Replace obsolete prove6 script with manual Raku invocation. --- gnu/packages/perl6.scm | 25 ++++++++++++------------- guix/build/rakudo-build-system.scm | 6 +++++- 2 files changed, 17 insertions(+), 14 deletions(-) -- 2.36.0 diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 3dfdeec4f1..18acbdbbbd 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -680,17 +680,16 @@ (define-public perl6-svg-plot (define-public perl6-tap-harness (package (name "perl6-tap-harness") - (version "0.0.7") + (version "0.3.5") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/perl6/tap-harness6") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1lig8i0my3fgqvlay9532xslbf3iis2d7wz89gniwvwqffi2kh6r")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Raku/tap-harness6") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "162crdy8g6xhnry26pjma2panm0c79n26igmljg79al4bqj9lyc9")))) (build-system rakudo-build-system) (arguments '(#:with-zef? #f @@ -699,9 +698,9 @@ (define-public perl6-tap-harness (modify-phases %standard-phases (replace 'check (lambda _ - (invoke "perl6" "-Ilib" "bin/prove6" "-l" "t")))))) - (home-page "https://github.com/perl6/tap-harness6/") - (synopsis "TAP harness for perl6") + (invoke "raku" "-MTAP" "-Ilib" "-l" "t")))))) + (home-page "https://github.com/Raku/tap-harness6") + (synopsis "TAP harness for Raku") (description "This module provides the @command{prove6} command which runs a TAP based test suite and prints a report. The @command{prove6} command is a minimal wrapper around an instance of this module.") diff --git a/guix/build/rakudo-build-system.scm b/guix/build/rakudo-build-system.scm index 642cc570d1..8f9a3b11d8 100644 --- a/guix/build/rakudo-build-system.scm +++ b/guix/build/rakudo-build-system.scm @@ -36,7 +36,11 @@ (define-module (guix build rakudo-build-system) (define* (check #:key tests? inputs with-prove6? #:allow-other-keys) (if (and tests? (assoc-ref inputs "perl6-tap-harness")) ;(if (and tests? with-prove6?) - (invoke "prove6" "-I=lib" "t/") + (let ((test-files (find-files "t/" "\\.(rakutest|t|t6)$"))) + (invoke "raku" "-MTAP" "-e" + (string-append + "my @tests = <" (string-join test-files " ") ">; " + "TAP::Harness.new().run(@tests);"))) (format #t "test suite not run~%")) #t)