From patchwork Sun Jun 4 13:11:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 50600 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 3A70327BBE2; Sun, 4 Jun 2023 14:12:24 +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.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 2738527BBEA for ; Sun, 4 Jun 2023 14:12:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q5nWf-0004Vo-Rz; Sun, 04 Jun 2023 09:12:06 -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 1q5nWc-0004Uj-IE for guix-patches@gnu.org; Sun, 04 Jun 2023 09:12:02 -0400 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 1q5nWc-0002Ie-9Y for guix-patches@gnu.org; Sun, 04 Jun 2023 09:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q5nWb-0000w9-Qa for guix-patches@gnu.org; Sun, 04 Jun 2023 09:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63400] [PATCH v2 1/2] gnu: vulkan-loader: Skip x86-specific tests on non-x86 platforms. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Jun 2023 13:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63400 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63400@debbugs.gnu.org Received: via spool by 63400-submit@debbugs.gnu.org id=B63400.16858842833521 (code B ref 63400); Sun, 04 Jun 2023 13:12:01 +0000 Received: (at 63400) by debbugs.gnu.org; 4 Jun 2023 13:11:23 +0000 Received: from localhost ([127.0.0.1]:45324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5nVy-0000uh-1H for submit@debbugs.gnu.org; Sun, 04 Jun 2023 09:11:22 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:36422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5nVv-0000uC-HP for 63400@debbugs.gnu.org; Sun, 04 Jun 2023 09:11:20 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id B81A461082 for <63400@debbugs.gnu.org>; Sun, 4 Jun 2023 13:11:13 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EK1Q_oVYaIeK for <63400@debbugs.gnu.org>; Sun, 4 Jun 2023 13:11:12 +0000 (UTC) Received: from jupiter.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id C60F96107D for <63400@debbugs.gnu.org>; Sun, 4 Jun 2023 13:11:12 +0000 (UTC) From: Simon South Date: Sun, 4 Jun 2023 09:11:07 -0400 Message-Id: <0640e02e68cea6ccbacba3b5b436cc0d722497d0.1685883140.git.simon@simonsouth.net> X-Mailer: git-send-email 2.39.1 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/patches/vulkan-loader-skip-incompatible-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/vulkan.scm (vulkan-loader)[source]: Apply it. --- gnu/local.mk | 1 + ...ulkan-loader-skip-incompatible-tests.patch | 62 +++++++++++++++++++ gnu/packages/vulkan.scm | 2 + 3 files changed, 65 insertions(+) create mode 100644 gnu/packages/patches/vulkan-loader-skip-incompatible-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9adf593318..8da6599110 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2047,6 +2047,7 @@ dist_patch_DATA = \ %D%/packages/patches/vtk-7-gcc-10-compat.patch \ %D%/packages/patches/vtk-7-hdf5-compat.patch \ %D%/packages/patches/vtk-7-python-compat.patch \ + %D%/packages/patches/vulkan-loader-skip-incompatible-tests.patch \ %D%/packages/patches/wacomtablet-add-missing-includes.patch \ %D%/packages/patches/wacomtablet-qt5.15.patch \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ diff --git a/gnu/packages/patches/vulkan-loader-skip-incompatible-tests.patch b/gnu/packages/patches/vulkan-loader-skip-incompatible-tests.patch new file mode 100644 index 0000000000..92e3d03bb6 --- /dev/null +++ b/gnu/packages/patches/vulkan-loader-skip-incompatible-tests.patch @@ -0,0 +1,62 @@ +Certain tests that use the pre-built libraries provided in +tests/framework/data/binaries presume they are running on a 32- or +64-bit x86 host, as these are the only architectures for which the +libraries are provided. + +Skip these tests on non-x86 platforms where the tests are certain to +fail. + +diff --git a/tests/loader_regression_tests.cpp b/tests/loader_regression_tests.cpp +index 7390596bd..1b0780c65 100644 +--- a/tests/loader_regression_tests.cpp ++++ b/tests/loader_regression_tests.cpp +@@ -1014,6 +1014,9 @@ TEST(CreateDevice, ConsecutiveCreateWithoutDestruction) { + } + + TEST(TryLoadWrongBinaries, WrongICD) { ++#if !defined(__x86_64__) && !defined(__i386__) ++ GTEST_SKIP() << "Skip this test as it is not compatible with this architecture."; ++#endif + FrameworkEnvironment env{}; + env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); + env.add_icd(TestICDDetails(CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE).set_is_fake(true)); +@@ -1041,6 +1044,9 @@ TEST(TryLoadWrongBinaries, WrongICD) { + } + + TEST(TryLoadWrongBinaries, WrongExplicit) { ++#if !defined(__x86_64__) && !defined(__i386__) ++ GTEST_SKIP() << "Skip this test as it is not compatible with this architecture."; ++#endif + FrameworkEnvironment env{}; + env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); + env.get_test_icd().physical_devices.emplace_back("physical_device_0"); +@@ -1077,6 +1083,9 @@ TEST(TryLoadWrongBinaries, WrongExplicit) { + } + + TEST(TryLoadWrongBinaries, WrongImplicit) { ++#if !defined(__x86_64__) && !defined(__i386__) ++ GTEST_SKIP() << "Skip this test as it is not compatible with this architecture."; ++#endif + FrameworkEnvironment env{}; + env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); + env.get_test_icd().physical_devices.emplace_back("physical_device_0"); +@@ -1114,6 +1123,9 @@ TEST(TryLoadWrongBinaries, WrongImplicit) { + } + + TEST(TryLoadWrongBinaries, WrongExplicitAndImplicit) { ++#if !defined(__x86_64__) && !defined(__i386__) ++ GTEST_SKIP() << "Skip this test as it is not compatible with this architecture."; ++#endif + FrameworkEnvironment env{}; + env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); + env.get_test_icd().physical_devices.emplace_back("physical_device_0"); +@@ -1159,6 +1171,9 @@ TEST(TryLoadWrongBinaries, WrongExplicitAndImplicit) { + } + + TEST(TryLoadWrongBinaries, WrongExplicitAndImplicitErrorOnly) { ++#if !defined(__x86_64__) && !defined(__i386__) ++ GTEST_SKIP() << "Skip this test as it is not compatible with this architecture."; ++#endif + FrameworkEnvironment env{}; + env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); + env.get_test_icd().physical_devices.emplace_back("physical_device_0"); diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1d2e58f1d4..790a1c7c07 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -222,6 +222,8 @@ (define-public vulkan-loader (url "https://github.com/KhronosGroup/Vulkan-Loader") (commit "v1.3.232"))) (file-name (git-file-name name version)) + (patches + (search-patches "vulkan-loader-skip-incompatible-tests.patch")) (sha256 (base32 "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2")))) From patchwork Sun Jun 4 13:11:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 50601 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 9E12227BBEA; Sun, 4 Jun 2023 14:12:29 +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.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 25A0C27BBE2 for ; Sun, 4 Jun 2023 14:12:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q5nWg-0004W9-93; Sun, 04 Jun 2023 09:12:06 -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 1q5nWd-0004VF-7o for guix-patches@gnu.org; Sun, 04 Jun 2023 09:12:03 -0400 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 1q5nWc-0002JC-VA for guix-patches@gnu.org; Sun, 04 Jun 2023 09:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q5nWc-0000wO-LV for guix-patches@gnu.org; Sun, 04 Jun 2023 09:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63400] [PATCH v2 2/2] gnu: vulkan-loader: Re-enable tests on AArch64. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Jun 2023 13:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63400 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63400@debbugs.gnu.org Received: via spool by 63400-submit@debbugs.gnu.org id=B63400.16858842833535 (code B ref 63400); Sun, 04 Jun 2023 13:12:02 +0000 Received: (at 63400) by debbugs.gnu.org; 4 Jun 2023 13:11:23 +0000 Received: from localhost ([127.0.0.1]:45328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5nVz-0000uv-Bl for submit@debbugs.gnu.org; Sun, 04 Jun 2023 09:11:23 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:36424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5nVv-0000uD-HR for 63400@debbugs.gnu.org; Sun, 04 Jun 2023 09:11:21 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id E4B806107D for <63400@debbugs.gnu.org>; Sun, 4 Jun 2023 13:11:13 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7Y14OWgSjIcO for <63400@debbugs.gnu.org>; Sun, 4 Jun 2023 13:11:13 +0000 (UTC) Received: from jupiter.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id E250861080 for <63400@debbugs.gnu.org>; Sun, 4 Jun 2023 13:11:12 +0000 (UTC) From: Simon South Date: Sun, 4 Jun 2023 09:11:08 -0400 Message-Id: X-Mailer: git-send-email 2.39.1 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/vulkan.scm (vulkan-loader)[arguments]<#:tests?>: Enable on AArch64. --- gnu/packages/vulkan.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 790a1c7c07..fd6bd57602 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -233,7 +233,7 @@ (define-public vulkan-loader ;; As many as 23 tests are expected to fail per architecture. ;; Limit the tests to those architectures tested upstream. #:tests? (and (%current-system) - (target-x86?)) + (or (target-aarch64?) (target-x86?))) #:configure-flags #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" (dirname (dirname