From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id qKV9DKYPY2JY3gAAbAwnHQ (envelope-from ) for ; Fri, 22 Apr 2022 22:27:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id mMByDKYPY2KsqQAAauVa8A (envelope-from ) for ; Fri, 22 Apr 2022 22:27:18 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E43A73C0F0 for ; Fri, 22 Apr 2022 22:27:17 +0200 (CEST) Received: from localhost ([::1]:34090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhzs5-0003ci-35 for larch@yhetil.org; Fri, 22 Apr 2022 16:27:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhzrr-0003cL-34 for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhzrq-00056o-QV for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhzrq-000254-Na for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v3 1/7] gnu: fenics-dolfin: Honor #:tests? flag. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Apr 2022 20:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54869@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 54869-submit@debbugs.gnu.org id=B54869.16506591657850 (code B ref 54869); Fri, 22 Apr 2022 20:27:02 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 20:26:05 +0000 Received: from localhost ([127.0.0.1]:54734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqu-00022T-QO for submit@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:05 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:33033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqn-00020t-90 for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:01 -0400 Date: Fri, 22 Apr 2022 20:25:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650659150; bh=cy5N6sEH7Ittwuis31JaSRAb2xyGnHG3FZX/CHIZr8Y=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=HVzjVXdMnsEsQboxPjRNpCz7bli1TNLojqeC/SNsmYnzLuNpQf67dYr+vJJhLkz6z sw0msPN4H2icJIBaCDbVb9pM9i17VvoFXRLiOpgIBnkOLHhPovDtMzYvOO7pPtnT9d uprhJ/pSoHEiedRLLcjwgaAvi9RiBEBsrFh+aAefU5uKRRdqYFLBK3STKtS2LxXRFc 7HvsvUh7Hac6L6BO+TEXCpVLPhGJtnF5XlxTBiCqf6YCQZvZesOXNWMbF11r2Z3P1f giUuFRL0qlprCkjV8Wge6k2cIDD5y4bm4FpXPnLHpbodVGXnKdrZ0a79NusUKpczYN WuBr/gDSk7Zeg== From: "Paul A. Patience" Message-ID: <20220422202538.106338-2-paul@apatience.com> In-Reply-To: <20220422202538.106338-1-paul@apatience.com> References: <20220422202538.106338-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1650659237; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=cy5N6sEH7Ittwuis31JaSRAb2xyGnHG3FZX/CHIZr8Y=; b=YoRh60Wo5NQDccq55IN5xgCebj0nLN4ffwNMwMjs4jnsLT+hy+DkFjVj6Zt0Gc7kvmMA/K IPVjC5AjCZtpzn1aTx+5DAsHwtEXSZna+dsUp72MRt2PLnIK3KpxJnCMILKHj+Az9Y3xCB Vu/wIgV28IePeWLnjG8GR7CoGMR4qFbSYWRBZ5NWFtJbmPG/vtKzLCDqVRLXcsNLpDoK0o bQhEVu4pTFt2KquTBb7Q1OEKEyDlNlXxDlQ9a688KjjdLqQOT8/44EmwcBOgCrskp56QDb PEW7fZRzwNDWai5kHRjikSBShQDKF+isVZYitJuFvcWy+CVqLHvEBTqiVTVM5g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1650659237; a=rsa-sha256; cv=none; b=thw+Ltie4INZ7s0EFh1mpKa3V2jc7Y5TwWQCxxe4h5Gsy2gHvt0V3SQAA+HcnUHI97XLC7 yKXDzvMvIqNxIZG5Fr6XjC+fgDl/xkMCvOE/rvTNkU70gJ6NDJAcNT8uIyjxyXM2d1Rqzn A0ZrSR7FiNSSv2QyOXej7qnDApd8idwFlI+Hy/wSs1O8xdA3gDFxhWacRgcEEyZNyI0tOT dKYxEdbXAGvVzywJfBbDGdYpMpXGN4Lilv5ciLZ6+AHIY0Znc744n1eMGqYN6/uEN5+MD+ 5d/e5oV1BSpn4xP4meOWglxm+S7U8i5ycOjxVUoRM3rReKSiGTRDnb0G1RVXvA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=HVzjVXdM; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 1.98 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=HVzjVXdM; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: E43A73C0F0 X-Spam-Score: 1.98 X-Migadu-Scanner: scn1.migadu.com X-TUID: 8eYH1pggBsDK * gnu/packages/simulation.scm (fenics-dolfin)[source]: Remove trailing boolean. [arguments]: Adjust custom 'check' phase to honor the #:tests? flag. While here, remove trailing booleans. --- gnu/packages/simulation.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 3f2d8e136d..757738e627 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -448,8 +448,7 @@ (define-public fenics-dolfin ;; Specify directory to find the header file. (("(^set\\(CATCH_INCLUDE_DIR ).*(/catch\\))" _ front back) (string-append front - "$ENV{CATCH_DIR}/include" back "\n"))) - #t)))) + "$ENV{CATCH_DIR}/include" back "\n"))))))) (build-system cmake-build-system) (inputs `(("blas" ,openblas) @@ -494,8 +493,7 @@ (define-public fenics-dolfin (setenv "SLEPC_DIR" (assoc-ref %build-inputs "slepc")) (setenv "SCOTCH_DIR" (assoc-ref %build-inputs "scotch")) (setenv "SUNDIALS_DIR" (assoc-ref %build-inputs "sundials")) - (setenv "UMFPACK_DIR" (assoc-ref %build-inputs "suitesparse")= ) - #t)) + (setenv "UMFPACK_DIR" (assoc-ref %build-inputs "suitesparse")= ))) (add-before 'check 'pre-check (lambda _ ;; The Dolfin repository uses git-lfs, whereby web links are @@ -546,15 +544,15 @@ (define-public fenics-dolfin "demo_mesh-quality_serial " "demo_mesh-quality_mpi " "demo_multimesh-stokes_serial " - ")\n") port))) - #t)) + ")\n") port))))) (replace 'check - (lambda _ - (and (invoke "make" "unittests") - (invoke "make" "demos") - (invoke "ctest" "-R" "unittests") - (invoke "ctest" "-R" "demo" "-R" "serial") - (invoke "ctest" "-R" "demo" "-R" "mpi"))))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "unittests") + (invoke "make" "demos") + (invoke "ctest" "-R" "unittests") + (invoke "ctest" "-R" "demo" "-R" "serial") + (invoke "ctest" "-R" "demo" "-R" "mpi"))))))) (home-page "https://bitbucket.org/fenics-project/dolfin/") (synopsis "Problem solving environment for differential equations") (description -- 2.35.1