From patchwork Fri Apr 22 20:25:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 1819 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1297D27BBEA; Fri, 22 Apr 2022 21:26:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CE9AC27BBE9 for ; Fri, 22 Apr 2022 21:26:20 +0100 (BST) Received: from localhost ([::1]:60934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhzr9-0002gO-U7 for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 16:26:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhzqs-0002eq-4W for guix-patches@gnu.org; Fri, 22 Apr 2022 16:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhzqr-000525-QP for guix-patches@gnu.org; Fri, 22 Apr 2022 16:26:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhzqr-00021t-Mm for guix-patches@gnu.org; Fri, 22 Apr 2022 16:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v3 2/7] gnu: fenics: 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:26:01 +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.16506591597776 (code B ref 54869); Fri, 22 Apr 2022 20:26:01 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 20:25:59 +0000 Received: from localhost ([127.0.0.1]:54722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqo-00021K-Qa for submit@debbugs.gnu.org; Fri, 22 Apr 2022 16:25:59 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:24829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqn-00020s-7h for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 16:25:57 -0400 Date: Fri, 22 Apr 2022 20:25:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650659151; bh=IyRkrJ/iscAMnNHlhxkbRMD6EQdM4AvWh/QPRDsqeJY=; 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=MVNHe5lDJzAqIoWYgnQQTn6/16xSTWCJcC86LPm7e1wYSDF8dRUdhbeKCwQzhhYGK 0/kU1m8taP54sUm7ftkYb4nzD791gQxIbN57jMGjsv0LJQ1azYbNNKTASLOJvZsjBW 1phC1Z/gzFCOzPFqCZckeJDABxCPXQXBkjYVZkK0SwWhVwiZb8NXp2WMX1HKJyU9fk wjzMmagK31GGYuaAvDNxOg/VWqyaTQdJj6GJlXw8VQY3APgx5rx348mwmyZP8y90nE 7rGB1Xm7N0lLk/rMXRTWoObSXfi+zq0fhaxMBhn5H9jigasB7D5Xvu66/OY16cPqFp lhrjWGpU1+DBg== From: "Paul A. Patience" Message-ID: <20220422202538.106338-3-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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/simulation.scm (fenics)[arguments]: Adjust custom 'check' phase to honor the #:tests? flag. --- gnu/packages/simulation.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.35.1 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 757738e627..230ae62826 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -657,17 +657,18 @@ (define-public fenics ;; Restrict OpenBLAS to MPI-only in preference to MPI+OpenMP. (setenv "OPENBLAS_NUM_THREADS" "1"))) (replace 'check - (lambda _ - (with-directory-excursion "test" - ;; Note: The test test_snes_set_from_options() in the file - ;; unit/nls/test_PETScSNES_solver.py fails and is ignored. - ;; Limit the number of jobs to 3 as 500 MiB of memory is used - ;; per process. - (invoke "mpirun" "-np" (number->string - (min 3 (parallel-job-count))) - "python" "-B" "-m" - "pytest" "unit" "--ignore" - "unit/nls/test_PETScSNES_solver.py")))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "test" + ;; Note: The test test_snes_set_from_options() in the file + ;; unit/nls/test_PETScSNES_solver.py fails and is ignored. + ;; Limit the number of jobs to 3 as 500 MiB of memory is used + ;; per process. + (invoke "mpirun" "-np" (number->string + (min 3 (parallel-job-count))) + "python" "-B" "-m" + "pytest" "unit" "--ignore" + "unit/nls/test_PETScSNES_solver.py"))))) (add-after 'install 'install-demo-files (lambda* (#:key outputs #:allow-other-keys) (let* ((demos (string-append