From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9EE4415817D for ; Mon, 17 Jun 2024 06:09:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3AE92BC014; Mon, 17 Jun 2024 06:09:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFD4D2BC014 for ; Mon, 17 Jun 2024 06:09:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5BA5335C9B for ; Mon, 17 Jun 2024 06:09:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4955A158 for ; Mon, 17 Jun 2024 06:09:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1718604438.6ff697c1ed5f83c79425c6dc1f6c55e549acbabf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/diffoscope/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/diffoscope/diffoscope-266.ebuild dev-util/diffoscope/diffoscope-268.ebuild dev-util/diffoscope/diffoscope-271.ebuild X-VCS-Directories: dev-util/diffoscope/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6ff697c1ed5f83c79425c6dc1f6c55e549acbabf X-VCS-Branch: master Date: Mon, 17 Jun 2024 06:09:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 107f3fdc-b864-4d37-b15d-b48dd6277e8b X-Archives-Hash: e73afb5d64f3b6d768d760b2363fc14d commit: 6ff697c1ed5f83c79425c6dc1f6c55e549acbabf Author: Sam James gentoo org> AuthorDate: Mon Jun 17 06:07:18 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 17 06:07:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff697c1 dev-util/diffoscope: skip tests relying on zipdetails for 32-bit systems We need to fix this in Perl itself, see bug #934444. Note that this worked fine before newer zipdetails landed in Perl (https://github.com/pmqs/zipdetails/pull/7). Bug: https://bugs.gentoo.org/934444 Closes: https://bugs.gentoo.org/934443 Signed-off-by: Sam James gentoo.org> dev-util/diffoscope/diffoscope-266.ebuild | 18 +++++++++++++++++- dev-util/diffoscope/diffoscope-268.ebuild | 18 +++++++++++++++++- dev-util/diffoscope/diffoscope-271.ebuild | 18 +++++++++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dev-util/diffoscope/diffoscope-266.ebuild b/dev-util/diffoscope/diffoscope-266.ebuild index 7191da7ed124..4275c0618db7 100644 --- a/dev-util/diffoscope/diffoscope-266.ebuild +++ b/dev-util/diffoscope/diffoscope-266.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="ncurses" -inherit distutils-r1 +inherit distutils-r1 toolchain-funcs DESCRIPTION="Will try to get to the bottom of what makes files or directories different" HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" @@ -122,3 +122,19 @@ EPYTEST_DESELECT=( ) distutils_enable_tests pytest + +src_test() { + case $(tc-get-ptr-size) in + 4) + EPYTEST_IGNORE+=( + # Needs fixing in Perl itself (bug #934443) + tests/comparators/test_epub.py + tests/comparators/test_zip.py + ) + ;; + *) + ;; + esac + + distutils-r1_src_test +} diff --git a/dev-util/diffoscope/diffoscope-268.ebuild b/dev-util/diffoscope/diffoscope-268.ebuild index e4e8cd71bdcc..1761b40e36fc 100644 --- a/dev-util/diffoscope/diffoscope-268.ebuild +++ b/dev-util/diffoscope/diffoscope-268.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="ncurses" -inherit distutils-r1 +inherit distutils-r1 toolchain-funcs DESCRIPTION="Will try to get to the bottom of what makes files or directories different" HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" @@ -133,3 +133,19 @@ EPYTEST_DESELECT=( ) distutils_enable_tests pytest + +src_test() { + case $(tc-get-ptr-size) in + 4) + EPYTEST_IGNORE+=( + # Needs fixing in Perl itself (bug #934443) + tests/comparators/test_epub.py + tests/comparators/test_zip.py + ) + ;; + *) + ;; + esac + + distutils-r1_src_test +} diff --git a/dev-util/diffoscope/diffoscope-271.ebuild b/dev-util/diffoscope/diffoscope-271.ebuild index ea0ae53846a2..10e254dd5ac3 100644 --- a/dev-util/diffoscope/diffoscope-271.ebuild +++ b/dev-util/diffoscope/diffoscope-271.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="ncurses" -inherit distutils-r1 +inherit distutils-r1 toolchain-funcs DESCRIPTION="Will try to get to the bottom of what makes files or directories different" HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" @@ -129,3 +129,19 @@ EPYTEST_DESELECT=( ) distutils_enable_tests pytest + +src_test() { + case $(tc-get-ptr-size) in + 4) + EPYTEST_IGNORE+=( + # Needs fixing in Perl itself (bug #934443) + tests/comparators/test_epub.py + tests/comparators/test_zip.py + ) + ;; + *) + ;; + esac + + distutils-r1_src_test +}