From patchwork Fri Mar 8 11:08:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars Bilke X-Patchwork-Id: 61524 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 1A97E27BBEA; Fri, 8 Mar 2024 12:25:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 6E0AE27BBE2 for ; Fri, 8 Mar 2024 12:25:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riZI7-0003Cd-SD; Fri, 08 Mar 2024 07:25:35 -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 1riZI5-0003C0-Jk for guix-patches@gnu.org; Fri, 08 Mar 2024 07:25:33 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1riZI4-0000pT-EF for guix-patches@gnu.org; Fri, 08 Mar 2024 07:25:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1riZIY-00026D-Bx; Fri, 08 Mar 2024 07:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69634] [PATCH] gnu: hypre: don't run test phase when tests? is false Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 12:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69634 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69634@debbugs.gnu.org Cc: Lars Bilke , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.17099007298021 (code B ref -1); Fri, 08 Mar 2024 12:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Mar 2024 12:25:29 +0000 Received: from localhost ([127.0.0.1]:56968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riZI0-00025J-Lf for submit@debbugs.gnu.org; Fri, 08 Mar 2024 07:25:28 -0500 Received: from lists.gnu.org ([209.51.188.17]:45064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riZHy-000259-7c for submit@debbugs.gnu.org; Fri, 08 Mar 2024 07:25:27 -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 1riZHR-00036v-Qi for guix-patches@gnu.org; Fri, 08 Mar 2024 07:24:53 -0500 Received: from mailgate4.ufz.de ([141.65.7.211] helo=mailgate.ufz.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1riZHO-0000bH-JG for guix-patches@gnu.org; Fri, 08 Mar 2024 07:24:53 -0500 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate4-UFZ) with ESMTP id 6EE351602D9 for ; Fri, 8 Mar 2024 13:24:45 +0100 (CET) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from conversion-daemon.imap.intranet.ufz.de by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) id <0SA10080037BXC00@imap.intranet.ufz.de> for guix-patches@gnu.org; Fri, 08 Mar 2024 13:24:45 +0100 (CET) Received: from smtp2.ufz.de ([141.65.7.217]) by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) with ESMTPS id <0SA100H2T3T9YB40@imap.intranet.ufz.de> for guix-patches@gnu.org; Fri, 08 Mar 2024 13:24:45 +0100 (CET) Received: from envinf4.minotaur-alpha.ts.net (unknown [141.65.34.85]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp2.ufz.de (smtp2-UFZ) with ESMTPSA id 4580DE0069; Fri, 8 Mar 2024 13:24:45 +0100 (CET) Date: Fri, 08 Mar 2024 12:08:11 +0100 From: Lars Bilke Message-id: <7822b92627251e60d6f107369e0e102dd592c080.1709896091.git.lars.bilke@ufz.de> X-Mailer: git-send-email 2.43.0 Received-SPF: pass client-ip=141.65.7.211; envelope-from=lars.bilke@ufz.de; helo=mailgate.ufz.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Without this patch it is not possible to build hypre with --tune on machines which do not support the architecture to optimize for. The check phase no honors the tests? property. Change-Id: I475fabd7d9f73ed320b97a4767830d82190c2b15 --- gnu/packages/maths.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) base-commit: 75bad75367fcf2c289fae3b40dbcc850f92177be diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1f61ee0583..6b3a5e2e55 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7135,16 +7135,21 @@ (define-public hypre (lambda _ (invoke "make" "-C" "docs"))) (replace 'check - (lambda _ - (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/hypre/lib")) - (setenv "PATH" (string-append "." ":" (getenv "PATH"))) - (invoke "make" "check" "CHECKRUN=") - (for-each (lambda (filename) - (let ((size (stat:size (stat filename)))) - (when (positive? size) - (error (format #f "~a size ~d; error indication~%" - filename size))))) - (find-files "test" ".*\\.err$")))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "LD_LIBRARY_PATH" + (string-append (getcwd) "/hypre/lib")) + (setenv "PATH" + (string-append "." ":" + (getenv "PATH"))) + (invoke "make" "check" "CHECKRUN=") + (for-each (lambda (filename) + (let ((size (stat:size (stat filename)))) + (when (positive? size) + (error (format #f + "~a size ~d; error indication~%" + filename size))))) + (find-files "test" ".*\\.err$"))))) (add-after 'install 'install-docs (lambda* (#:key outputs #:allow-other-keys) ;; Custom install because docs/Makefile doesn't honor ${docdir}.