From patchwork Wed Mar 27 14:52:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 62297 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 BB58627BBEA; Wed, 27 Mar 2024 14:55:27 +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 2974927BBE2 for ; Wed, 27 Mar 2024 14:55:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpUfI-00010F-Js; Wed, 27 Mar 2024 10:54:08 -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-0000y5-Bt 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-0008N3-3U 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-0000rP-7v 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 10/19] gnu: inkscape: 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.17115512163144 (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]:38128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUem-0000oY-2O for submit@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:36 -0400 Received: from mail-qv1-xf29.google.com ([2607:f8b0:4864:20::f29]:46120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUed-0000lk-Gi for 70031@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:27 -0400 Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-690de619293so41717746d6.0 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=1711551201; x=1712156001; 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=UFGV4YXFWnIqWGyOXycIgDfS4K0GtDxUfqKl+ebTJpI=; b=AS5unJI9ikig38q8FzN7qnBImQeMvCWS0J63QXfJEsV5vAaHTv4kfpCSRKAaxF6RCI D4/dlG2K5lbKSCG4/bY/2WI67bo+p7NQIjzckuDJyOWo04LnaQr0O+9j8di8uaIKBqtj TuDEFGHwTX1jYMo7etfendNjWEPo1KXqM02+MTS7RsNRjdtOVjzOjT+5gMmtN8aMCUC+ ES2FJ+diiyVNsy+O8jKaZl44in5EzE0dtkqxOc0fxDnpKapOlyNM3SubaER+wiGyHYQU rHtQqDhfHyjPH3p6HLG0cduIEeivr6x8gq5Qu0nidiBXFIzTr/OIKbGyyt6D5wotcde5 NsgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711551201; x=1712156001; 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=UFGV4YXFWnIqWGyOXycIgDfS4K0GtDxUfqKl+ebTJpI=; b=DjWU7KJgknyvaixoUFuEgv63IBolWRBnPlodFmK0iFCXGKKWbE7A5Fn/ypCw5B64ZC sA1/n3L8IsAVU2dWolRW4/pNd6DMB4cFpYFBHCKjAktkLklYE4z7qeM4y5V9Fr7nIX2l L2Qgc2CMYMMyqZPo2SaSpWSChsEhQO6a5IsTVjyAFW5WQBr3uY0LFZ0LlnimZ8lMuv/p 33FcAeXiP/lGyT9cNzJ9XmriKHeWjVcT2bnkR5QsuFyv00Yocopx9M1kXKn5lANVUcPz uWCwWrpOp4OjGLAEaDvh0/hxqlQawyqHrB021tXSp/wELvTvSDX5zzfU5SdbyIcWWu4H pUGQ== X-Gm-Message-State: AOJu0YzyEw0coI5S5thvzfXxiSvgVqyxPvalA3KDTvGheYwBOAEwjloz 5jVnR0RnAq25dRaAyQQ2K/TLhLSwnxyTt2C60yIdtyDI5pAOLIRCfyUP38dZMzdVGCmrBzrSQEJ Q X-Google-Smtp-Source: AGHT+IGmhbYVhdjyNamVWO0efTX5R11MFxft2simT97cUgYA6J7jG9PsAx0AM4vQjujoQRT79mW/wQ== X-Received: by 2002:a05:6214:dcb:b0:696:45c1:c34 with SMTP id 11-20020a0562140dcb00b0069645c10c34mr5532680qvt.44.1711551201606; Wed, 27 Mar 2024 07:53:21 -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:35 +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/inkscape.scm (inkscape)[arguments]: Replace 'check phase to replace the old cmake-build-system test target. Change-Id: I2d7046baaaa5bfcd6909d0d9dc3e6e6c4eb3e1e3 --- gnu/packages/inkscape.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index aa2c6419a09..9ce9f81cfda 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -156,8 +156,7 @@ (define-public inkscape/stable ((".*find_package\\(DoubleConversion.*") "")))))) (build-system cmake-build-system) (arguments - `(#:test-target "check" ;otherwise some test binaries are missing - #:imported-modules (,@%cmake-build-system-modules + `(#:imported-modules (,@%cmake-build-system-modules (guix build glib-or-gtk-build-system)) #:modules ((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) @@ -220,7 +219,10 @@ (define-public inkscape/stable ;; as the "share/inkscape/ui/units.xml" file. (delete 'check) (add-after 'install 'check - (assoc-ref %standard-phases 'check)) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Test artifacts and actions are built with the 'test' target. + (invoke "make" "check")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap