From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4F2JFbaNfGTWFQEASxT56A (envelope-from ) for ; Sun, 04 Jun 2023 15:12:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 2OcRFbaNfGQxMQEA9RJhRA (envelope-from ) for ; Sun, 04 Jun 2023 15:12:22 +0200 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 1ADF28AA5 for ; Sun, 4 Jun 2023 15:12:22 +0200 (CEST) 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 Content-Transfer-Encoding: 8bit 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+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=1685884342; a=rsa-sha256; cv=none; b=P+zhsjArY/7x6hdDA1aXftobIqtHd9UP7Thew7JVLBPEYML/m/aqIa3a1FX2pOnBIJ53Of kFqUReJDMiUE1QzObQb7lIQshdr0Uq8g3L9xmvndpNu8Zansv86AhkTr8NR06VHlDsym+M yqixXtsrNzFtjXm6zkIK5ss6p5OalIFrOucXVo/oVfaeiR9dTSFw3NHSEomqenxSb/Eyx+ iWK5cEK034Yxkv+Ve0NDPkNihTKoM+0jI8C3VRjRVHQnShkU/J5eg7lBWf9yLyaDSI7+Py LPponkafdL7qwauOiMT+h+ZpsIuXBSinWCVkOuyMyl1SCP1QlVEpT95Xa7ScUA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685884342; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=ONjhac9BQIemvZuAW/xu5yuROf9gr7ro3JCnaQhcS9M=; b=h5KvNfU8nzpj3JywYLco7xa25kIksY8EaJGTboD+xRHp+GKCTNpb/NPbHGAwMCqONXuF1I KoG9r8c0r9CzdbbIxtcJzinA+hVcaOvPiDCnds+yx6qeP26lB9fs9xzfIV0DFWQo3L9e5X XchF4OFqZYFCkQWLfNSuyGkjRKMJtscMqnuiev0TtwSds8VocBYuaVs/cDFFRtTe0p7wed gysb3HTFzHJV5A+wTUarExvjC39ElUWf3Mb/R7A8SQkBHVbHuRHR5TW0nnnXKzTiq9/cuV Q4QoFv5Gd+l7F6Va4HUpmEkt9Frc8RJa9Rfk9nZwc6rkiia8Uwqu1CeVN99iJA== Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -0.68 X-Spam-Score: -0.68 X-Migadu-Queue-Id: 1ADF28AA5 X-TUID: Nt97XvsUV7uM * 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")))) -- 2.39.1