From unknown Mon Jun 23 20:18:26 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#59487 <59487@debbugs.gnu.org> To: bug#59487 <59487@debbugs.gnu.org> Subject: Status: [PATCH 1/2] build-system/dune: Automatically deduce test-target in most cases. Reply-To: bug#59487 <59487@debbugs.gnu.org> Date: Tue, 24 Jun 2025 03:18:26 +0000 retitle 59487 [PATCH 1/2] build-system/dune: Automatically deduce test-targ= et in most cases. reassign 59487 guix-patches submitter 59487 raingloom severity 59487 normal tag 59487 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 22 14:47:49 2022 Received: (at submit) by debbugs.gnu.org; 22 Nov 2022 19:47:49 +0000 Received: from localhost ([127.0.0.1]:52579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxZFF-0000VX-2O for submit@debbugs.gnu.org; Tue, 22 Nov 2022 14:47:49 -0500 Received: from lists.gnu.org ([209.51.188.17]:58004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxZFD-0000VL-KT for submit@debbugs.gnu.org; Tue, 22 Nov 2022 14:47:48 -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 1oxZFD-0004Lz-Dk for guix-patches@gnu.org; Tue, 22 Nov 2022 14:47:47 -0500 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxZF9-0005U6-ST for guix-patches@gnu.org; Tue, 22 Nov 2022 14:47:46 -0500 Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4NGvtH43BLz9rxw for ; Tue, 22 Nov 2022 19:47:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1669146455; bh=KOrPrVRRbJ9wuWK618gzP/Z9eV0DUpzlQl1JWlD9XdA=; h=From:To:Cc:Subject:Date:From; b=rHVrrayravJKpirH+AAXLl2jhx18exzfobJIQIbZR+uXWBWXuJ0gZ20uF/38lLRc/ hVBVZABny6uLuOX6Pl2JNqyxMF4UWLwwzfwa88IcrsLkHxlcmKwbVlUx/exniOLkiU ebUoeBhyj3zpgO0sfRHdHD2v8sA38QkZzYE73IJc= X-Riseup-User-ID: 46E8C14D0E2B56ECBB778A21436A87928694784B40C4B7F2A8F4668325DE8623 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4NGvtG4z2rz21FS; Tue, 22 Nov 2022 19:47:34 +0000 (UTC) From: raingloom To: guix-patches@gnu.org Subject: [PATCH 1/2] build-system/dune: Automatically deduce test-target in most cases. Date: Tue, 22 Nov 2022 20:47:11 +0100 Message-Id: <20221122194712.31515-1-raingloom@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=198.252.153.6; envelope-from=raingloom@riseup.net; helo=mx0.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 22 15:26:20 2022 Received: (at 59487) by debbugs.gnu.org; 22 Nov 2022 20:26:20 +0000 Received: from localhost ([127.0.0.1]:52633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxZqV-0001UO-SI for submit@debbugs.gnu.org; Tue, 22 Nov 2022 15:26:20 -0500 Received: from lepiller.eu ([89.234.186.109]:54476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxZqS-0001UE-Ti for 59487@debbugs.gnu.org; Tue, 22 Nov 2022 15:26:18 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 519d7252; Tue, 22 Nov 2022 20:26:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=A1oFgBtUjuTX Ir6POGLsXAa41NDbG5W0+0T3cqV3iII=; b=LXH5zYKZk2jVAF0X7yIUYHgfdBEE N9kOd1X/w6mOEVayuhSlnqkHkxVHD60dQIgLZ4UOgMZs6p/wpzWoN1vHu8nKHjwe eTxXz1mxiCUGaRKJm1msqud85/vLXjeAivKjndepXL4jV2SXxEhtBbIoMiqNKvaW 5VRma3yQ7ytX12zTdiM87unbf0+BBJuwS1O5hWhSYmj9rOCvzqU0yiz4SkrAO1Qw wZqpxidTcP/4k7I5nr/Q71qsFkZH4aU8U2M9kRFn/69RDhHkZCbf5RQXiikUGdi/ imRLer2SBWKe99LqDs329lx7orFD7nq1QmCadkpHQIGCQe0V47o0bya8WA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 847fbce1 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Tue, 22 Nov 2022 20:26:14 +0000 (UTC) Date: Tue, 22 Nov 2022 21:26:13 +0100 From: Julien Lepiller To: raingloom Subject: Re: [bug#59487] [PATCH 1/2] build-system/dune: Automatically deduce test-target in most cases. Message-ID: <20221122212613.7acbdd05@sybil.lepiller.eu> In-Reply-To: <20221122194712.31515-1-raingloom@riseup.net> References: <20221122194712.31515-1-raingloom@riseup.net> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59487 Cc: 59487@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! This LGTM, but maybe put test-target inside the cond too, so we can remove the or? I've looked at how opam does things, and this seems to be the norm: ["dune" "runtest" "-p" name "-j" jobs] Maybe this would work better: (apply invoke program "runtest" (append (if test-target (list test-target) '()) ...)) WDYT? Le Tue, 22 Nov 2022 20:47:11 +0100, raingloom a =C3=A9crit : > 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(-) >=20 > 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) > =20 > -(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) From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 11 19:08:33 2022 Received: (at 59487) by debbugs.gnu.org; 12 Dec 2022 00:08:33 +0000 Received: from localhost ([127.0.0.1]:49005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4WMz-0004zF-4d for submit@debbugs.gnu.org; Sun, 11 Dec 2022 19:08:33 -0500 Received: from mx1.riseup.net ([198.252.153.129]:53374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4WMw-0004z7-KL for 59487@debbugs.gnu.org; Sun, 11 Dec 2022 19:08:30 -0500 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4NVhmT1cvSzDqQw; Mon, 12 Dec 2022 00:08:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1670803705; bh=WfqYWIunxD7T4IZBtKzX0OqnsZdl7Ky5Sf9GEsiusfQ=; h=From:To:Cc:Subject:Date:From; b=Z32WWoLBrL1HyMmkESbqrPEXIJLWPZBmrwyUMavCRI7p/Gk32nwnRVsSO8/XYaUG+ L9NRsH1fMetZSaGYr52jzXC6ekwr0PY+1ZhfwGwS8c9e4ouUKhfth5aTo8Xs04Yt/K nS9ceYWxb3TAo/sq/FtItNFNTNY8vTs2eWWHcLd8= X-Riseup-User-ID: 14814B0792C35106E6D49B1D0A344CEA6D2B5B36C26E08BB409CB5AD694D9A80 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4NVhmS0QYZz5vXH; Mon, 12 Dec 2022 00:08:23 +0000 (UTC) From: raingloom To: guix-patches@gnu.org Subject: [PATCH v2 1/2] build-system/dune: Automatically deduce test-target in most cases. Date: Mon, 12 Dec 2022 00:07:46 +0000 Message-Id: <20221212000747.24632-1-raingloom@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59487 Cc: raingloom , 59487@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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 | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 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..e1337a3f82 100644 --- a/guix/build/dune-build-system.scm +++ b/guix/build/dune-build-system.scm @@ -42,14 +42,20 @@ (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"))) - (apply invoke program "runtest" test-target - (append (if package (list "-p" package) + (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" + (append (if test-target (list test-target) '()) + (if package (list "-p" package) dune-release-flags) test-flags)))) #t) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 11 19:08:41 2022 Received: (at 59487) by debbugs.gnu.org; 12 Dec 2022 00:08:41 +0000 Received: from localhost ([127.0.0.1]:49013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4WN6-0004zj-25 for submit@debbugs.gnu.org; Sun, 11 Dec 2022 19:08:41 -0500 Received: from mx0.riseup.net ([198.252.153.6]:53006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4WN0-0004z8-JL for 59487@debbugs.gnu.org; Sun, 11 Dec 2022 19:08:35 -0500 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4NVhmY1DlLz9scH; Mon, 12 Dec 2022 00:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1670803709; bh=daS2ZDWWApqtCANv6McbTAFqNF+czgQe3GY+o8gHmQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LoR4/CQnt59Gzr3mnnZpNs/sGYmQi4MXrhoPIaytkhm8LjlzItb0ZRCJK+sTJ99Wq 3bQFfQLJoMH59e6SRY1oqbxYiOA7VPtogOG7IcJcczPAHsJz/LEvxAqaIDyRm1yTtn RipR+ChNIacWjGk+uif36LFwZ83u3WNGr4zG66MA= X-Riseup-User-ID: B7DE6D712A1620EFB4A28CC4FC605A15807CFDB32BB5DE866CD3E39E6FD47571 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4NVhmX0YYNz5vRk; Mon, 12 Dec 2022 00:08:27 +0000 (UTC) From: raingloom To: guix-patches@gnu.org Subject: [PATCH v2 2/2] gnu: Remove explicit test-target arguments in ocaml.scm. Date: Mon, 12 Dec 2022 00:07:47 +0000 Message-Id: <20221212000747.24632-2-raingloom@riseup.net> In-Reply-To: <20221212000747.24632-1-raingloom@riseup.net> References: <20221212000747.24632-1-raingloom@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59487 Cc: raingloom , 59487@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) gnu/packages/ocaml.scm: Delete test-target if it's ".", "test", or "tests". --- gnu/packages/ocaml.scm | 129 +++++++++++------------------------------ 1 file changed, 33 insertions(+), 96 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e0bedf74f9..ca5f319f51 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -603,8 +603,6 @@ (define-public ocaml-cudf (base32 "1lvrmpscbk1kjv5ag5bzlzv520xk5zw2haf6q7chvz98gcm9g0hk")))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (propagated-inputs (list ocaml-extlib)) (native-inputs (list ocaml-ounit2)) (home-page "https://www.mancoosi.org/cudf/") @@ -794,8 +792,7 @@ (define-public opam "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'pre-build (lambda* (#:key inputs make-flags #:allow-other-keys) @@ -1629,8 +1626,6 @@ (define-public ocaml-qcheck (sha256 (base32 "0g3r8lrw6fsdphgpnp08saxyxk1vd3chpmb564ir2qnsp716vz6z")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-alcotest ocaml-ounit)) (native-inputs @@ -1674,8 +1669,6 @@ (define-public ocaml-qtest (base32 "04ghjshh6104xyglm0db9kv90m62qla5f4bfrlndv6dsvgw3rdjl")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs `(("ounit" ,ocaml-ounit) ("qcheck" ,ocaml-qcheck))) @@ -1701,8 +1694,6 @@ (define-public ocaml-stringext (base32 "1m09cmn3vrk3gdm60fb730qsygcfyxsyv7gl9xfzck08q1x2x9qx")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs `(("ocamlbuild" ,ocamlbuild) ("qtest" ,ocaml-qtest))) @@ -1942,8 +1933,7 @@ (define-public ocaml4.07-ppx-tools-versioned "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:package "ppx_tools_versioned")) + `(#:package "ppx_tools_versioned")) (propagated-inputs (list ocaml-migrate-parsetree)) (properties `((upstream-name . "ppx_tools_versioned"))) @@ -2062,8 +2052,7 @@ (define-public ocaml-result "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:dune ,dune-bootstrap)) + `(#:dune ,dune-bootstrap)) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result)))) (home-page "https://github.com/janestreet/result") (synopsis "Compatibility Result module") @@ -2077,8 +2066,7 @@ (define-public ocaml4.09-result (inherit ocaml-result) (name "ocaml4.09-result") (arguments - `(#:test-target "." - #:dune ,ocaml4.09-dune-bootstrap + `(#:dune ,ocaml4.09-dune-bootstrap #:ocaml ,ocaml-4.09 #:findlib ,ocaml4.09-findlib)))) @@ -2215,8 +2203,7 @@ (define-public ocaml-csv "0y2hlqlmqs7r4y5mfzc5qdv7gdp3wxbwpz458vf7fj4593vg94cf")))) (build-system dune-build-system) (arguments - `(#:package "csv" - #:test-target ".")) + `(#:package "csv")) (home-page "https://github.com/Chris00/ocaml-csv") (synopsis "Pure OCaml functions to read and write CSV") (description @@ -2454,7 +2441,6 @@ (define-public ocaml-alcotest (build-system dune-build-system) (arguments `(#:package "alcotest" - #:test-target "." #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-test-format @@ -2499,8 +2485,7 @@ (define-public ocaml4.07-alcotest (base32 "1frwi185z4aadmaf0vp8xk5227nyg7nmh28ijj5l7ncjr5slvhz8")))) (arguments - `(#:package "alcotest" - #:test-target ".")) + `(#:package "alcotest")) (properties '())))) (define-public ocaml-ppx-tools @@ -2573,8 +2558,6 @@ (define-public ocaml-ssl (sha256 (base32 "1bg5vagklq6yfxsvcnj2i76xis8hb59088hkic82smyrxdjd1kjs")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list autoconf automake ocaml-alcotest which)) (propagated-inputs (list openssl)) @@ -2905,8 +2888,7 @@ (define-public ocaml-gen "1z5nw5wljvcqp8q07h336bbvf9paynia0jsdh4486hlkbmr1ask1")))) (build-system dune-build-system) (arguments - `(#:package "gen" - #:test-target ".")) + `(#:package "gen")) (propagated-inputs (list ocaml-odoc ocaml-seq)) (native-inputs @@ -3166,8 +3148,6 @@ (define-public ocaml-ocp-indent (base32 "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-cmdliner)) (home-page "https://www.typerex.org/ocp-indent.html") @@ -3391,7 +3371,6 @@ (define-public ocaml-benchmark (sha256 (base32 "0d0vdfjgjzf1y6wkd714d8b0piv1z9qav5ahsapynqzk4b4ahhnp")))) (build-system dune-build-system) - (arguments `(#:test-target "tests")) (home-page "https://github.com/Chris00/ocaml-benchmark") (synopsis "Benchmark running times of code") (description @@ -3708,8 +3687,6 @@ (define-public ocaml-re (sha256 (base32 "1g0vmpx6ylv8m0w77zarn215pgb4czc6gcpb2fi5da1s307zwr0w")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-seq)) (native-inputs @@ -3732,8 +3709,7 @@ (define-public ocaml4.07-re (package (inherit ocaml-re) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-dune-version (lambda _ @@ -3754,8 +3730,6 @@ (define-public ocaml-ocplib-endian "1klj4g451s7m5r8bxmwc1rpvngpqdm40csnx9smgc06pwy2fax2c")) (file-name (git-file-name name version)))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (native-inputs `(("cppo" ,ocaml-cppo))) (home-page "https://github.com/OCamlPro/ocplib-endian") @@ -3782,8 +3756,7 @@ (define-public ocaml-cstruct "0dpbirs6lzp0bclr3wcw407jjspll7iy66z18zks3mjccvlxd21w")))) (build-system dune-build-system) (arguments - `(#:package "cstruct" - #:test-target ".")) + `(#:package "cstruct")) (propagated-inputs (list ocaml-bigarray-compat)) (native-inputs @@ -3826,8 +3799,6 @@ (define-public ocaml-hex (base32 "0xnl5wxd2qrba7phm3mdrjwd2kk26kb17dv94ciwp49ljcj28qc1")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs `(("ocaml-bigarray-compat" ,ocaml-bigarray-compat) ("cstruct" ,ocaml-cstruct))) @@ -3851,8 +3822,7 @@ (define-public ocaml-ezjsonm (base32 "004knljxqxn9zq0rnq7q7wxl4nwlzydm8p9f5cqkl8il5yl5zkjm")))) (build-system dune-build-system) (arguments - `(#:package "ezjsonm" - #:test-target ".")) + `(#:package "ezjsonm")) (native-inputs (list ocaml-alcotest js-of-ocaml node)) (propagated-inputs (list ocaml-jsonm ocaml-uutf ocaml-sexplib0 ocaml-hex)) (home-page "https://github.com/mirage/ezjsonm/") @@ -3879,8 +3849,7 @@ (define-public ocaml-uri (base32 "1bgkc66cq00mgnkz3i535srwzwc4cpdsv0mly5dzvvq33451xwf0")))) (build-system dune-build-system) - (arguments '(#:package "uri" - #:test-target ".")) + (arguments '(#:package "uri")) (propagated-inputs (list ocaml-stringext ocaml-angstrom)) (native-inputs @@ -3906,8 +3875,7 @@ (define-public ocaml4.07-uri (base32 "1ppbav41mszpjcl0zi3fyg958cxyfs57i7kvha4ds9ydn89bjmrh")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'update-deprecated (lambda _ @@ -4330,8 +4298,6 @@ (define-public ocaml-zed ocaml-uucp ocaml-uuseg ocaml-odoc)) - (arguments - `(#:test-target ".")) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed)))) (synopsis "Abstract engine for text edition in OCaml") (description @@ -4379,8 +4345,6 @@ (define-public ocaml-lambda-term (base32 "1pkamblc6h0rsbk901cqn3xr9gqa3g8wrwyx5zryaqvb2xpbhp8b")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-logs ocaml-lwt @@ -4434,8 +4398,6 @@ (define-public ocaml-utop (sha256 (base32 "1pcix3h9f7is06581iax4i08zkd6sv8y5hy1vvxhqhcsd9z0qfl3")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list ocaml-cppo)) (propagated-inputs @@ -4490,8 +4452,6 @@ (define-public ocaml-ansiterminal (base32 "052qnc23vmxp90yympjz9q6lhqw98gs1yvb3r15kcbi1j678l51h")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (properties `((upstream-name . "ANSITerminal"))) (home-page "https://github.com/Chris00/ANSITerminal") (synopsis @@ -4843,8 +4803,6 @@ (define-public ocaml-bindlib (base32 "1viyws3igy49hfaj4jaiwm4iggck9zdn7r3g6kh1n4zxphqk57yk")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list ocamlbuild ocaml-findlib)) (home-page "https://rlepigre.github.io/ocaml-bindlib/") @@ -4871,8 +4829,6 @@ (define-public ocaml-earley (base32 "1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-stdlib-shims)) (synopsis "Parsing library based on Earley Algorithm") @@ -4897,8 +4853,6 @@ (define-public ocaml-timed "1aqmkpjv5jk95lc2m3qyyrhw8ra7n9wj8pv3bfc83l737zv0hjn1")) (file-name (git-file-name name version)))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (synopsis "Timed references for imperative state") (description "Timed references for imperative state. This module provides an alternative type for references (or mutable cells) supporting undo/redo @@ -4963,8 +4917,7 @@ (define-public ocaml-yojson "1habsh00ihjhk1g1csxqg3hj8izk5zvgc7wm579wyjw35vzcmwr1")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:package "yojson")) + `(#:package "yojson")) (propagated-inputs (list ocaml-seq)) (native-inputs (list ocaml-alcotest ocaml-cppo)) (synopsis "Low-level JSON library for OCaml") @@ -5050,8 +5003,7 @@ (define-public ocaml-gsl "1l5zkkkg8sglsihrbf10ivq9s8xzl1y6ag89i4jqpnmi4m43fy34")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-gsl-directory (lambda* (#:key inputs #:allow-other-keys) @@ -5421,8 +5373,6 @@ (define-public ocaml-ppx-deriving (base32 "1wqcnw4wi6pfjjhixpakckm03dpj990259za432804471a6spm2j")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ppx-derivers ocaml-ppxlib ocaml-result)) (native-inputs @@ -6468,7 +6418,6 @@ (define-public ocaml-ppx-cold (janestreet-origin "ppx_cold" version "13gqmfw2sq80anag9bwpm35600l1fnfn7mh9cbj1291k84rsx7wb")) (build-system dune-build-system) - (arguments `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_cold"))) @@ -6630,8 +6579,6 @@ (define-public ocaml-ppx-typerep-conv (sha256 (base32 "1q1lzykpm83ra4l5jh4rfddhd3c96kx4s4rvx0w4b51z1qk56zam")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-base ocaml-typerep ocaml-ppxlib)) (properties `((upstream-name . "ppx_typerep_conv") (ocaml4.07-variant . ,(delay ocaml4.07-ppx-typerep-conv)))) @@ -6697,8 +6644,6 @@ (define-public ocaml-ppx-stable (sha256 (base32 "1as0v0x8c9ilyhngax55lvwyyi4a2wshyan668v0f2s1608cwb1l")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_stable"))) (home-page "https://github.com/janestreet/ppx_stable") @@ -6716,8 +6661,6 @@ (define-public ocaml-ppx-base "ppx_base" version "181w7y2has8jsrqdsvd08q5nhnkx523vwsk3lg0cjix55qssvfyn")) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ppx-compare ocaml-ppx-cold @@ -6873,8 +6816,6 @@ (define-public ocaml-ppx-disable-unused-warnings (sha256 (base32 "0sb5i4v7p9df2bxk66rjs30k9fqdrwsq1jgykjv6wyrx2d9bv955")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_disable_unused_warnings"))) (home-page "https://github.com/janestreet/ppx_disable_unused_warnings") @@ -6897,8 +6838,6 @@ (define-public ocaml-ppx-jane (sha256 (base32 "1p6847gdfnnj6qpa4yh57s6wwpsl7rfgy0q7993chz24h9mhz5lk")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-base-quickcheck ocaml-ppx-assert @@ -7091,8 +7030,7 @@ (define-public ocaml4.07-jane-street-headers "0afhzm08l9v883fhpqqh2lmy7az609pxif40bp7x1sk8c0yszqsh")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 + `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (home-page "https://github.com/janestreet/jane-street-headers") @@ -7565,8 +7503,7 @@ (define-public ocaml4.07-bisect-ppx (native-inputs `(("ocaml-ounit2" ,ocaml-ounit2))) (arguments - `(#:test-target "." - ;; tests require git and network + `(;; tests require git and network #:tests? #f)) (properties '((upstream-name . "bisect_ppx")))))) @@ -7707,8 +7644,6 @@ (define-public ocaml-fftw3 (base32 "07ljbin9dsclsqh24p7haqjccz1w828sf5xfwlzl298d4a6zsbhs")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list fftw fftwf)) (native-inputs @@ -7768,8 +7703,6 @@ (define-public ocaml-cairo2 (base32 "06ag9b88ihhr7yd3s9l0ac7ysig02fmlmsswybbsvz71ni0mb105")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (inputs `(("cairo" ,cairo) ("gtk+-2" ,gtk+-2) @@ -7941,7 +7874,18 @@ (define-public lablgtk3 (build-system dune-build-system) (arguments `(#:package "lablgtk3" - #:test-target ".")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'make-writable + (lambda _ + (for-each (lambda (file) + (chmod file #o644)) + (find-files "." ".")))) + (add-before 'build 'set-version + (lambda _ + (substitute* "dune-project" + (("\\(name lablgtk3\\)") + (string-append "(name lablgtk3)\n(version " ,version ")")))))))) (propagated-inputs (list ocaml-cairo2 ocaml-camlp-streams)) (inputs @@ -7966,8 +7910,7 @@ (define-public ocaml-lablgtk3-sourceview3 (propagated-inputs (list lablgtk3)) (native-inputs (list gtksourceview-3 pkg-config)) (arguments - `(#:package "lablgtk3-sourceview3" - #:test-target ".")) + `(#:package "lablgtk3-sourceview3")) (synopsis "OCaml interface to GTK+ gtksourceview library") (description "This package provides the lablgtk interface to the GTK+ gtksourceview library."))) @@ -8228,8 +8171,6 @@ (define-public ocaml-bigstringaf (base32 "188j9awxg99vrp2l3rqfmdxdazq5xrjmg1wf62vfqsks9sff6wqx")))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (propagated-inputs (list ocaml-bigarray-compat)) (native-inputs @@ -8361,8 +8302,7 @@ (define-public ocaml-angstrom (build-system dune-build-system) (arguments ;; Only build the base angstrom package. - '(#:package "angstrom" - #:test-target ".")) + '(#:package "angstrom")) (propagated-inputs (list ocaml-bigstringaf)) (native-inputs @@ -8409,8 +8349,7 @@ (define-public ocaml-uri-sexp (inherit ocaml-uri) (name "ocaml-uri-sexp") (arguments - '(#:package "uri-sexp" - #:test-target ".")) + '(#:package "uri-sexp")) (propagated-inputs (list ocaml-uri ocaml-ppx-sexp-conv ocaml-sexplib0)) (native-inputs (list ocaml-ounit)) @@ -8468,8 +8407,8 @@ (define-public js-of-ocaml (base32 "14ig69iyc9yzniclfsc6cz9g9zqp96bs66y6dy4rzrm78s81w6i1")))) (build-system dune-build-system) (arguments - `(#:tests? #f ;tests assume ocaml 4.13 - #:test-target ".")) + ;;tests assume ocaml 4.13 + `(#:tests? #f)) (propagated-inputs (list ocaml-ppxlib ocaml-uchar @@ -8568,8 +8507,6 @@ (define-public ocaml-crowbar (base32 "11f3kiw58g8njx15akx16xcplzvzdw9y6c4jpyfxylkxws4g0f6j")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ocplib-endian ocaml-cmdliner -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 10 15:31:09 2023 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 To: raingloom Subject: Re: [bug#59487] [PATCH 1/2] build-system/dune: Automatically deduce test-target in most cases. 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-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59487 Cc: Julien Lepiller , 59487@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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) From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 12:41:24 2023 Received: (at 59487) by debbugs.gnu.org; 11 Jan 2023 17:41:24 +0000 Received: from localhost ([127.0.0.1]:43744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFf6K-0003yQ-06 for submit@debbugs.gnu.org; Wed, 11 Jan 2023 12:41:24 -0500 Received: from mx0.riseup.net ([198.252.153.6]:44040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFf6G-0003y7-WA for 59487@debbugs.gnu.org; Wed, 11 Jan 2023 12:41:22 -0500 Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4NsZjC53zlz9t3R; Wed, 11 Jan 2023 17:41:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1673458874; bh=8myVtA7BO+0L3imw092NC/7eC9+S5eFMkhqvikuzLDw=; h=From:To:Cc:Subject:Date:From; b=oE5TTYPbpuGwCR942vt4Q421ZFs6K7/UWV6oKLK82FfbtDZrOr1pdYUsCJs8USKYP 52AIU1NH6HcRqEoAHGzKStv8Ep/ErWR1ZO0uLzEoSCnNSWySGTwIiN03iDQ9gnijn2 36Jew9jZEW6SMax24UHKZp4oZlx9i4rYzlQxhNik= X-Riseup-User-ID: 54FEE4A9EB7EBF7F213A547D3B1BAF8A10EE0DDF9F1D5E593F8EE3E664648FE0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4NsZj970nMz1yZp; Wed, 11 Jan 2023 17:41:01 +0000 (UTC) From: Csepp To: 59487@debbugs.gnu.org Subject: [PATCH v2 1/2] build-system/dune: Automatically deduce test-target in most cases. Date: Wed, 11 Jan 2023 18:40:02 +0100 Message-Id: <20230111174003.2227-1-raingloom@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59487 Cc: pukkamustard@posteo.net, julien@lepiller.eu, raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: raingloom 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 | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 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..e1337a3f82 100644 --- a/guix/build/dune-build-system.scm +++ b/guix/build/dune-build-system.scm @@ -42,14 +42,20 @@ (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"))) - (apply invoke program "runtest" test-target - (append (if package (list "-p" package) + (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" + (append (if test-target (list test-target) '()) + (if package (list "-p" package) dune-release-flags) test-flags)))) #t) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 12:41:27 2023 Received: (at 59487) by debbugs.gnu.org; 11 Jan 2023 17:41:27 +0000 Received: from localhost ([127.0.0.1]:43746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFf6M-0003ya-DB for submit@debbugs.gnu.org; Wed, 11 Jan 2023 12:41:27 -0500 Received: from mx1.riseup.net ([198.252.153.129]:45216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFf6H-0003y9-Sy for 59487@debbugs.gnu.org; Wed, 11 Jan 2023 12:41:23 -0500 Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4NsZjF1mMSzDrjZ; Wed, 11 Jan 2023 17:41:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1673458876; bh=AAfWl+RFspi946a/8D3pYEdSaXHd9BJ9OhG9tj4VJQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hMGB/IvzjdkFsbx3tO7wW5HEwv2FzVRbMfr7Sj87b4Mrkcw3TAkxF3YqvE2zY/Kd8 5340bFWDKwy0mJZMtCNNUbJ8avgJ0ndre5HNj1wF4tdMxuJ9QeH2EJt3dq95AB5wM+ OhcfDRYR+QDHkNwIXqzM8gR68zdEjI1WQwbp80Is= X-Riseup-User-ID: A8A988308677142F0DFFF4C8A96AC8299F941BE18B25525008F8B6EBE7384E2A Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4NsZjC6wvnz21Fm; Wed, 11 Jan 2023 17:41:03 +0000 (UTC) From: Csepp To: 59487@debbugs.gnu.org Subject: [PATCH v2 2/2] gnu: Remove explicit test-target arguments in ocaml.scm. Date: Wed, 11 Jan 2023 18:40:03 +0100 Message-Id: <20230111174003.2227-2-raingloom@riseup.net> In-Reply-To: <20230111174003.2227-1-raingloom@riseup.net> References: <20230111174003.2227-1-raingloom@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59487 Cc: pukkamustard@posteo.net, julien@lepiller.eu, raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: raingloom gnu/packages/ocaml.scm: Delete test-target if it's ".", "test", or "tests". --- gnu/packages/ocaml.scm | 129 +++++++++++------------------------------ 1 file changed, 33 insertions(+), 96 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5109cd052a..c3a586f091 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -664,8 +664,6 @@ (define-public ocaml-cudf (base32 "1lvrmpscbk1kjv5ag5bzlzv520xk5zw2haf6q7chvz98gcm9g0hk")))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (propagated-inputs (list ocaml-extlib)) (native-inputs (list ocaml-ounit2)) (home-page "https://www.mancoosi.org/cudf/") @@ -855,8 +853,7 @@ (define-public opam "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'pre-build (lambda* (#:key inputs make-flags #:allow-other-keys) @@ -1699,8 +1696,6 @@ (define-public ocaml-qcheck (sha256 (base32 "1r0m5p1dd06lbgfxqdpl1ya4vb8252z7hqkvdi9k444g4rx2ay3p")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-alcotest ocaml-ounit ocaml-ppxlib)) (native-inputs @@ -1744,8 +1739,6 @@ (define-public ocaml-qtest (base32 "04ghjshh6104xyglm0db9kv90m62qla5f4bfrlndv6dsvgw3rdjl")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs `(("ounit" ,ocaml-ounit) ("qcheck" ,ocaml-qcheck))) @@ -1771,8 +1764,6 @@ (define-public ocaml-stringext (base32 "1m09cmn3vrk3gdm60fb730qsygcfyxsyv7gl9xfzck08q1x2x9qx")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs `(("ocamlbuild" ,ocamlbuild) ("qtest" ,ocaml-qtest))) @@ -2047,8 +2038,7 @@ (define-public ocaml4.07-ppx-tools-versioned "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:package "ppx_tools_versioned")) + `(#:package "ppx_tools_versioned")) (propagated-inputs (list ocaml-migrate-parsetree)) (properties `((upstream-name . "ppx_tools_versioned"))) @@ -2167,8 +2157,7 @@ (define-public ocaml-result "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:dune ,dune-bootstrap)) + `(#:dune ,dune-bootstrap)) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result)) (ocaml5.0-variant . ,(delay ocaml5.0-result)))) (home-page "https://github.com/janestreet/result") @@ -2183,8 +2172,7 @@ (define-public ocaml4.09-result (inherit ocaml-result) (name "ocaml4.09-result") (arguments - `(#:test-target "." - #:dune ,ocaml4.09-dune-bootstrap + `(#:dune ,ocaml4.09-dune-bootstrap #:ocaml ,ocaml-4.09 #:findlib ,ocaml4.09-findlib)))) @@ -2331,8 +2319,7 @@ (define-public ocaml-csv "0y2hlqlmqs7r4y5mfzc5qdv7gdp3wxbwpz458vf7fj4593vg94cf")))) (build-system dune-build-system) (arguments - `(#:package "csv" - #:test-target ".")) + `(#:package "csv")) (home-page "https://github.com/Chris00/ocaml-csv") (synopsis "Pure OCaml functions to read and write CSV") (description @@ -2570,7 +2557,6 @@ (define-public ocaml-alcotest (build-system dune-build-system) (arguments `(#:package "alcotest" - #:test-target "." #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-test-format @@ -2615,8 +2601,7 @@ (define-public ocaml4.07-alcotest (base32 "1frwi185z4aadmaf0vp8xk5227nyg7nmh28ijj5l7ncjr5slvhz8")))) (arguments - `(#:package "alcotest" - #:test-target ".")) + `(#:package "alcotest")) (properties '())))) (define-public ocaml-ppx-tools @@ -2689,8 +2674,6 @@ (define-public ocaml-ssl (sha256 (base32 "1bg5vagklq6yfxsvcnj2i76xis8hb59088hkic82smyrxdjd1kjs")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list autoconf automake ocaml-alcotest which)) (propagated-inputs (list openssl)) @@ -3243,8 +3226,7 @@ (define-public ocaml-gen "1z5nw5wljvcqp8q07h336bbvf9paynia0jsdh4486hlkbmr1ask1")))) (build-system dune-build-system) (arguments - `(#:package "gen" - #:test-target ".")) + `(#:package "gen")) (propagated-inputs (list ocaml-odoc ocaml-seq)) (native-inputs @@ -3504,8 +3486,6 @@ (define-public ocaml-ocp-indent (base32 "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-cmdliner)) (home-page "https://www.typerex.org/ocp-indent.html") @@ -3729,7 +3709,6 @@ (define-public ocaml-benchmark (sha256 (base32 "0d0vdfjgjzf1y6wkd714d8b0piv1z9qav5ahsapynqzk4b4ahhnp")))) (build-system dune-build-system) - (arguments `(#:test-target "tests")) (home-page "https://github.com/Chris00/ocaml-benchmark") (synopsis "Benchmark running times of code") (description @@ -4070,8 +4049,6 @@ (define-public ocaml-re (sha256 (base32 "1g0vmpx6ylv8m0w77zarn215pgb4czc6gcpb2fi5da1s307zwr0w")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-seq)) (native-inputs @@ -4094,8 +4071,7 @@ (define-public ocaml4.07-re (package (inherit ocaml-re) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-dune-version (lambda _ @@ -4116,8 +4092,6 @@ (define-public ocaml-ocplib-endian "1klj4g451s7m5r8bxmwc1rpvngpqdm40csnx9smgc06pwy2fax2c")) (file-name (git-file-name name version)))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (native-inputs `(("cppo" ,ocaml-cppo))) (home-page "https://github.com/OCamlPro/ocplib-endian") @@ -4144,8 +4118,7 @@ (define-public ocaml-cstruct "0dpbirs6lzp0bclr3wcw407jjspll7iy66z18zks3mjccvlxd21w")))) (build-system dune-build-system) (arguments - `(#:package "cstruct" - #:test-target ".")) + `(#:package "cstruct")) (propagated-inputs (list ocaml-bigarray-compat)) (native-inputs @@ -4188,8 +4161,6 @@ (define-public ocaml-hex (base32 "0xnl5wxd2qrba7phm3mdrjwd2kk26kb17dv94ciwp49ljcj28qc1")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs `(("ocaml-bigarray-compat" ,ocaml-bigarray-compat) ("cstruct" ,ocaml-cstruct))) @@ -4213,8 +4184,7 @@ (define-public ocaml-ezjsonm (base32 "004knljxqxn9zq0rnq7q7wxl4nwlzydm8p9f5cqkl8il5yl5zkjm")))) (build-system dune-build-system) (arguments - `(#:package "ezjsonm" - #:test-target ".")) + `(#:package "ezjsonm")) (native-inputs (list ocaml-alcotest js-of-ocaml node)) (propagated-inputs (list ocaml-jsonm ocaml-uutf ocaml-sexplib0 ocaml-hex)) (home-page "https://github.com/mirage/ezjsonm/") @@ -4241,8 +4211,7 @@ (define-public ocaml-uri (base32 "1bgkc66cq00mgnkz3i535srwzwc4cpdsv0mly5dzvvq33451xwf0")))) (build-system dune-build-system) - (arguments '(#:package "uri" - #:test-target ".")) + (arguments '(#:package "uri")) (propagated-inputs (list ocaml-stringext ocaml-angstrom)) (native-inputs @@ -4268,8 +4237,7 @@ (define-public ocaml4.07-uri (base32 "1ppbav41mszpjcl0zi3fyg958cxyfs57i7kvha4ds9ydn89bjmrh")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'update-deprecated (lambda _ @@ -4692,8 +4660,6 @@ (define-public ocaml-zed ocaml-uucp ocaml-uuseg ocaml-odoc)) - (arguments - `(#:test-target ".")) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed)))) (synopsis "Abstract engine for text edition in OCaml") (description @@ -4741,8 +4707,6 @@ (define-public ocaml-lambda-term (base32 "1pkamblc6h0rsbk901cqn3xr9gqa3g8wrwyx5zryaqvb2xpbhp8b")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-logs ocaml-lwt @@ -4796,8 +4760,6 @@ (define-public ocaml-utop (sha256 (base32 "1pcix3h9f7is06581iax4i08zkd6sv8y5hy1vvxhqhcsd9z0qfl3")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list ocaml-cppo)) (propagated-inputs @@ -4852,8 +4814,6 @@ (define-public ocaml-ansiterminal (base32 "052qnc23vmxp90yympjz9q6lhqw98gs1yvb3r15kcbi1j678l51h")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (properties `((upstream-name . "ANSITerminal"))) (home-page "https://github.com/Chris00/ANSITerminal") (synopsis @@ -5233,8 +5193,6 @@ (define-public ocaml-bindlib (base32 "1viyws3igy49hfaj4jaiwm4iggck9zdn7r3g6kh1n4zxphqk57yk")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list ocamlbuild ocaml-findlib)) (home-page "https://rlepigre.github.io/ocaml-bindlib/") @@ -5261,8 +5219,6 @@ (define-public ocaml-earley (base32 "1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-stdlib-shims)) (synopsis "Parsing library based on Earley Algorithm") @@ -5287,8 +5243,6 @@ (define-public ocaml-timed "1aqmkpjv5jk95lc2m3qyyrhw8ra7n9wj8pv3bfc83l737zv0hjn1")) (file-name (git-file-name name version)))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (synopsis "Timed references for imperative state") (description "Timed references for imperative state. This module provides an alternative type for references (or mutable cells) supporting undo/redo @@ -5353,8 +5307,7 @@ (define-public ocaml-yojson "1habsh00ihjhk1g1csxqg3hj8izk5zvgc7wm579wyjw35vzcmwr1")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:package "yojson")) + `(#:package "yojson")) (propagated-inputs (list ocaml-seq)) (native-inputs (list ocaml-alcotest ocaml-cppo)) (synopsis "Low-level JSON library for OCaml") @@ -5504,8 +5457,7 @@ (define-public ocaml-gsl "1l5zkkkg8sglsihrbf10ivq9s8xzl1y6ag89i4jqpnmi4m43fy34")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-gsl-directory (lambda* (#:key inputs #:allow-other-keys) @@ -5898,8 +5850,6 @@ (define-public ocaml-ppx-deriving (base32 "1wqcnw4wi6pfjjhixpakckm03dpj990259za432804471a6spm2j")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ppx-derivers ocaml-ppxlib ocaml-result)) (native-inputs @@ -6945,7 +6895,6 @@ (define-public ocaml-ppx-cold (janestreet-origin "ppx_cold" version "13gqmfw2sq80anag9bwpm35600l1fnfn7mh9cbj1291k84rsx7wb")) (build-system dune-build-system) - (arguments `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_cold"))) @@ -7130,8 +7079,6 @@ (define-public ocaml-ppx-typerep-conv (sha256 (base32 "1q1lzykpm83ra4l5jh4rfddhd3c96kx4s4rvx0w4b51z1qk56zam")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-base ocaml-typerep ocaml-ppxlib)) (properties `((upstream-name . "ppx_typerep_conv") (ocaml4.07-variant . ,(delay ocaml4.07-ppx-typerep-conv)))) @@ -7197,8 +7144,6 @@ (define-public ocaml-ppx-stable (sha256 (base32 "1as0v0x8c9ilyhngax55lvwyyi4a2wshyan668v0f2s1608cwb1l")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_stable"))) (home-page "https://github.com/janestreet/ppx_stable") @@ -7216,8 +7161,6 @@ (define-public ocaml-ppx-base "ppx_base" version "181w7y2has8jsrqdsvd08q5nhnkx523vwsk3lg0cjix55qssvfyn")) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ppx-compare ocaml-ppx-cold @@ -7373,8 +7316,6 @@ (define-public ocaml-ppx-disable-unused-warnings (sha256 (base32 "0sb5i4v7p9df2bxk66rjs30k9fqdrwsq1jgykjv6wyrx2d9bv955")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_disable_unused_warnings"))) (home-page "https://github.com/janestreet/ppx_disable_unused_warnings") @@ -7397,8 +7338,6 @@ (define-public ocaml-ppx-jane (sha256 (base32 "1p6847gdfnnj6qpa4yh57s6wwpsl7rfgy0q7993chz24h9mhz5lk")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-base-quickcheck ocaml-ppx-assert @@ -7591,8 +7530,7 @@ (define-public ocaml4.07-jane-street-headers "0afhzm08l9v883fhpqqh2lmy7az609pxif40bp7x1sk8c0yszqsh")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 + `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (home-page "https://github.com/janestreet/jane-street-headers") @@ -8065,8 +8003,7 @@ (define-public ocaml4.07-bisect-ppx (native-inputs `(("ocaml-ounit2" ,ocaml-ounit2))) (arguments - `(#:test-target "." - ;; tests require git and network + `(;; tests require git and network #:tests? #f)) (properties '((upstream-name . "bisect_ppx")))))) @@ -8205,8 +8142,6 @@ (define-public ocaml-fftw3 (base32 "07ljbin9dsclsqh24p7haqjccz1w828sf5xfwlzl298d4a6zsbhs")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list fftw fftwf)) (native-inputs @@ -8266,8 +8201,6 @@ (define-public ocaml-cairo2 (base32 "06ag9b88ihhr7yd3s9l0ac7ysig02fmlmsswybbsvz71ni0mb105")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (inputs `(("cairo" ,cairo) ("gtk+-2" ,gtk+-2) @@ -8439,7 +8372,18 @@ (define-public lablgtk3 (build-system dune-build-system) (arguments `(#:package "lablgtk3" - #:test-target ".")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'make-writable + (lambda _ + (for-each (lambda (file) + (chmod file #o644)) + (find-files "." ".")))) + (add-before 'build 'set-version + (lambda _ + (substitute* "dune-project" + (("\\(name lablgtk3\\)") + (string-append "(name lablgtk3)\n(version " ,version ")")))))))) (propagated-inputs (list ocaml-cairo2 ocaml-camlp-streams)) (inputs @@ -8464,8 +8408,7 @@ (define-public ocaml-lablgtk3-sourceview3 (propagated-inputs (list lablgtk3)) (native-inputs (list gtksourceview-3 pkg-config)) (arguments - `(#:package "lablgtk3-sourceview3" - #:test-target ".")) + `(#:package "lablgtk3-sourceview3")) (synopsis "OCaml interface to GTK+ gtksourceview library") (description "This package provides the lablgtk interface to the GTK+ gtksourceview library."))) @@ -8727,8 +8670,6 @@ (define-public ocaml-bigstringaf (base32 "188j9awxg99vrp2l3rqfmdxdazq5xrjmg1wf62vfqsks9sff6wqx")))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (propagated-inputs (list ocaml-bigarray-compat)) (native-inputs @@ -8860,8 +8801,7 @@ (define-public ocaml-angstrom (build-system dune-build-system) (arguments ;; Only build the base angstrom package. - '(#:package "angstrom" - #:test-target ".")) + '(#:package "angstrom")) (propagated-inputs (list ocaml-bigstringaf)) (native-inputs @@ -8908,8 +8848,7 @@ (define-public ocaml-uri-sexp (inherit ocaml-uri) (name "ocaml-uri-sexp") (arguments - '(#:package "uri-sexp" - #:test-target ".")) + '(#:package "uri-sexp")) (propagated-inputs (list ocaml-uri ocaml-ppx-sexp-conv ocaml-sexplib0)) (native-inputs (list ocaml-ounit)) @@ -8967,8 +8906,8 @@ (define-public js-of-ocaml (base32 "14ig69iyc9yzniclfsc6cz9g9zqp96bs66y6dy4rzrm78s81w6i1")))) (build-system dune-build-system) (arguments - `(#:tests? #f ;tests assume ocaml 4.13 - #:test-target ".")) + ;;tests assume ocaml 4.13 + `(#:tests? #f)) (propagated-inputs (list ocaml-ppxlib ocaml-uchar @@ -9092,8 +9031,6 @@ (define-public ocaml-crowbar (base32 "11f3kiw58g8njx15akx16xcplzvzdw9y6c4jpyfxylkxws4g0f6j")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ocplib-endian ocaml-cmdliner -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 11 12:43:16 2023 Received: (at 59487) by debbugs.gnu.org; 11 Jan 2023 17:43:16 +0000 Received: from localhost ([127.0.0.1]:43757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFf88-00041l-FS for submit@debbugs.gnu.org; Wed, 11 Jan 2023 12:43:16 -0500 Received: from mx1.riseup.net ([198.252.153.129]:53958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFf86-00041X-Tt for 59487@debbugs.gnu.org; Wed, 11 Jan 2023 12:43:15 -0500 Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4NsZld3ftmzDqVC; Wed, 11 Jan 2023 17:43:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1673458989; bh=s8uG7uDeoi59+5UnYDH5bGNYctp0FPPS33FSiJGRZZg=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=h91zp3PyUh46ppOmncwQNbr7zBeqWeWdu5KwD2Iggt9xU9fCauZe0YXEG01+ndqu6 m4ANSe1orhBQY5ANKd8kf5e6NnOmnJL9pJ4ErpbBCrbfQgsXik3v2q9MUBZ3Um0W9X QC32+slSdpp5swCZ5s/qS0DL+Q8IlLwNuaTeVsrs= X-Riseup-User-ID: 506E914EB2E96226961CCA110EA50B3E25ED9C4DDA26129F9D015877A50018CC Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4NsZlc5fQ8z1xwx; Wed, 11 Jan 2023 17:43:08 +0000 (UTC) References: <20221122194712.31515-1-raingloom@riseup.net> <86eds2nncy.fsf@posteo.net> From: Csepp To: pukkamustard Subject: Re: [bug#59487] [PATCH 1/2] build-system/dune: Automatically deduce test-target in most cases. Date: Wed, 11 Jan 2023 18:41:20 +0100 In-reply-to: <86eds2nncy.fsf@posteo.net> Message-ID: <861qo1t1au.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59487 Cc: Julien Lepiller , raingloom , 59487@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) pukkamustard writes: > 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 Sent a rebased V2 just now. The runtest invocation looks like Julien's suggestion, so I think I addressed it. From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 12 10:59:39 2023 Received: (at 59487) by debbugs.gnu.org; 12 Jan 2023 15:59:39 +0000 Received: from localhost ([127.0.0.1]:48407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFzzP-0008SF-Ah for submit@debbugs.gnu.org; Thu, 12 Jan 2023 10:59:39 -0500 Received: from mout01.posteo.de ([185.67.36.65]:58479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFzzN-0008Rz-5l for 59487@debbugs.gnu.org; Thu, 12 Jan 2023 10:59:38 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id BC82A240299 for <59487@debbugs.gnu.org>; Thu, 12 Jan 2023 16:59:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673539170; bh=cgUBA8aZrMkypghjb/a+tbiM5j9wEJzk4ctmLvoQ7wI=; h=From:To:Cc:Subject:Date:From; b=OsvVRcsxHZpvO6cKhiJehn4+tE3/ovfwCLeUXjUBA14NRhXERQg12Pq0fdrnMgOQc pi++u8zLBpKNlOf8FSebFFhtQZ97ovy662shE1Bvfep+21urCpMwkDzLY6R1B0SycD rltZPMQFUfYFliehJTtuDh4Mc3WrgQlDuyOtc+BNeMixArmAC0IjKs71wlEc/h8rGL Be+Mk1fMczG5NT7yt8XEAgEnmKkgRVmQSdwib0CsYtQeHJhHDyi+LNcPGOGWbyf0ez yU/H1CvlZVArxcS56J0IeF03IdL3yd0f3kjfdxUxCClHgBWjixUML98zi1noXm/Efg Q9KfDVSm1UoSA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Nt8PY3YGfz6tnl; Thu, 12 Jan 2023 16:59:29 +0100 (CET) References: <20230111174003.2227-1-raingloom@riseup.net> From: pukkamustard To: Csepp Subject: Re: [PATCH v2 1/2] build-system/dune: Automatically deduce test-target in most cases. Date: Thu, 12 Jan 2023 15:42:26 +0000 In-reply-to: <20230111174003.2227-1-raingloom@riseup.net> Message-ID: <86r0vzwxpb.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59487 Cc: julien@lepiller.eu, 59487@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Thanks for this! I think it is a valuable improvement. Csepp writes: > From: raingloom > > guix/build-system/dune.scm (dune-build): tests? defaults to #f. This should be: "test-target defaults to #f". > + (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" > + (append (if test-target (list test-target) '()) > + (if package (list "-p" package) > dune-release-flags) > test-flags)))) > #t) I think what Julien ment (and I agree) is that you can completely drop the checks for the files/directories "tests" or "test" to exist. In your patch, if test-target is #f and "test" or "tests" do not exist, then the we will run: `dune runtest -p package .` but we could (and maybe should) run just: `dune runtest -p package` In fact, we should run this even if the "test" or "tests" directories exist (otherwise we might miss running some tests placed in other directories). So this would be enough: > + (let ((program (if jbuild? "jbuilder" "dune"))) > + (apply invoke program "runtest" > + (append (if test-target (list test-target) '()) > + (if package (list "-p" package) > dune-release-flags) > test-flags))) Thinking of this, maybe we can drop the `test-target` argument completely. wdyt? -pukkamustard From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 12 13:48:37 2023 Received: (at 59487) by debbugs.gnu.org; 12 Jan 2023 18:48:37 +0000 Received: from localhost ([127.0.0.1]:48599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pG2cu-0006vO-Ty for submit@debbugs.gnu.org; Thu, 12 Jan 2023 13:48:37 -0500 Received: from mout02.posteo.de ([185.67.36.66]:50193) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pG2cs-0006vA-Gb for 59487@debbugs.gnu.org; Thu, 12 Jan 2023 13:48:35 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6DF8A24045A for <59487@debbugs.gnu.org>; Thu, 12 Jan 2023 19:48:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673549308; bh=hkRSvhbc0kyKPG2/FSnyyiwV+WULAeFQJ6tNSrpioLw=; h=From:To:Cc:Subject:Date:From; b=IQIJLzmqLe25oXeEcWRhSm5JvzUJ0YQZ4vcPU90nR+RL6j9xwFb243DHxQVekVH0I jcZ6EoR9T6lntOOjhG216bUpK90PlZuPFFHjv0SfZDWvieoj/b7lHrU4ZFakqWy6DO ljnu61Kk/dnqQh9P2L6uptLACdHhMVT1cZjT97i5kMuXWyFUJcOeHMKP40iYsc98md R/nKy3iCXzo/8+pSQUuP1T/Ji/EKmyAbAGskmKqAjNYs0nNmleXjiZhuqzxQyGnSqL dGvt0kmN5Gjtig5HWhawprhWuxzud/6pmU4tTkE0nKD20VjD9JVhuY4F+0MkVq0Ht6 04n5ihZAAN+9A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NtD8T00RVz9rxF; Thu, 12 Jan 2023 19:48:24 +0100 (CET) References: <20230111174003.2227-1-raingloom@riseup.net> <86r0vzwxpb.fsf@posteo.net> From: pukkamustard To: Csepp Subject: Re: [PATCH v2 1/2] build-system/dune: Automatically deduce test-target in most cases. Date: Thu, 12 Jan 2023 18:44:03 +0000 In-reply-to: <86r0vzwxpb.fsf@posteo.net> Message-ID: <86mt6nwpvr.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59487 Cc: julien@lepiller.eu, 59487@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) pukkamustard writes: > Thinking of this, maybe we can drop the `test-target` argument > completely. wdyt? Yeah, I'm pretty sure we should drop the test-target argument. I don't see any reason why it should be used with the dune build-system. The two remaining packages that have a test-target that is not "test", "tests" or "." (and do not have tests disabled): - ocaml-frontc: Builds as expected when test-target is removed. - ocaml-cohttp: test-target points to a test helper library, not the tests themselves. Removing the test-target runs the tests, which currently fail. -pukkamustard From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 12 14:41:00 2023 Received: (at 59487) by debbugs.gnu.org; 12 Jan 2023 19:41:00 +0000 Received: from localhost ([127.0.0.1]:48644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pG3Rc-0008FO-2t for submit@debbugs.gnu.org; Thu, 12 Jan 2023 14:41:00 -0500 Received: from mx1.riseup.net ([198.252.153.129]:35606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pG3RZ-0008F5-Sc for 59487@debbugs.gnu.org; Thu, 12 Jan 2023 14:40:58 -0500 Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4NtFK00bJNzDrc5; Thu, 12 Jan 2023 19:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1673552452; bh=orUvSX3lgn+DQ6BUT0uNpi7+avRzonvZXJDy9UkxLBM=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=jr0kyKRrzKl7i6EfypMIAxZtwsH4sYx4feh0vMpu2woTXTL0UjWRLMYlb7aosvq4a 5s1DlVwcE8eNJkFsPXdcnfnJv4oPjJyuQZcWRoelI4KcyIj1wFQqeSivxG0/vQGFyk xpYblNnD1hjUF22ED3s0D+p9dWV8zFv+ReKYIOOU= X-Riseup-User-ID: 84EECACB410AE88F7FBEF261B6D3546D54B720F3CE343A7E76A6D5A350AB0FEB Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4NtFJz1FjJz1yQc; Thu, 12 Jan 2023 19:40:50 +0000 (UTC) References: <20230111174003.2227-1-raingloom@riseup.net> <86r0vzwxpb.fsf@posteo.net> From: Csepp To: pukkamustard Subject: Re: [PATCH v2 1/2] build-system/dune: Automatically deduce test-target in most cases. Date: Thu, 12 Jan 2023 20:39:48 +0100 In-reply-to: <86r0vzwxpb.fsf@posteo.net> Message-ID: <86mt6npmmb.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59487 Cc: julien@lepiller.eu, Csepp , 59487@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) pukkamustard writes: > Thanks for this! I think it is a valuable improvement. > > Csepp writes: > >> From: raingloom >> >> guix/build-system/dune.scm (dune-build): tests? defaults to #f. > > This should be: "test-target defaults to #f". > >> + (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" >> + (append (if test-target (list test-target) '()) >> + (if package (list "-p" package) >> dune-release-flags) >> test-flags)))) >> #t) > > I think what Julien ment (and I agree) is that you can completely drop > the checks for the files/directories "tests" or "test" to exist. > > In your patch, if test-target is #f and "test" or "tests" do not exist, > then the we will run: > > `dune runtest -p package .` > > but we could (and maybe should) run just: > > `dune runtest -p package` > > In fact, we should run this even if the "test" or "tests" directories > exist (otherwise we might miss running some tests placed in other > directories). > > So this would be enough: > >> + (let ((program (if jbuild? "jbuilder" "dune"))) >> + (apply invoke program "runtest" >> + (append (if test-target (list test-target) '()) >> + (if package (list "-p" package) >> dune-release-flags) >> test-flags))) > > Thinking of this, maybe we can drop the `test-target` argument > completely. wdyt? > > -pukkamustard Hmm, makes sense. I'll test what complete removal does. From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 12 16:21:49 2023 Received: (at 59487) by debbugs.gnu.org; 12 Jan 2023 21:21:49 +0000 Received: from localhost ([127.0.0.1]:48702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pG51A-0002o0-RC for submit@debbugs.gnu.org; Thu, 12 Jan 2023 16:21:49 -0500 Received: from mx1.riseup.net ([198.252.153.129]:56670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pG517-0002ni-QM for 59487@debbugs.gnu.org; Thu, 12 Jan 2023 16:21:46 -0500 Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4NtHYJ0ymCzDrb2; Thu, 12 Jan 2023 21:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1673558500; bh=CrvWnh98ajcc0U/cyPmpiUAEkeYJLsO9aVq+cPcfvgc=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=EJmqK4IDzY7ZCRje4tPrWNdyoT+jyQoM5Eo9IebYveaGhAh2SctgyEwPgdvim4PJs BxIR+w8dJ4RdDMixdrl5BpqeNnWc2uXVqxcE+I4RXJ15faHRPS/FPKpiVUIWtIQih7 MnImt6xzhOum7FREdUdO2/cdm/dzDomvIeQqMIyM= X-Riseup-User-ID: 36EBEB7E04B14F52E90EAA1030C3F09F4088019FD552B34C4E01075D3CA78D93 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4NtHYH1W6gz1yPb; Thu, 12 Jan 2023 21:21:39 +0000 (UTC) References: <20230111174003.2227-1-raingloom@riseup.net> <86r0vzwxpb.fsf@posteo.net> <86mt6npmmb.fsf@riseup.net> From: Csepp To: pukkamustard Subject: Re: [PATCH v2 1/2] build-system/dune: Automatically deduce test-target in most cases. Date: Thu, 12 Jan 2023 22:20:24 +0100 In-reply-to: <86mt6npmmb.fsf@riseup.net> Message-ID: <86fscfphy8.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59487 Cc: julien@lepiller.eu, Csepp , 59487@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Csepp writes: > pukkamustard writes: > >> Thanks for this! I think it is a valuable improvement. >> >> Csepp writes: >> >>> From: raingloom >>> >>> guix/build-system/dune.scm (dune-build): tests? defaults to #f. >> >> This should be: "test-target defaults to #f". >> >>> + (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" >>> + (append (if test-target (list test-target) '()) >>> + (if package (list "-p" package) >>> dune-release-flags) >>> test-flags)))) >>> #t) >> >> I think what Julien ment (and I agree) is that you can completely drop >> the checks for the files/directories "tests" or "test" to exist. >> >> In your patch, if test-target is #f and "test" or "tests" do not exist, >> then the we will run: >> >> `dune runtest -p package .` >> >> but we could (and maybe should) run just: >> >> `dune runtest -p package` >> >> In fact, we should run this even if the "test" or "tests" directories >> exist (otherwise we might miss running some tests placed in other >> directories). >> >> So this would be enough: >> >>> + (let ((program (if jbuild? "jbuilder" "dune"))) >>> + (apply invoke program "runtest" >>> + (append (if test-target (list test-target) '()) >>> + (if package (list "-p" package) >>> dune-release-flags) >>> test-flags))) >> >> Thinking of this, maybe we can drop the `test-target` argument >> completely. wdyt? >> >> -pukkamustard > > Hmm, makes sense. I'll test what complete removal does. Well ocaml-ppxlib fails and I should be working my MirageOS thesis stuff, so I'll leave this up to you. Or I'll get back to it once I figure out how cross-toolchains are supposed to work. From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 13 05:55:12 2023 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:12 +0000 Received: from localhost ([127.0.0.1]:49678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiK-0007WG-GF for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:12 -0500 Received: from mout01.posteo.de ([185.67.36.65]:40251) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiH-0007Vp-Kg for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:10 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 74F1324027F for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607303; bh=WE1R9RKRkgU25KPPqY23efCz5lLEX7PaeoShBk0oTfI=; h=From:To:Cc:Subject:Date:From; b=cyVfTxmpaXgllerUnYCCoajGsU9XQO0DjzVinLD/oyNJQ3cYDW5fDNnkYMNkdmIWh DhPn7+q10Zv9txGWTtYfXN62OdHQSpc4SACuEpCpKk4syt/A3N39xN8M4u0vAqX+b5 0mBxBFzBDFl5ZqLNU4Orq+2wQaE9npJIXbY9TSUxiGeszNCsgz1o4m5ooB/CgNJfZ7 qJ1/uNqvtX4OPRmyV67i7D+w/pWRlJVaPf8Cgf2GOm6DlfZxbHnMH9PBBNvnnjuhPn fddqmnmF+OoXF4obY/gmXgTWQ16rprrTqWb3MBy4fD82c/1euFDebgOKDuiqx8A4qY ZGJTs+FpH65Yg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbn59SSz6tn7; Fri, 13 Jan 2023 11:55:01 +0100 (CET) From: pukkamustard To: 59487@debbugs.gnu.org Subject: [PATCH v3 0/6] guix: dune-build-system: Run all tests. Date: Fri, 13 Jan 2023 10:54:34 +0000 Message-Id: <20230113105440.28258-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59487 Cc: pukkamustard , julien@lepiller.eu, raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This removes the usage of the `test-target` argument from dune-build-system completely. Dune automatically finds tests for packages being built. The previous test-target was limiting the search of tests to specific folders. In some cases the wrong folders. I could not systematically check all affected packages, but have fixed tests for some (these are packages for which previously we were not running tests). -pukkamustard pukkamustard (5): gnu: Add ocaml-cinaps. gnu: ocaml-ppxlib: Clean up inputs. gnu: ocaml-cohttp: Run tests. guix: dune-build-system: Run all tests. gnu: ocaml-ppx-expect: Disable tests. raingloom (1): guix: dune-build-system: Remove usage of test-target argument. gnu/packages/ocaml.scm | 209 +++++++++++++------------------ guix/build/dune-build-system.scm | 4 +- 2 files changed, 86 insertions(+), 127 deletions(-) base-commit: 9ad5c3deeaebfb6f953579992a082d8327730611 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 13 05:55:13 2023 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:13 +0000 Received: from localhost ([127.0.0.1]:49680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiK-0007WI-ON for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:13 -0500 Received: from mout01.posteo.de ([185.67.36.65]:55741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiI-0007Vt-Mt for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:11 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2C7092402B2 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607305; bh=tTjzM73dIKBsgYaSDhp2WhTeg//SSSj0uOw3Rs/OGIo=; h=From:To:Cc:Subject:Date:From; b=ab9U1UYzVGt2Pm2EzdvIN2VkSRXiPfM1d7qcz/0f+UVzZR9bldFmix2zkwNKifAkt IR3+WpPGA4dEvYnTLRLRcsa80oBsrTricBRqiildVnltXD69/V68CFz7+8JEn9gRWy +uXJHktUf7aTfDexWBFtnrjCAE8CWvo8M2ppmrRl41bt/j7WrIpMmIiXlCNZFDgllg mB0bIKIoltavayXDko0kmfGuie8jcRWLPWq90f+6coK3Db0FP2R/TEHnxhxVnRtlls y4Ru7wqLfnI/YdKtr+BejR7zw2s3d25p8/vrl9Hg8XxfphryP7VWO7DZdOTiStOiFn hE/myPUjdLStQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbr343yz6tmQ; Fri, 13 Jan 2023 11:55:04 +0100 (CET) From: pukkamustard To: 59487@debbugs.gnu.org Subject: [PATCH v3 1/6] gnu: Add ocaml-cinaps. Date: Fri, 13 Jan 2023 10:54:35 +0000 Message-Id: <20230113105440.28258-2-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59487 Cc: pukkamustard , julien@lepiller.eu, raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-cinaps): New variable. --- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5109cd052a..b37cfa4681 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5939,6 +5939,36 @@ (define-public ocaml-ppx-derivers as part of the same ocaml-migrate-parsetree driver.") (license license:bsd-3))) +(define-public ocaml-cinaps + ;; The commit removes the unused dependency of ocaml-ppx-jane. We need to + ;; use this as we would otherwise have a dependency loop between + ;; ocaml-ppxlib and ocaml-ppx-jane. + (let ((commit "d974bb2db3ab1ab14e81f989b5bdb609462bff47") + (revision "0")) + (package + (name "ocaml-cinaps") + (version (git-version "0.15.1" revision commit)) + (home-page "https://github.com/ocaml-ppx/cinaps") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00kb04vqlnk1pynqjhna5qhn8790ab17baxf4na5py1l1h1js8qx")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-re)) + (synopsis "Trivial metaprogramming tool for OCaml") + (description + "Cinaps is a trivial Metaprogramming tool using the OCaml toplevel. It is based +on the same idea as expectation tests. The user write some OCaml code inside +special comments and cinaps make sure that what follows is what is printed by +the OCaml code.") + (license license:expat)))) + (define-public ocaml-ppxlib (package (name "ocaml-ppxlib") -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 13 05:55:17 2023 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:17 +0000 Received: from localhost ([127.0.0.1]:49688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiP-0007Ws-2Y for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:17 -0500 Received: from mout02.posteo.de ([185.67.36.66]:38567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiN-0007Vy-77 for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:15 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6C54E2402F8 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607309; bh=PNqlwpLcnTyBJ+6V/GdlHe+PuA+581uEGM5K0VGGwaA=; h=From:To:Cc:Subject:Date:From; b=UA4ygi3yGrSKX2X/SmZo3Xnt1g11SKThgF/ZlpZ+Cr3yH0+bmuTi6J3wLctcGlm7J ze/Grgq7zb0Bgy+/0gqXz1aQA7ECFdlmqcE1ID72IdCQ9HzczNd++/H/54Zep2jxBu mZw8tBtIK/yOYnv0p+wr7QbyEAbZrLMMkY58OGCkU39w41DFb4y4DAIArLt1KlTJl9 R2TnCRxMpANGeVlJXZBKmaBGecpuFdi3CFGiACgZOu5UtXaPEEXcE8wMtbdjNfhH4j 3utOYsEluuaJmMG8qwuv6Z0N3nuy+rpWKW1vaiOVqLaStk25Q0Uvu7tXkMFi40g1e6 HitlqWhT6wD+A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbt0CL0z6tmH; Fri, 13 Jan 2023 11:55:05 +0100 (CET) From: pukkamustard To: 59487@debbugs.gnu.org Subject: [PATCH v3 2/6] gnu: ocaml-ppxlib: Clean up inputs. Date: Fri, 13 Jan 2023 10:54:36 +0000 Message-Id: <20230113105440.28258-3-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59487 Cc: pukkamustard , julien@lepiller.eu, raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppxlib): [propagated-inputs] Remove unused inputs. [native-inputs] Move test dependencies from propagated-inputs here and add ocaml-cinaps. --- gnu/packages/ocaml.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b37cfa4681..1507405f7e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6003,14 +6003,14 @@ (define-public ocaml-ppxlib ((" \"(Some ppx-es.*)\")" _ m) (string-append " \"" m "\".")))))))) (propagated-inputs - (list ocaml-base - ocaml-compiler-libs - ocaml-migrate-parsetree - ocaml-stdlib-shims + (list ocaml-compiler-libs ocaml-ppx-derivers - ocaml-stdio - ocaml-result - ocaml-sexplib0)) + ocaml-sexplib0 + ocaml-stdlib-shims)) + (native-inputs + (list ocaml-stdio + ocaml-cinaps + ocaml-base)) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-ppxlib)))) (synopsis "Base library and tools for ppx rewriters") -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 13 05:55:17 2023 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:17 +0000 Received: from localhost ([127.0.0.1]:49690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiP-0007Wu-Ae for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:17 -0500 Received: from mout02.posteo.de ([185.67.36.66]:33561) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiN-0007Vx-8W for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:15 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6C5302401B7 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607309; bh=DYDQyBmfiOVcdKDJyM2khAYgy7iOS748wuPQdM4Kccg=; h=From:To:Cc:Subject:Date:From; b=hUFe4kOLjDxqje6VHcbG5sjW8ZNjBFY9DSBDXWmErE0Id/Td8sIogfKn46YP1WetG uxnZaqdCCs3obxrZX1blmETicZiNErabJQKFM4ZO2kuhVCA7ok1dEb1IXVHGoxAPGd UMNaIQS9C7UaIRK3d2tuPwyPGwjr4J9qc7hD6PBFBdCkpHzRAgd5XxDtWxlOCr+uTY LUyXkZCVKgluVVWkmrBvbWTfDS7KhYlVwo9mUlIijBVWEx3/fC30DWp34vdI/AoPuy 6eAKXW2NZ8erA75nsGypws0X7MFxWiR7RbxDbIrPtiiQahd4J4rFwM8yA5qUtdGrmw iG+mgTH3Ckj6A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbv4d02z6tmH; Fri, 13 Jan 2023 11:55:07 +0100 (CET) From: pukkamustard To: 59487@debbugs.gnu.org Subject: [PATCH v3 3/6] gnu: ocaml-cohttp: Run tests. Date: Fri, 13 Jan 2023 10:54:37 +0000 Message-Id: <20230113105440.28258-4-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59487 Cc: pukkamustard , julien@lepiller.eu, raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Tests were not being run as test-target was pointing to a testing library and not tests. - gnu/package/ocaml.scm (ocaml-cohttp): [arguments]: Remove test-target. [native-inputs]: Add ocaml-crowbar. --- gnu/packages/ocaml.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1507405f7e..1ed837eccd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8961,9 +8961,7 @@ (define-public ocaml-cohttp (base32 "074xis3wmr76gadh1ffmfzjfx13mw4kr2s6rkwqwzcl6l85n9x2z")))) (build-system dune-build-system) - (arguments - '(#:package "cohttp" - #:test-target "cohttp_test/src")) + (arguments '(#:package "cohttp")) (propagated-inputs (list ocaml-re ocaml-uri @@ -8973,7 +8971,10 @@ (define-public ocaml-cohttp ocaml-stringext ocaml-base64)) (native-inputs - (list ocaml-fmt ocaml-jsonm ocaml-alcotest)) + (list ocaml-fmt + ocaml-jsonm + ocaml-alcotest + ocaml-crowbar)) (home-page "https://github.com/mirage/ocaml-cohttp") (synopsis "OCaml library for HTTP clients and servers") (description -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 13 05:55:21 2023 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:21 +0000 Received: from localhost ([127.0.0.1]:49696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiS-0007XG-QG for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:21 -0500 Received: from mout02.posteo.de ([185.67.36.66]:60193) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiN-0007W0-D3 for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:16 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D9DC02401B7 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607309; bh=tIEUPTKPAymEXbxC+7GqAm5PBGVLawgY6X0nExXLad8=; h=From:To:Cc:Subject:Date:From; b=JVoWZHSPTBByGmRYC51p3qpYZg4LzGnz9wbOC6k6bPJ+vGLo7cf5E1VYlquIs1Bj4 bBxlZYybWmjV8Rn27h1Pywk0uQ7RLLaXMDVDMVoTB0hv9G8VpKukbjskGrD+3mfi09 dhwmf9vanmf7FvqW/kCimGctF12rRl51KWhVgnRrwFXN6JAjS2HdvI7aatbtpKKNpY icPKH4pBSBVwIOM02P9p4K5eyRyRC0Mahf7oGjKGN0YCDZw0IiX0vCQ2s2tM5rxzHX juxBQCd9qfFVzSE+nwiBv3iw5hBLbgFg+lRxJpjYwBdKRZ95/Qa2H/bjLU6Tc6cSA7 SWOxX1VlxTtNA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbx1FjLz6tn4; Fri, 13 Jan 2023 11:55:09 +0100 (CET) From: pukkamustard To: 59487@debbugs.gnu.org Subject: [PATCH v3 4/6] guix: dune-build-system: Run all tests. Date: Fri, 13 Jan 2023 10:54:38 +0000 Message-Id: <20230113105440.28258-5-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59487 Cc: pukkamustard , julien@lepiller.eu, raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * guix/build/dune-build-system.scm (check): Do not use test-target argument and let dune run all tests for a given package. --- guix/build/dune-build-system.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/dune-build-system.scm b/guix/build/dune-build-system.scm index e9ccc71057..f311cd37f1 100644 --- a/guix/build/dune-build-system.scm +++ b/guix/build/dune-build-system.scm @@ -42,13 +42,13 @@ (define* (build #:key (build-flags '()) (jbuild? #f) build-flags))) #t) -(define* (check #:key (test-flags '()) (test-target "test") tests? +(define* (check #:key (test-flags '()) tests? (jbuild? #f) (package #f) (dune-release-flags '()) #:allow-other-keys) "Test the given package." (when tests? (let ((program (if jbuild? "jbuilder" "dune"))) - (apply invoke program "runtest" test-target + (apply invoke program "runtest" (append (if package (list "-p" package) dune-release-flags) test-flags)))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 13 05:55:22 2023 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:22 +0000 Received: from localhost ([127.0.0.1]:49698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiT-0007XO-2V for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:22 -0500 Received: from mout01.posteo.de ([185.67.36.65]:46525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiP-0007WF-Jy for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:19 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 19F2E2402A0 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607312; bh=xDcOdoGYs8FUspkfINbNGeZBIux91o3JHg2m3MLv2NE=; h=From:To:Cc:Subject:Date:From; b=GG6e6+luUdjQId4Cg2a8Uo0RxKxyb3KC9xn1bVCgDH4wF7U3uFS7/y/FjSkBTb3Mi UCTvBW1GIo6utjNxqTg/TUBBeqZt75s3Ew9nc+ZhkF6yOKORjSdk7uhHL8k3xZbbVJ Ki3KHezo5l9ghZHk9nwEpY3zusXdqSmni3hH1V2vQEMzePzLdtxtEMnkVbBKAGhGe/ AJWGcF+IZ49IKbwxzD2RS6zNW9boQpln3fZT19VRY7n2WnR0NGYbMMgeKKIMr10mJj RKRqvsyV5ExTsprCbY8n8kuBNLPPQl1hHnCN+wmF1V4zE+R1BBmkcvXW8Zzv4xt180 0KJztYtHQLQug== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbz2WyMz6tn4; Fri, 13 Jan 2023 11:55:11 +0100 (CET) From: pukkamustard To: 59487@debbugs.gnu.org Subject: [PATCH v3 5/6] guix: dune-build-system: Remove usage of test-target argument. Date: Fri, 13 Jan 2023 10:54:39 +0000 Message-Id: <20230113105440.28258-6-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59487 Cc: julien@lepiller.eu, raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: raingloom gnu/packages/ocaml.scm: Remove test-target argument from packages built with dune-build-system. Co-authored: pukkamustard --- gnu/packages/ocaml.scm | 153 +++++++++++------------------------------ 1 file changed, 39 insertions(+), 114 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1ed837eccd..371c3ebb71 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -664,8 +664,6 @@ (define-public ocaml-cudf (base32 "1lvrmpscbk1kjv5ag5bzlzv520xk5zw2haf6q7chvz98gcm9g0hk")))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (propagated-inputs (list ocaml-extlib)) (native-inputs (list ocaml-ounit2)) (home-page "https://www.mancoosi.org/cudf/") @@ -855,8 +853,7 @@ (define-public opam "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'pre-build (lambda* (#:key inputs make-flags #:allow-other-keys) @@ -1628,8 +1625,7 @@ (define-public ocaml-frontc "1mi1vh4qgscnb470qwidccaqd068j1bqlz6pf6wddk21paliwnqb")))) (build-system dune-build-system) (arguments - `(#:test-target "test.t" - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ @@ -1699,8 +1695,6 @@ (define-public ocaml-qcheck (sha256 (base32 "1r0m5p1dd06lbgfxqdpl1ya4vb8252z7hqkvdi9k444g4rx2ay3p")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-alcotest ocaml-ounit ocaml-ppxlib)) (native-inputs @@ -1744,8 +1738,6 @@ (define-public ocaml-qtest (base32 "04ghjshh6104xyglm0db9kv90m62qla5f4bfrlndv6dsvgw3rdjl")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs `(("ounit" ,ocaml-ounit) ("qcheck" ,ocaml-qcheck))) @@ -1771,8 +1763,6 @@ (define-public ocaml-stringext (base32 "1m09cmn3vrk3gdm60fb730qsygcfyxsyv7gl9xfzck08q1x2x9qx")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs `(("ocamlbuild" ,ocamlbuild) ("qtest" ,ocaml-qtest))) @@ -2047,8 +2037,7 @@ (define-public ocaml4.07-ppx-tools-versioned "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:package "ppx_tools_versioned")) + `(#:package "ppx_tools_versioned")) (propagated-inputs (list ocaml-migrate-parsetree)) (properties `((upstream-name . "ppx_tools_versioned"))) @@ -2167,8 +2156,7 @@ (define-public ocaml-result "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:dune ,dune-bootstrap)) + `(#:dune ,dune-bootstrap)) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result)) (ocaml5.0-variant . ,(delay ocaml5.0-result)))) (home-page "https://github.com/janestreet/result") @@ -2183,8 +2171,7 @@ (define-public ocaml4.09-result (inherit ocaml-result) (name "ocaml4.09-result") (arguments - `(#:test-target "." - #:dune ,ocaml4.09-dune-bootstrap + `(#:dune ,ocaml4.09-dune-bootstrap #:ocaml ,ocaml-4.09 #:findlib ,ocaml4.09-findlib)))) @@ -2193,8 +2180,7 @@ (define-public ocaml5.0-result (inherit ocaml-result) (name "ocaml5.0-result") (arguments - `(#:test-target "." - #:dune ,ocaml5.0-dune-bootstrap + `(#:dune ,ocaml5.0-dune-bootstrap #:ocaml ,ocaml-5.0 #:findlib ,ocaml5.0-findlib)))) @@ -2331,8 +2317,7 @@ (define-public ocaml-csv "0y2hlqlmqs7r4y5mfzc5qdv7gdp3wxbwpz458vf7fj4593vg94cf")))) (build-system dune-build-system) (arguments - `(#:package "csv" - #:test-target ".")) + `(#:package "csv")) (home-page "https://github.com/Chris00/ocaml-csv") (synopsis "Pure OCaml functions to read and write CSV") (description @@ -2570,7 +2555,6 @@ (define-public ocaml-alcotest (build-system dune-build-system) (arguments `(#:package "alcotest" - #:test-target "." #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-test-format @@ -2615,8 +2599,7 @@ (define-public ocaml4.07-alcotest (base32 "1frwi185z4aadmaf0vp8xk5227nyg7nmh28ijj5l7ncjr5slvhz8")))) (arguments - `(#:package "alcotest" - #:test-target ".")) + `(#:package "alcotest")) (properties '())))) (define-public ocaml-ppx-tools @@ -2689,8 +2672,6 @@ (define-public ocaml-ssl (sha256 (base32 "1bg5vagklq6yfxsvcnj2i76xis8hb59088hkic82smyrxdjd1kjs")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list autoconf automake ocaml-alcotest which)) (propagated-inputs (list openssl)) @@ -2760,7 +2741,6 @@ (define-public ocaml-optint (sha256 (base32 "1qj32bcw1in7s6raxdvbmjr3lvj99iwv98x1ar9cwxp4zf8ybfss")))) (build-system dune-build-system) - (arguments `(#:test-target ".")) (native-inputs (list ocaml-crowbar ocaml-monolith ocaml-fmt)) (synopsis "Efficient integer types on 64-bit architectures for OCaml") (description @@ -2811,8 +2791,7 @@ (define ocaml-eio (sha256 (base32 "118raxdwv6pn5b152ffdhmwdi0l4wlwflcj2nmckfmm7v1z2fq4s")))) (build-system dune-build-system) - (arguments `(#:package "eio" - #:test-target ".")) + (arguments `(#:package "eio")) (propagated-inputs (list ocaml-bigstringaf ocaml-cstruct ocaml-lwt @@ -2837,8 +2816,7 @@ (define ocaml-eio-luv (package (inherit ocaml-eio) (name "ocaml-eio-luv") - (arguments `(#:package "eio_luv" - #:test-target ".")) + (arguments `(#:package "eio_luv")) (propagated-inputs (list ocaml-eio ocaml-luv)) (native-inputs (list ocaml-mdx)) (synopsis "Libuv-based backend for Ocaml Eio") @@ -2863,7 +2841,6 @@ (define-public ocaml-uring (sha256 (base32 "0k70y7nb2wrk2yql0pwnrhsp1x7k9ld4gd8iihbv6r34kcm3a5m1")))) (build-system dune-build-system) - (arguments `(#:test-target ".")) (propagated-inputs (list ocaml-cstruct ocaml-fmt @@ -2884,8 +2861,7 @@ (define ocaml-eio-linux (package (inherit ocaml-eio) (name "ocaml-eio-linux") - (arguments `(#:package "eio_linux" - #:test-target ".")) + (arguments `(#:package "eio_linux")) (propagated-inputs (list ocaml-eio ocaml-uring @@ -2908,7 +2884,6 @@ (define ocaml-eio-main (inherit ocaml-eio) (name "ocaml-eio-main") (arguments `(#:package "eio_main" - #:test-target "." ;; tests require network #:tests? #f)) (propagated-inputs @@ -3243,8 +3218,7 @@ (define-public ocaml-gen "1z5nw5wljvcqp8q07h336bbvf9paynia0jsdh4486hlkbmr1ask1")))) (build-system dune-build-system) (arguments - `(#:package "gen" - #:test-target ".")) + `(#:package "gen")) (propagated-inputs (list ocaml-odoc ocaml-seq)) (native-inputs @@ -3504,8 +3478,6 @@ (define-public ocaml-ocp-indent (base32 "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-cmdliner)) (home-page "https://www.typerex.org/ocp-indent.html") @@ -3729,7 +3701,6 @@ (define-public ocaml-benchmark (sha256 (base32 "0d0vdfjgjzf1y6wkd714d8b0piv1z9qav5ahsapynqzk4b4ahhnp")))) (build-system dune-build-system) - (arguments `(#:test-target "tests")) (home-page "https://github.com/Chris00/ocaml-benchmark") (synopsis "Benchmark running times of code") (description @@ -4070,8 +4041,6 @@ (define-public ocaml-re (sha256 (base32 "1g0vmpx6ylv8m0w77zarn215pgb4czc6gcpb2fi5da1s307zwr0w")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-seq)) (native-inputs @@ -4094,8 +4063,7 @@ (define-public ocaml4.07-re (package (inherit ocaml-re) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-dune-version (lambda _ @@ -4116,8 +4084,6 @@ (define-public ocaml-ocplib-endian "1klj4g451s7m5r8bxmwc1rpvngpqdm40csnx9smgc06pwy2fax2c")) (file-name (git-file-name name version)))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (native-inputs `(("cppo" ,ocaml-cppo))) (home-page "https://github.com/OCamlPro/ocplib-endian") @@ -4144,8 +4110,7 @@ (define-public ocaml-cstruct "0dpbirs6lzp0bclr3wcw407jjspll7iy66z18zks3mjccvlxd21w")))) (build-system dune-build-system) (arguments - `(#:package "cstruct" - #:test-target ".")) + `(#:package "cstruct")) (propagated-inputs (list ocaml-bigarray-compat)) (native-inputs @@ -4188,8 +4153,6 @@ (define-public ocaml-hex (base32 "0xnl5wxd2qrba7phm3mdrjwd2kk26kb17dv94ciwp49ljcj28qc1")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs `(("ocaml-bigarray-compat" ,ocaml-bigarray-compat) ("cstruct" ,ocaml-cstruct))) @@ -4213,8 +4176,7 @@ (define-public ocaml-ezjsonm (base32 "004knljxqxn9zq0rnq7q7wxl4nwlzydm8p9f5cqkl8il5yl5zkjm")))) (build-system dune-build-system) (arguments - `(#:package "ezjsonm" - #:test-target ".")) + `(#:package "ezjsonm")) (native-inputs (list ocaml-alcotest js-of-ocaml node)) (propagated-inputs (list ocaml-jsonm ocaml-uutf ocaml-sexplib0 ocaml-hex)) (home-page "https://github.com/mirage/ezjsonm/") @@ -4241,8 +4203,7 @@ (define-public ocaml-uri (base32 "1bgkc66cq00mgnkz3i535srwzwc4cpdsv0mly5dzvvq33451xwf0")))) (build-system dune-build-system) - (arguments '(#:package "uri" - #:test-target ".")) + (arguments '(#:package "uri")) (propagated-inputs (list ocaml-stringext ocaml-angstrom)) (native-inputs @@ -4268,8 +4229,7 @@ (define-public ocaml4.07-uri (base32 "1ppbav41mszpjcl0zi3fyg958cxyfs57i7kvha4ds9ydn89bjmrh")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'update-deprecated (lambda _ @@ -4624,8 +4584,7 @@ (define-public ocaml-camomile "0chn7ldqb3wyf95yhmsxxq65cif56smgz1mhhc7m0dpwmyq1k97h")))) (build-system dune-build-system) (arguments - `(#:test-target "camomile-test" - #:tests? #f ; Tests fail, see https://github.com/yoriyuki/Camomile/issues/82 + `(#:tests? #f ; Tests fail, see https://github.com/yoriyuki/Camomile/issues/82 #:phases (modify-phases %standard-phases (add-before 'build 'fix-usr-share @@ -4692,8 +4651,6 @@ (define-public ocaml-zed ocaml-uucp ocaml-uuseg ocaml-odoc)) - (arguments - `(#:test-target ".")) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed)))) (synopsis "Abstract engine for text edition in OCaml") (description @@ -4741,8 +4698,6 @@ (define-public ocaml-lambda-term (base32 "1pkamblc6h0rsbk901cqn3xr9gqa3g8wrwyx5zryaqvb2xpbhp8b")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-logs ocaml-lwt @@ -4796,8 +4751,6 @@ (define-public ocaml-utop (sha256 (base32 "1pcix3h9f7is06581iax4i08zkd6sv8y5hy1vvxhqhcsd9z0qfl3")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list ocaml-cppo)) (propagated-inputs @@ -4852,8 +4805,6 @@ (define-public ocaml-ansiterminal (base32 "052qnc23vmxp90yympjz9q6lhqw98gs1yvb3r15kcbi1j678l51h")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (properties `((upstream-name . "ANSITerminal"))) (home-page "https://github.com/Chris00/ANSITerminal") (synopsis @@ -5078,8 +5029,6 @@ (define-public dedukti (base32 "1dsr3s88kgmcg3najhc29cwfvsxa2plvjws1127fz75kmn15np28")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (inputs (list gmp ocaml-cmdliner ocaml-z3 z3)) (native-inputs (list ocaml-menhir)) (synopsis "Proof-checker for the λΠ-calculus modulo theory, an extension of @@ -5233,8 +5182,6 @@ (define-public ocaml-bindlib (base32 "1viyws3igy49hfaj4jaiwm4iggck9zdn7r3g6kh1n4zxphqk57yk")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list ocamlbuild ocaml-findlib)) (home-page "https://rlepigre.github.io/ocaml-bindlib/") @@ -5261,8 +5208,6 @@ (define-public ocaml-earley (base32 "1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-stdlib-shims)) (synopsis "Parsing library based on Earley Algorithm") @@ -5287,8 +5232,6 @@ (define-public ocaml-timed "1aqmkpjv5jk95lc2m3qyyrhw8ra7n9wj8pv3bfc83l737zv0hjn1")) (file-name (git-file-name name version)))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (synopsis "Timed references for imperative state") (description "Timed references for imperative state. This module provides an alternative type for references (or mutable cells) supporting undo/redo @@ -5353,8 +5296,7 @@ (define-public ocaml-yojson "1habsh00ihjhk1g1csxqg3hj8izk5zvgc7wm579wyjw35vzcmwr1")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:package "yojson")) + `(#:package "yojson")) (propagated-inputs (list ocaml-seq)) (native-inputs (list ocaml-alcotest ocaml-cppo)) (synopsis "Low-level JSON library for OCaml") @@ -5504,8 +5446,7 @@ (define-public ocaml-gsl "1l5zkkkg8sglsihrbf10ivq9s8xzl1y6ag89i4jqpnmi4m43fy34")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-gsl-directory (lambda* (#:key inputs #:allow-other-keys) @@ -5898,8 +5839,6 @@ (define-public ocaml-ppx-deriving (base32 "1wqcnw4wi6pfjjhixpakckm03dpj990259za432804471a6spm2j")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ppx-derivers ocaml-ppxlib ocaml-result)) (native-inputs @@ -6975,7 +6914,6 @@ (define-public ocaml-ppx-cold (janestreet-origin "ppx_cold" version "13gqmfw2sq80anag9bwpm35600l1fnfn7mh9cbj1291k84rsx7wb")) (build-system dune-build-system) - (arguments `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_cold"))) @@ -7160,8 +7098,6 @@ (define-public ocaml-ppx-typerep-conv (sha256 (base32 "1q1lzykpm83ra4l5jh4rfddhd3c96kx4s4rvx0w4b51z1qk56zam")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-base ocaml-typerep ocaml-ppxlib)) (properties `((upstream-name . "ppx_typerep_conv") (ocaml4.07-variant . ,(delay ocaml4.07-ppx-typerep-conv)))) @@ -7227,8 +7163,6 @@ (define-public ocaml-ppx-stable (sha256 (base32 "1as0v0x8c9ilyhngax55lvwyyi4a2wshyan668v0f2s1608cwb1l")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_stable"))) (home-page "https://github.com/janestreet/ppx_stable") @@ -7246,8 +7180,6 @@ (define-public ocaml-ppx-base "ppx_base" version "181w7y2has8jsrqdsvd08q5nhnkx523vwsk3lg0cjix55qssvfyn")) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ppx-compare ocaml-ppx-cold @@ -7403,8 +7335,6 @@ (define-public ocaml-ppx-disable-unused-warnings (sha256 (base32 "0sb5i4v7p9df2bxk66rjs30k9fqdrwsq1jgykjv6wyrx2d9bv955")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_disable_unused_warnings"))) (home-page "https://github.com/janestreet/ppx_disable_unused_warnings") @@ -7427,8 +7357,6 @@ (define-public ocaml-ppx-jane (sha256 (base32 "1p6847gdfnnj6qpa4yh57s6wwpsl7rfgy0q7993chz24h9mhz5lk")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-base-quickcheck ocaml-ppx-assert @@ -7621,8 +7549,7 @@ (define-public ocaml4.07-jane-street-headers "0afhzm08l9v883fhpqqh2lmy7az609pxif40bp7x1sk8c0yszqsh")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 + `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (home-page "https://github.com/janestreet/jane-street-headers") @@ -8095,8 +8022,7 @@ (define-public ocaml4.07-bisect-ppx (native-inputs `(("ocaml-ounit2" ,ocaml-ounit2))) (arguments - `(#:test-target "." - ;; tests require git and network + `(;; tests require git and network #:tests? #f)) (properties '((upstream-name . "bisect_ppx")))))) @@ -8235,8 +8161,6 @@ (define-public ocaml-fftw3 (base32 "07ljbin9dsclsqh24p7haqjccz1w828sf5xfwlzl298d4a6zsbhs")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list fftw fftwf)) (native-inputs @@ -8296,8 +8220,6 @@ (define-public ocaml-cairo2 (base32 "06ag9b88ihhr7yd3s9l0ac7ysig02fmlmsswybbsvz71ni0mb105")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (inputs `(("cairo" ,cairo) ("gtk+-2" ,gtk+-2) @@ -8469,7 +8391,18 @@ (define-public lablgtk3 (build-system dune-build-system) (arguments `(#:package "lablgtk3" - #:test-target ".")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'make-writable + (lambda _ + (for-each (lambda (file) + (chmod file #o644)) + (find-files "." ".")))) + (add-before 'build 'set-version + (lambda _ + (substitute* "dune-project" + (("\\(name lablgtk3\\)") + (string-append "(name lablgtk3)\n(version " ,version ")")))))))) (propagated-inputs (list ocaml-cairo2 ocaml-camlp-streams)) (inputs @@ -8494,8 +8427,7 @@ (define-public ocaml-lablgtk3-sourceview3 (propagated-inputs (list lablgtk3)) (native-inputs (list gtksourceview-3 pkg-config)) (arguments - `(#:package "lablgtk3-sourceview3" - #:test-target ".")) + `(#:package "lablgtk3-sourceview3")) (synopsis "OCaml interface to GTK+ gtksourceview library") (description "This package provides the lablgtk interface to the GTK+ gtksourceview library."))) @@ -8757,8 +8689,6 @@ (define-public ocaml-bigstringaf (base32 "188j9awxg99vrp2l3rqfmdxdazq5xrjmg1wf62vfqsks9sff6wqx")))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (propagated-inputs (list ocaml-bigarray-compat)) (native-inputs @@ -8890,8 +8820,7 @@ (define-public ocaml-angstrom (build-system dune-build-system) (arguments ;; Only build the base angstrom package. - '(#:package "angstrom" - #:test-target ".")) + '(#:package "angstrom")) (propagated-inputs (list ocaml-bigstringaf)) (native-inputs @@ -8938,8 +8867,7 @@ (define-public ocaml-uri-sexp (inherit ocaml-uri) (name "ocaml-uri-sexp") (arguments - '(#:package "uri-sexp" - #:test-target ".")) + '(#:package "uri-sexp")) (propagated-inputs (list ocaml-uri ocaml-ppx-sexp-conv ocaml-sexplib0)) (native-inputs (list ocaml-ounit)) @@ -8998,8 +8926,8 @@ (define-public js-of-ocaml (base32 "14ig69iyc9yzniclfsc6cz9g9zqp96bs66y6dy4rzrm78s81w6i1")))) (build-system dune-build-system) (arguments - `(#:tests? #f ;tests assume ocaml 4.13 - #:test-target ".")) + ;;tests assume ocaml 4.13 + `(#:tests? #f)) (propagated-inputs (list ocaml-ppxlib ocaml-uchar @@ -9072,7 +9000,6 @@ (define-public ocaml-monolith (base32 "1b6jj4ivl9ni8kba7wls4xsqdy8nm7q9mnx9347jvb99dmmlj5mc")))) (build-system dune-build-system) - (arguments `(#:test-target ".")) (propagated-inputs (list ocaml-afl-persistent ocaml-pprint ocaml-seq)) (home-page "https://gitlab.inria.fr/fpottier/monolith") (synopsis "Framework for testing an OCaml library using afl-fuzz") @@ -9123,8 +9050,6 @@ (define-public ocaml-crowbar (base32 "11f3kiw58g8njx15akx16xcplzvzdw9y6c4jpyfxylkxws4g0f6j")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ocplib-endian ocaml-cmdliner -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 13 05:55:26 2023 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:27 +0000 Received: from localhost ([127.0.0.1]:49702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiY-0007Xj-B4 for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:26 -0500 Received: from mout01.posteo.de ([185.67.36.65]:34101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiS-0007WZ-H5 for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:20 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 017DB24027F for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607315; bh=U3IrL8sEOKnHlmEN5B6lOSrBA4utknT3APBQN4nkhvs=; h=From:To:Cc:Subject:Date:From; b=VvqFk9161zPcQq6qhCWi/FvAtpsKLasO2pjzwuh3UAZ8xy3fZqq5IBNrOVddPKM8U hdplGuCN8rl+D3dkGQo1zWKgicLj8kcSJE6+1BARZiksi2qhtpqAMYhtlprYEqVF+p qPTu1x387bygLS3teh+u2RLPmh9ZJsJLKfhGuBzAdJtxJhs/jIUAJs7CAKeQ+2H92h vT/IgpkmKmzO7K3uiW8f5qbs/8mTOaRMZR1d+/MUU6TD90bnDgOt4GdE7P/8Nmwa+m c2wtRmyh2ibm0Uj0j0ZodxzxtM5D9ROs8eip76ZX6/5lKLfchJ2Af7W/DLfoUOzSCL 91+vadDsIxMxw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdc21Dtrz6tnG; Fri, 13 Jan 2023 11:55:14 +0100 (CET) From: pukkamustard To: 59487@debbugs.gnu.org Subject: [PATCH v3 6/6] gnu: ocaml-ppx-expect: Disable tests. Date: Fri, 13 Jan 2023 10:54:40 +0000 Message-Id: <20230113105440.28258-7-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59487 Cc: pukkamustard , julien@lepiller.eu, raingloom X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Tests require a package that would cause a cyclic dependency. * gnu/packages/ocaml.scm (ocaml-ppx-expect): Disable tests. --- gnu/packages/ocaml.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 371c3ebb71..a8412a6903 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6981,6 +6981,9 @@ (define-public ocaml-ppx-expect (base32 "134dl5qhjxsj2mcmrx9f3m0iys0n5mjfpz9flj8zn8d2jir43776")))) (build-system dune-build-system) + (arguments + ;; Cyclic dependency with ocaml-ppx-jane + `(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-ppx-here -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 15 10:03:22 2023 Received: (at 59487-done) by debbugs.gnu.org; 15 Jan 2023 15:03:22 +0000 Received: from localhost ([127.0.0.1]:59386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pH4Xa-0003dz-3g for submit@debbugs.gnu.org; Sun, 15 Jan 2023 10:03:22 -0500 Received: from lepiller.eu ([89.234.186.109]:58638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pH4XW-0003do-H0 for 59487-done@debbugs.gnu.org; Sun, 15 Jan 2023 10:03:20 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 106eaec5; Sun, 15 Jan 2023 15:03:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=K0Bms8qgj1d3 zp6g33dXL2l4DFHqe9HtjEt3X/5F4Go=; b=TY9nIL+eaJYX/Kn3gWbFZ0WKqBR3 Ei4b6YnvA5XfARZITR2Q3BYmmpfEgZ1PamNWcNVMvraZnFf3jJiKyQ+ofrH3Egp9 sY3EwdloSvvy9SpVtRkBSKhsFkDNu2+/kkHYmH8OiMeImLJdK+1SV84KDR7bHDbO R+uizyse0JT8pbXa0flNaCUOjavc7oveI4NQH0g/q7rOA4+rVpdr4Y0frqIHLjRP POpeDAFfsh5yhBpXS7atuqYdcI0V6DtBzJro40lPVJGTTjN1zl6pZFXDfwW8bDXM hansiui+Tg5QxyFS63uATFRDe85o0wClmtmiqe/wqtyQ/SIBflvAW0y6Fw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 9c3540a8 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 15 Jan 2023 15:03:05 +0000 (UTC) Date: Sun, 15 Jan 2023 16:02:54 +0100 From: Julien Lepiller To: pukkamustard Subject: Re: [PATCH v3 0/6] guix: dune-build-system: Run all tests. Message-ID: <20230115160254.4e0a18fc@sybil.lepiller.eu> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59487-done Cc: raingloom , 59487-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I was able to check the dependents, so pushed to master as 7686b68f6bb1ae5dc206178805c32bceceea3743 - 79bf3b54a64e304a29334b5029c24d942d9dc051. Note that I moved patches around, to have the last one before removing test-target. I merged patches 3, 4 and 5 because intermediate states would have failing packages otherwise. Also, patch 5 had unrelated changes to lablgtk3 which I droped, because the package still builds. If that was intentional, please send a new patch for that :) I also listed all modified packages in the commit message, and removed the Co-authored line which listed the author already. Thanks! From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 28 07:26:40 2023 Received: (at 59487-close) by debbugs.gnu.org; 28 Jan 2023 12:26:40 +0000 Received: from localhost ([127.0.0.1]:39773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLkI3-00010L-SN for submit@debbugs.gnu.org; Sat, 28 Jan 2023 07:26:40 -0500 Received: from lepiller.eu ([89.234.186.109]:34666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLkI2-000108-GF; Sat, 28 Jan 2023 07:26:38 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id dbd51f08; Sat, 28 Jan 2023 12:26:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=zlgMyJ6EKtIr LBtJDa/Xz2c7IYY+wjqGzyzZCdux144=; b=huWqR94qx0CiWPvc/SadUDcp+Y+f 44VH1bB18SbUzoNCup9ay8hKDaeclwTyOAMFCfHwA52YoVntaCglMsNROFcaLxgh Djp+ZPUHqPHk8qmx1fN86DFIa4NeOc6as1uUgmNm4YC4Mi0QsKCGRXVvdQlZF2T7 Ov5lNc7DC5nyN2aTieBpqvU+xgs8QTlQKN9bcc+YNwdMiXTOuWNWLzJVmG5JQcu+ ZG+vobROdMR0+rzh+mO81zsACaaD8e0U3cz7nxyT/UuVGsSgqTEzkTwY+EKFYgAo HB4+7kMu0Jl4jUSc4RR4aqfKfTxe/6NrBJNiUF32MEvVu0Oor0iYmHFTjw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id be328b55 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 28 Jan 2023 12:26:32 +0000 (UTC) Date: Sat, 28 Jan 2023 13:26:31 +0100 From: Julien Lepiller To: raingloom Subject: Re: [bug#59981] [PATCH v2 2/2] gnu: Remove explicit test-target arguments in ocaml.scm. Message-ID: <20230128132631.0b9e6a9b@sybil.lepiller.eu> In-Reply-To: <20221212000747.24632-2-raingloom@riseup.net> References: <20221212000747.24632-1-raingloom@riseup.net> <20221212000747.24632-2-raingloom@riseup.net> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59487-close Cc: 59487-close@debbugs.gnu.org, 59981@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Closing since a similar patch was pushed already. Thanks! From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 28 07:28:46 2023 Received: (at 59487-close) by debbugs.gnu.org; 28 Jan 2023 12:28:46 +0000 Received: from localhost ([127.0.0.1]:39778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLkK6-00013a-A3 for submit@debbugs.gnu.org; Sat, 28 Jan 2023 07:28:46 -0500 Received: from lepiller.eu ([89.234.186.109]:51574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLkK5-00013P-0I; Sat, 28 Jan 2023 07:28:45 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 48e8ae94; Sat, 28 Jan 2023 12:28:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=zlgMyJ6EKtIr LBtJDa/Xz2c7IYY+wjqGzyzZCdux144=; b=PFS8QDlZRPOVFa7LdM9B8XCcCaTT oVkrDlqcmvxcfEL9dG11aJFKHGiUxC1vVGW3Xsoqd73fqhk1AW5YkrZksLO5Q2iH Q5+QKVbYnThe7ao/iE+AY+e8OAQIHmZ8b4v5B+Yt4ExRwP68fJG0HJP1ZdZzQEj2 Gw2/s8OBfPa23v4zn4pzuZ1jIHWlV3+vZJz8nN9GC2eWsh47FxZyGCswJBmYWPO8 Ag3tJoD2pB3PVi1wDMWi8/S1tVpZ0zodk9pBuHaa2ke8AHg3WzREneO2AmGjOtHM iLb4VUr0oMEC35sRAKNpRBHqvQ4xkEPKQrxIvs6yLY38BFgJr/E2olk60A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 14121f10 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 28 Jan 2023 12:28:40 +0000 (UTC) Date: Sat, 28 Jan 2023 13:28:39 +0100 From: Julien Lepiller To: raingloom Subject: Re: [bug#59980] [PATCH v2 1/2] build-system/dune: Automatically deduce test-target in most cases. Message-ID: <20230128132839.49fab7f0@sybil.lepiller.eu> In-Reply-To: <20221212000747.24632-1-raingloom@riseup.net> References: <20221212000747.24632-1-raingloom@riseup.net> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59487-close Cc: 59487-close@debbugs.gnu.org, 59980@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Closing since a similar patch was pushed already. Thanks! From unknown Mon Jun 23 20:18:26 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 26 Feb 2023 12:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator