X-Loop: help-debbugs@HIDDEN Subject: [bug#69554] [PATCH] build-system: cmake: Build tests depending on `#:tests?`. Resent-From: Hartmut Goebel <h.goebel@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Mon, 04 Mar 2024 21:50:01 +0000 Resent-Message-ID: <handler.69554.B.170958897913016 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 69554 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69554 <at> debbugs.gnu.org X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.170958897913016 (code B ref -1); Mon, 04 Mar 2024 21:50:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Mar 2024 21:49:39 +0000 Received: from localhost ([127.0.0.1]:45072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rhGBm-0003Ns-LF for submit <at> debbugs.gnu.org; Mon, 04 Mar 2024 16:49:39 -0500 Received: from lists.gnu.org ([209.51.188.17]:52464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <h.goebel@HIDDEN>) id 1rhGBi-0003NW-2p for submit <at> debbugs.gnu.org; Mon, 04 Mar 2024 16:49:37 -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 <h.goebel@HIDDEN>) id 1rhGBD-0007UC-U4 for guix-patches@HIDDEN; Mon, 04 Mar 2024 16:49:03 -0500 Received: from mail01.noris.net ([62.128.1.221]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <h.goebel@HIDDEN>) id 1rhGBA-0005Fn-BN for guix-patches@HIDDEN; Mon, 04 Mar 2024 16:49:03 -0500 Received: from p57b08d98.dip0.t-ipconnect.de ([87.176.141.152] helo=hermia.goebel-consult.de) by mail01.noris.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) (envelope-from <h.goebel@HIDDEN>) id 1rhGB4-0003zV-Tn for guix-patches@HIDDEN; Mon, 04 Mar 2024 22:48:54 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id B53515F4DE; Mon, 4 Mar 2024 22:48:51 +0100 (CET) From: Hartmut Goebel <h.goebel@HIDDEN> Date: Mon, 4 Mar 2024 22:48:51 +0100 Message-ID: <b1d275cf773efa2cc9898f4439e4e5a7aac0af90.1709588880.git.h.goebel@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Noris-IP: 87.176.141.152 Received-SPF: pass client-ip=62.128.1.221; envelope-from=h.goebel@HIDDEN; helo=mail01.noris.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) * guix/build/cmake-build-system.scm (configure): New paremeter `#:tests?`. Add cmake option "-DBUILD_TESTING=" with value "ON" or "OFF" depending on build-system argument `#:tests?`. * * doc/guix.texi (Inspecting Services)[cmake-build-system]: Document it. --- doc/guix.texi | 10 ++++++++++ guix/build/cmake-build-system.scm | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 87fe9f803c..409d076d12 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9617,6 +9617,16 @@ parameter specifies in abstract terms the flags passed to the compiler; it defaults to @code{"RelWithDebInfo"} (short for ``release mode with debugging information''), which roughly means that code is compiled with @code{-O2 -g}, as is the case for Autoconf-based packages by default. + +Depending on the @code{#:tests?} parameter, the configure-flag +@code{BUILD_TESTING} is set to @code{ON} resp. @code{OFF}. +@code{BUILD_TESTING} is a +@url{https://cmake.org/cmake/help/v3.28/module/CTest.html, standard +defined by CMake} to enable or disable building tests. This aims to +save build time if tests are not run anyway, while trying to ensure +tests are build if they should be run. Anyhow, the CMakeLists.txt needs +to implement handling this flag. + @end defvar @defvar composer-build-system diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index d1ff5071be..71e8ca8a83 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -33,7 +33,7 @@ (define-module (guix build cmake-build-system) ;; Code: (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t) - build-type target + (tests? #t) build-type target #:allow-other-keys) "Configure the given package." (let* ((out (assoc-ref outputs "out")) @@ -62,6 +62,11 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t) ,(string-append "-DCMAKE_INSTALL_RPATH=" out "/lib") ;; enable verbose output from builds "-DCMAKE_VERBOSE_MAKEFILE=ON" + ;; ask for (not) building tests depending on #:tests? + ;; (CMakeLists.txt may or may not implement this check) + ,@(if tests? + '("-DBUILD_TESTING=OFF") ; not run anyway + '("-DBUILD_TESTING=ON")) ; overwrite any default option ;; Cross-build ,@(if target base-commit: 3da49b1472919a62df1fe399638f23a246aa325d -- 2.41.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Hartmut Goebel <h.goebel@HIDDEN> Subject: bug#69554: Acknowledgement ([PATCH] build-system: cmake: Build tests depending on `#:tests?`.) Message-ID: <handler.69554.B.170958897913016.ack <at> debbugs.gnu.org> References: <b1d275cf773efa2cc9898f4439e4e5a7aac0af90.1709588880.git.h.goebel@HIDDEN> X-Gnu-PR-Message: ack 69554 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 69554 <at> debbugs.gnu.org Date: Mon, 04 Mar 2024 21:50:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 69554 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 69554: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D69554 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#69554] [PATCH v2] build-system: cmake: Build tests depending on `#:tests?`. References: <b1d275cf773efa2cc9898f4439e4e5a7aac0af90.1709588880.git.h.goebel@HIDDEN> In-Reply-To: <b1d275cf773efa2cc9898f4439e4e5a7aac0af90.1709588880.git.h.goebel@HIDDEN> Resent-From: Hartmut Goebel <h.goebel@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Mon, 04 Mar 2024 23:00:03 +0000 Resent-Message-ID: <handler.69554.B69554.170959315330465 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 69554 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69554 <at> debbugs.gnu.org Received: via spool by 69554-submit <at> debbugs.gnu.org id=B69554.170959315330465 (code B ref 69554); Mon, 04 Mar 2024 23:00:03 +0000 Received: (at 69554) by debbugs.gnu.org; 4 Mar 2024 22:59:13 +0000 Received: from localhost ([127.0.0.1]:45223 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rhHH6-0007vJ-FK for submit <at> debbugs.gnu.org; Mon, 04 Mar 2024 17:59:12 -0500 Received: from mail02.noris.net ([62.128.1.232]:44451) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <h.goebel@HIDDEN>) id 1rhHH1-0007ut-2s for 69554 <at> debbugs.gnu.org; Mon, 04 Mar 2024 17:59:11 -0500 Received: from p57b08d98.dip0.t-ipconnect.de ([87.176.141.152] helo=hermia.goebel-consult.de) by mail02.noris.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) (envelope-from <h.goebel@HIDDEN>) id 1rhHGV-0006lq-UA for 69554 <at> debbugs.gnu.org; Mon, 04 Mar 2024 23:58:35 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id C52AC5F4DE; Mon, 4 Mar 2024 23:58:32 +0100 (CET) From: Hartmut Goebel <h.goebel@HIDDEN> Date: Mon, 4 Mar 2024 23:58:32 +0100 Message-ID: <7676fd973fa640750306df216feb95c335b345de.1709593063.git.h.goebel@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Noris-IP: 87.176.141.152 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) * guix/build/cmake-build-system.scm (configure): New paremeter `#:tests?`. Add cmake option "-DBUILD_TESTING=" with value "ON" or "OFF" depending on build-system argument `#:tests?`. * * doc/guix.texi (Inspecting Services)[cmake-build-system]: Document it. --- doc/guix.texi | 10 ++++++++++ guix/build/cmake-build-system.scm | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 87fe9f803c..409d076d12 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9617,6 +9617,16 @@ parameter specifies in abstract terms the flags passed to the compiler; it defaults to @code{"RelWithDebInfo"} (short for ``release mode with debugging information''), which roughly means that code is compiled with @code{-O2 -g}, as is the case for Autoconf-based packages by default. + +Depending on the @code{#:tests?} parameter, the configure-flag +@code{BUILD_TESTING} is set to @code{ON} resp. @code{OFF}. +@code{BUILD_TESTING} is a +@url{https://cmake.org/cmake/help/v3.28/module/CTest.html, standard +defined by CMake} to enable or disable building tests. This aims to +save build time if tests are not run anyway, while trying to ensure +tests are build if they should be run. Anyhow, the CMakeLists.txt needs +to implement handling this flag. + @end defvar @defvar composer-build-system diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index d1ff5071be..3f5449c438 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -33,7 +33,7 @@ (define-module (guix build cmake-build-system) ;; Code: (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t) - build-type target + (tests? #t) build-type target #:allow-other-keys) "Configure the given package." (let* ((out (assoc-ref outputs "out")) @@ -62,6 +62,11 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t) ,(string-append "-DCMAKE_INSTALL_RPATH=" out "/lib") ;; enable verbose output from builds "-DCMAKE_VERBOSE_MAKEFILE=ON" + ;; ask for (not) building tests depending on #:tests? + ;; (CMakeLists.txt may or may not implement this check) + ,@(if tests? + '("-DBUILD_TESTING=ON") ; overwrite any default option + '("-DBUILD_TESTING=OFF")) ; not run anyway ;; Cross-build ,@(if target base-commit: 3da49b1472919a62df1fe399638f23a246aa325d -- 2.41.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.