Skip to content

Commit

Permalink
dev-util/diffoscope: skip tests relying on zipdetails for 32-bit systems
Browse files Browse the repository at this point in the history
We need to fix this in Perl itself, see bug #934444. Note that this worked
fine before newer zipdetails landed in Perl (pmqs/zipdetails#7).

Bug: https://bugs.gentoo.org/934444
Closes: https://bugs.gentoo.org/934443
Signed-off-by: Sam James <sam@gentoo.org>
  • Loading branch information
thesamesam committed Jun 17, 2024
1 parent f218f5a commit 6ff697c
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 3 deletions.
18 changes: 17 additions & 1 deletion dev-util/diffoscope/diffoscope-266.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down Expand Up @@ -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
}
18 changes: 17 additions & 1 deletion dev-util/diffoscope/diffoscope-268.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down Expand Up @@ -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
}
18 changes: 17 additions & 1 deletion dev-util/diffoscope/diffoscope-271.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down Expand Up @@ -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
}

0 comments on commit 6ff697c

Please sign in to comment.