From patchwork Thu Dec 21 05:28:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaeme Sifat X-Patchwork-Id: 57941 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 C7B4E27BBE9; Thu, 21 Dec 2023 05:31:22 +0000 (GMT) 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,FREEMAIL_FROM,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 C740F27BBE2 for ; Thu, 21 Dec 2023 05:31:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGBe9-00008F-FY; Thu, 21 Dec 2023 00:31:01 -0500 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 1rGBe8-000084-3t for guix-patches@gnu.org; Thu, 21 Dec 2023 00:31:00 -0500 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 1rGBe7-0001DR-LV for guix-patches@gnu.org; Thu, 21 Dec 2023 00:30:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rGBeA-0007rb-6E; Thu, 21 Dec 2023 00:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67947] [PATCH 1/3] guix: build-system: cargo: Add cargo-skip-tests. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Thu, 21 Dec 2023 05:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67947@debbugs.gnu.org Cc: Jaeme Sifat , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 67947-submit@debbugs.gnu.org id=B67947.170313663827539 (code B ref 67947); Thu, 21 Dec 2023 05:31:02 +0000 Received: (at 67947) by debbugs.gnu.org; 21 Dec 2023 05:30:38 +0000 Received: from localhost ([127.0.0.1]:42230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGBdl-00079I-Pj for submit@debbugs.gnu.org; Thu, 21 Dec 2023 00:30:38 -0500 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:42418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGBdj-0006tA-QQ for 67947@debbugs.gnu.org; Thu, 21 Dec 2023 00:30:36 -0500 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1rGBda-000Zju-0n for 67947@debbugs.gnu.org; Thu, 21 Dec 2023 06:30:26 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=selector2; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To :Message-ID:Date:Subject:Cc:To:From; bh=m3SYMzewRF5DPXhMRjD2BQq4TBIXqGAZG84Cq1QRQCc=; b=W6TyAgczB/Ur2F3vN9EI4udQGO JnpAwgYYET9C03kex2xVZvOocpuk9p41oSf5gXQyMB6+75DcXazad8cfzv+cVzjkpIhfm/TtEcfGy woSGnzOJJ7yX5WXJTsLvIwjmLWDj2HuBMaJ9gxxnGosxk0uk35qA4/sACFkUKyr/oVzFr5/rg/uJJ uaBq+MnWdJEMLqkLwGbh7et5lGWjX2SopYyENwQXo5oUiSJ6ox2bMIAEMUmorGjmAtvMllqnEEYXz CBwX2ZNIiNMXKMU9T/6q16E2Xeik0FLS7Rcifmw/XEDK5HK3kJgmZFu+LXprDW81Xf2BUqJpA1SJW PTf18fIA==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rGBdZ-0003fu-HW for 67947@debbugs.gnu.org; Thu, 21 Dec 2023 06:30:25 +0100 Received: by submission03.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rGBdP-008kIc-VV; Thu, 21 Dec 2023 06:30:16 +0100 Date: Thu, 21 Dec 2023 00:28:40 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 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: , Reply-to: Jaeme Sifat X-ACL-Warn: , Jaeme Sifat via Guix-patches X-Patchwork-Original-From: Jaeme Sifat via Guix-patches via From: Jaeme Sifat 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 The #:cargo-skip-tests key accepts a list of strings that represent the names of tests to be skipped by passing the "--skip=" to cargo test. This is so that the packager doesn't have to edit #:cargo-test-flags directly when trying to skip tests. * guix/build-system/cargo.scm (cargo-build): Add cargo-skip-tests. * guix/build-system/cargo.scm (builder): Add cargo-skip-tests. * guix/build-system/cargo.scm (cargo-cross-build): Add cargo-skip-tests. * guix/build/cargo-build-system.scm (check): Add cargo-skip-tests. Change-Id: I2f64370cf29b9495a33a8e072ab930b8635e742d --- guix/build-system/cargo.scm | 4 ++++ guix/build/cargo-build-system.scm | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index c029cc1dda..d2a45f0609 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -86,6 +86,7 @@ (define* (cargo-build name inputs (vendor-dir "guix-vendor") (cargo-build-flags ''("--release")) (cargo-test-flags ''("--release")) + (cargo-skip-tests ''()) (cargo-package-flags ''("--no-metadata" "--no-verify")) (features ''()) (skip-build? #f) @@ -112,6 +113,7 @@ (define* (cargo-build name inputs #:vendor-dir #$vendor-dir #:cargo-build-flags #$(sexp->gexp cargo-build-flags) #:cargo-test-flags #$(sexp->gexp cargo-test-flags) + #:cargo-skip-tests #$(sexp->gexp cargo-skip-tests) #:cargo-package-flags #$(sexp->gexp cargo-package-flags) #:features #$(sexp->gexp features) #:skip-build? #$skip-build? @@ -141,6 +143,7 @@ (define* (cargo-cross-build name (vendor-dir "guix-vendor") (cargo-build-flags ''("--release")) (cargo-test-flags ''("--release")) + (cargo-skip-tests ''()) (cargo-package-flags ''("--no-metadata" "--no-verify")) (features ''()) (skip-build? #f) @@ -169,6 +172,7 @@ (define* (cargo-cross-build name #:vendor-dir #$vendor-dir #:cargo-build-flags #$(sexp->gexp cargo-build-flags) #:cargo-test-flags #$(sexp->gexp cargo-test-flags) + #:cargo-skip-tests #$(sexp->gexp cargo-skip-tests) #:cargo-package-flags #$(sexp->gexp cargo-package-flags) #:features #$(sexp->gexp features) #:skip-build? #$skip-build? diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index ffb2ec898e..7cdb2a72d3 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -258,11 +258,19 @@ (define* (build #:key (define* (check #:key tests? + cargo-skip-tests (cargo-test-flags '("--release")) #:allow-other-keys) "Run tests for a given Cargo package." (if tests? - (apply invoke "cargo" "test" cargo-test-flags) + (if cargo-skip-tests + (let ((test-lst (map (lambda (test) + (string-append "--skip=" test)) + cargo-skip-tests))) + (apply invoke "cargo" "test" (append + cargo-test-flags + (cons* "--" test-lst)))) + (apply invoke "cargo" "test" cargo-test-flags)) #t)) (define* (package #:key