From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id qDfoGYpOtGMb4wAAbAwnHQ (envelope-from ) for ; Tue, 03 Jan 2023 16:49:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id MJLxGYpOtGMcBwEA9RJhRA (envelope-from ) for ; Tue, 03 Jan 2023 16:49:30 +0100 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 EE0F9110CA for ; Tue, 3 Jan 2023 16:49:29 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCjXP-0006G9-5Z; Tue, 03 Jan 2023 10:49:15 -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 1pCjXE-0006BY-12 for guix-patches@gnu.org; Tue, 03 Jan 2023 10:49:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pCjXC-0004jK-Kg for guix-patches@gnu.org; Tue, 03 Jan 2023 10:49:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCjXC-0001Fc-2d for guix-patches@gnu.org; Tue, 03 Jan 2023 10:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60518] [PATCH] gnu: spirv-cross: Activate tests. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Jan 2023 15:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60518 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60518@debbugs.gnu.org Cc: ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16727609274779 (code B ref -1); Tue, 03 Jan 2023 15:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jan 2023 15:48:47 +0000 Received: from localhost ([127.0.0.1]:46521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCjWx-0001F1-D1 for submit@debbugs.gnu.org; Tue, 03 Jan 2023 10:48:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:41988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCjWu-0001Es-Jh for submit@debbugs.gnu.org; Tue, 03 Jan 2023 10:48:46 -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 1pCjWr-00067V-O7 for guix-patches@gnu.org; Tue, 03 Jan 2023 10:48:44 -0500 Received: from 15.mo583.mail-out.ovh.net ([178.33.107.29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pCjWp-0004hZ-DD for guix-patches@gnu.org; Tue, 03 Jan 2023 10:48:41 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.109.146.53]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 08A7924DE2 for ; Tue, 3 Jan 2023 15:48:27 +0000 (UTC) Received: from ghost-submission-747dc469fd-pbw9h (unknown [10.110.103.36]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 9327E1FF27; Tue, 3 Jan 2023 15:48:26 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-747dc469fd-pbw9h with ESMTPSA id +Dg3KUpOtGOB6QAACyCQTw (envelope-from ); Tue, 03 Jan 2023 15:48:26 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Tue, 3 Jan 2023 16:48:20 +0100 Message-Id: <20230103154820.28860-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5641602958318035682 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeeggdektdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=178.33.107.29; envelope-from=ngraves@ngraves.fr; helo=15.mo583.mail-out.ovh.net 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672760970; a=rsa-sha256; cv=none; b=VLP5iuLMsoHg8nHBxG4zGTaE79UnBvE8VqMZtKIWI/8bdKnpzzCt5S8D7IBa1YdaNukj33 FS73/dSTHK832hnu2qdjvLZm8/1JqlOmRqLNX7ytvcsrOYJ16q3IBK1ljBiJzu2sCfvncr orw78GUfa0SU+Av/MjpnNKXu1LDWaH9qRctO3lsGmmxd2M4AN4jgDSmRCLyiXQJcNGxdib oLxiPqVjvwirRkfWIioy0oYwZr4lNfZ+2297nMYqvh0UoPlwKO8OmT7la199+5asiuaW36 7GCoqanWp21tycPY8TrtyEeLr3wxqTsFMEmIeeMeRUcg0fGHk9yv+OcRneBqmQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672760970; 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-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=DbLQJ9CPYmMEmaDsf4UdYeFpAs2iqmreT6+zCQohFrM=; b=AOhONy1EWFzlegghPOZryz2Lvnk52i0vGPbFENDDkhtEQFmBMT7IB3Ir0aGat8NEXm1LdK ndbPsAZylmYzRKR0I/gpx8jMHJw9k+EFzhzolfT1nygKcXq38bo8UaTqylsJbSQCFt2MWU /O/i6V+ueexfyS0N60/G0fl9ty5sbTexzs2Flrk49l47Wl3J6uD6HEjsfrPGVJgMKOzj01 /6XZPEaLjBC5e3IS2XP8HSRHM0bRsCbCj+PzQypNM709dqYEd7AwICHOPgrZsy02U3X5f8 sFQqCWktUoB6TL4hVOOQFuhvvmFQllJdDDWhwTGTgWEX9dHDsyHXhih+vide8Q== X-Spam-Score: -5.36 X-Migadu-Queue-Id: EE0F9110CA Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -5.36 X-TUID: GMX71WU3FOZ5 * gnu/packages/vulkan.scm (spirv-cross): [arguments]: Add phase update-reference-shaders. [arguments]: Activate tests. --- gnu/packages/vulkan.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f5c619a2b2..a2db5511d5 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -120,11 +120,6 @@ (define-public spirv-cross (arguments `(#:configure-flags (list "-DSPIRV_CROSS_SHARED=YES") - ;; FIXME: The following tests fail: - ;; 15 - spirv-cross-test-opt - ;; 16 - spirv-cross-test-metal-opt - ;; 17 - spirv-cross-test-hlsl-opt - #:tests? #f #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-tests-to-find-deps @@ -134,8 +129,11 @@ (define-public spirv-cross (string-append (assoc-ref inputs "glslang") "/bin"))) (substitute* "CMakeLists.txt" (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") - (string-append (assoc-ref inputs "spirv-tools") "/bin"))) - #t))))) + (string-append (assoc-ref inputs "spirv-tools") "/bin"))))) + (add-before 'check 'update-reference-shaders + (lambda _ + (with-directory-excursion "../source" + (invoke "./update_test_shaders.sh"))))))) (inputs (list glslang spirv-headers spirv-tools)) (native-inputs (list python)) -- 2.38.1