From patchwork Wed Mar 27 14:52:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 62289 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 523E927BBEA; Wed, 27 Mar 2024 14:55:06 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 D2C6D27BBE2 for ; Wed, 27 Mar 2024 14:55:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpUfJ-00010d-65; Wed, 27 Mar 2024 10:54:09 -0400 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 1rpUfG-0000yS-SL for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:06 -0400 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 1rpUfG-0008NL-Jy for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpUfG-0000rW-Lk for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70031] [core-updates PATCH 11/19] gnu: vigra: Move test target to check phase. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 14:54:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70031 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70031@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 70031-submit@debbugs.gnu.org id=B70031.17115512163151 (code B ref 70031); Wed, 27 Mar 2024 14:54:06 +0000 Received: (at 70031) by debbugs.gnu.org; 27 Mar 2024 14:53:36 +0000 Received: from localhost ([127.0.0.1]:38130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUem-0000of-CX for submit@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:36 -0400 Received: from mail-qk1-x72a.google.com ([2607:f8b0:4864:20::72a]:53483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUee-0000lv-57 for 70031@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:28 -0400 Received: by mail-qk1-x72a.google.com with SMTP id af79cd13be357-78a746759b4so17781585a.2 for <70031@debbugs.gnu.org>; Wed, 27 Mar 2024 07:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1711551202; x=1712156002; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qCmmtR5dc0DVHhFBGSdDCDwBtrm1SivP+bRXqknLawQ=; b=d6e68q9EYBaKfcEAGbu93N35sGxcZ1WLmwcYuCR28/Y+WxvXXophj0wQh0/Lx6RFTG ZQ4aa9/e3O3IUIZtj6Qo2ruE65b4GQeS4/c+RoKY7qlMlrWiiEC2IeafOO32Z8JuJvcH JEahVjdQp5aLNUbGzpuVL9sWmsHKNWvj3NwL5Uw9nLfC1MZ+brKKkXv4utZA1tzFsuCD HUVffWwapWnV96Ofgg6wwOCDAJsCw9G4hNNEk/MwvP6HKECIW+dHER/PsrsE8apHpvfQ zy2oNkKrBiPqv63BQVghuIYd0elAvMj4H0QPrdaO0FHcrBWROPCU6oZMIphU1gi5EOKi TAhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711551202; x=1712156002; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qCmmtR5dc0DVHhFBGSdDCDwBtrm1SivP+bRXqknLawQ=; b=bCWWo0LlIzAowONAyp4/QfmMlACaqon2ZAByImx1SwrNr8au86mpAP27D/FuOUFXEI 7LyTjb81yXvD1FdRBUisrWgaRfr+4ljADfzcur1Ii3svVnVQPFpnyGI142sE93OpTu83 qXYBwnADvCiygkORILjCQ6brQ4srYqsyNc2EyUr3co6pJRS3XgxshcRX7Xq0ZXXlZhKC vxeSDGAAcTkqvOKJFnOmaOdVndSLMfLwTLNNiM2GvPgjNOxIF28m/+3ORhJxqNLG/UQb zxcYHqz3BfAV8dHCM54JXOuS3su5nt8VdFORJUX+gzcLdMkPBL/ie2/XY/vDDnr3uf0l txLA== X-Gm-Message-State: AOJu0Yyut+Ga94G3C6y1wtoAeB1v5lx1TvGZZRdOGiaQc4IsyYvJm6Zl Uyy7CKLh1P6XNUxPz5flsf/Q8Fex7mikEsRbA+ttc+Opki8i/6P+VOJDytG1eSjwIO4jmMSY3dE e X-Google-Smtp-Source: AGHT+IFLXbb3ZvmG31TepRsckqmYMkZ5akNFOHFOu2Kwi5d9YjNlaKz6PWulbWu2q8sKXiwqHeggvw== X-Received: by 2002:a05:6214:cc8:b0:691:629d:d26b with SMTP id 8-20020a0562140cc800b00691629dd26bmr4414186qvx.35.1711551202330; Wed, 27 Mar 2024 07:53:22 -0700 (PDT) Received: from ip-10-114-89-186.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id fk23-20020a05622a559700b00430c8b87b46sm4882915qtb.6.2024.03.27.07.53.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 07:53:21 -0700 (PDT) From: Greg Hogan Date: Wed, 27 Mar 2024 14:52:36 +0000 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: 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: , 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 * gnu/packages/image.scm (vigra)[arguments]: Replace 'check phase to replace the old cmake-build-system test target. Change-Id: I6465caaff8c249373537652d001b22a4d9eafe09 --- gnu/packages/image.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 6accf68ef09..45ded6af04b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1370,8 +1370,7 @@ (define-public vigra ("python-nose" ,python-nose) ("sphinx" ,python-sphinx))) (arguments - `(#:test-target "check" - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'disable-broken-tests (lambda _ @@ -1382,7 +1381,11 @@ (define-public vigra ;; . (substitute* "vigranumpy/test/CMakeLists.txt" (("test1\\.py") "")) - #t))) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "check"))))) #:configure-flags (list "-Wno-dev" ; suppress developer mode with lots of warnings (string-append "-DVIGRANUMPY_INSTALL_DIR="