From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2NaaEG3LvWNAowAAbAwnHQ (envelope-from ) for ; Tue, 10 Jan 2023 21:32:45 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id eI2aD23LvWOxWQAAG6o9tA (envelope-from ) for ; Tue, 10 Jan 2023 21:32:45 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 83016869F for ; Tue, 10 Jan 2023 21:32:44 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFLI3-0001HO-LG; Tue, 10 Jan 2023 15:32:11 -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 1pFLHv-0001Bc-Cw for guix-patches@gnu.org; Tue, 10 Jan 2023 15:32:03 -0500 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 1pFLHu-0004Y1-DH for guix-patches@gnu.org; Tue, 10 Jan 2023 15:32:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFLHu-0002eF-6P for guix-patches@gnu.org; Tue, 10 Jan 2023 15:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59487] [PATCH 1/2] build-system/dune: Automatically deduce test-target in most cases. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Jan 2023 20:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59487 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: raingloom Cc: Julien Lepiller , 59487@debbugs.gnu.org Received: via spool by 59487-submit@debbugs.gnu.org id=B59487.167338266910114 (code B ref 59487); Tue, 10 Jan 2023 20:32:02 +0000 Received: (at 59487) by debbugs.gnu.org; 10 Jan 2023 20:31:09 +0000 Received: from localhost ([127.0.0.1]:41233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFLH1-0002d2-HE for submit@debbugs.gnu.org; Tue, 10 Jan 2023 15:31:09 -0500 Received: from mout02.posteo.de ([185.67.36.66]:45187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFLGv-0002c6-SR for 59487@debbugs.gnu.org; Tue, 10 Jan 2023 15:31:05 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 82CD7240164 for <59487@debbugs.gnu.org>; Tue, 10 Jan 2023 21:30:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673382655; bh=2jd/RJKGxfm7I9BzPJLkw+4Unbr9WwLMWUrFvm6SyxI=; h=From:To:Cc:Subject:Date:From; b=gPCAHpMyCKzBlbEE0XyuBSprxsUwKui2uS0vUNeOiORr3X6DEyTJMj3PK78M1I/kq CcXuBlFDA8T276nxsPz+MSUoU/iuvOncs3BUBNxnOwYCieWzbOyLjgspgP/n/2v1F0 SQBta+R6061lmQKeV0uWkut2tgFl6QxQjd0hkqBGwzs48OR2kJaGKuYqQ6Vs+bx4aZ jeZGAZ3xRpabpLNJiPHiIHGIT9OpY+T2sUid4T6AbcJrSMkk64UJSh8ZPzjr9V+fSu cD/piWBvNrbYhPPM0y8k+xYsuJFfbqoCwgx2r0MoKduBsfjf/eEe5Vi0J+L4XERCNn SkDDFdpMut4tw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ns2Wf2lCQz9rxF; Tue, 10 Jan 2023 21:30:54 +0100 (CET) References: <20221122194712.31515-1-raingloom@riseup.net> From: pukkamustard Date: Tue, 10 Jan 2023 20:24:50 +0000 In-reply-to: <20221122194712.31515-1-raingloom@riseup.net> Message-ID: <86eds2nncy.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673382765; a=rsa-sha256; cv=none; b=XAcWdmffUyYQGeoHVeRctpbiovNQ4bMWKlPXec1j8FBG0xKddlxBqfFF0/3V0PO5j0Iaue msx2dqF1yac+vXb5HmO0h/esSoDPRqQJxIPxmyMaWWgkPqDW/WfFQwgEFqn4/qUOLNu+vH AMJvVJVjMpBB+JOjk4Vru0LJiSBwZ3a0WgTN521fLKAE79tWRMAj1rkKdc3fopsqPFXkUW G8zYwBeTsXeQBjw0Sb1zvp30uaOjHOojan9DIWV3juIv5QuwB9FrP8l4GPTkH9a4sCpRZn wV+yAnC6CMTVmCg1AUkDIbP2KSdLAPieQoBZXaj++xbMQL5lwI2lDnnh+wqZQw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=gPCAHpMy; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673382765; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=rDm4okojqzE6W2VZi7iAgltc+HyD0r30m9o8z/UmbrU=; b=sY96Qm8FWRDczVqjtq7WdcO8qL5H+l187EW1yGOX8jKtJ0Gl4rJLHrA+3fphDxqSDREIe8 VpQNvw25a9fg/Ebcq5RK/jl8MzWEyf2yFQYqn3fLr4sG3Oy3Hx3FIDvg64ciuGvwwEBocR ZF3w5uqxmkgHFwbRVoyTzDmntiooALZ9ztmwGp46Dls/vUXt/fMHPrmDh8WAOvmkgFS9W8 3MaTjrFpuZrhbLDP2MxeoAxnJu3rUO2rC7wvQLdFKg748tw8J9t0eWC0NlTWENzEpk02t3 J+PFtTsnwh/mlS9AQszgeWm3MMhTdvcUcTkdkFdAkNlXU7/SdSu4vBDwjd6qew== X-Migadu-Spam-Score: -2.18 X-Spam-Score: -2.18 X-Migadu-Queue-Id: 83016869F X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=gPCAHpMy; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) X-TUID: 7S/EXigvKtI1 Hi! Sorry, I missed these patches and only found them after realizing that your Mirage patches require these. I'm having trouble applying the second patch (of V2), maybe there have been changes that cause conflicts? Could you rebase on master or just resend the V2 patches to 59487@debbugs.gnu.org? Maybe with a short comment if and how they address Julien's suggestion? -pukkamustard raingloom writes: > guix/build-system/dune.scm (dune-build): tests? defaults to #f. > guix/build/dune-build-system.scm (check): Missing test-target is auto-detected. > --- > guix/build-system/dune.scm | 2 +- > guix/build/dune-build-system.scm | 9 +++++++-- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm > index 12100fd8e8..b531d3c337 100644 > --- a/guix/build-system/dune.scm > +++ b/guix/build-system/dune.scm > @@ -107,7 +107,7 @@ (define* (dune-build name inputs > (dune-release-flags ''()) > (tests? #t) > (test-flags ''()) > - (test-target "test") > + (test-target #f) > (install-target "install") > (validate-runpath? #t) > (patch-shebangs? #t) > diff --git a/guix/build/dune-build-system.scm b/guix/build/dune-build-system.scm > index e9ccc71057..8a3725a4e9 100644 > --- a/guix/build/dune-build-system.scm > +++ b/guix/build/dune-build-system.scm > @@ -42,12 +42,17 @@ (define* (build #:key (build-flags '()) (jbuild? #f) > build-flags))) > #t) > > -(define* (check #:key (test-flags '()) (test-target "test") tests? > +(define* (check #:key (test-flags '()) (test-target #f) tests? > (jbuild? #f) (package #f) (dune-release-flags '()) > #:allow-other-keys) > "Test the given package." > (when tests? > - (let ((program (if jbuild? "jbuilder" "dune"))) > + (let ((program (if jbuild? "jbuilder" "dune")) > + (test-target (or test-target > + (cond > + ((file-exists? "tests") "tests") > + ((file-exists? "test") "test") > + (else "."))))) > (apply invoke program "runtest" test-target > (append (if package (list "-p" package) > dune-release-flags)