diff options
| author |   Alfred Wingate <parona@protonmail.com> | 2023-11-17 11:33:39 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-11-17 13:03:30 +0000 |
| commit | b05e64d1c324a4a4763196c29fef2a7a214fdb73 (patch) | |
| tree | 83e305d13e7ad135b9504149fee9419d20001544 /x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild | |
| parent | app-admin/ttyplot: 1.5.2 (diff) | |
| download | gentoo-b05e64d1c324a4a4763196c29fef2a7a214fdb73.tar.gz gentoo-b05e64d1c324a4a4763196c29fef2a7a214fdb73.tar.bz2 gentoo-b05e64d1c324a4a4763196c29fef2a7a214fdb73.zip | |
x11-misc/xkeyboard-config: add missing test dependencies
* New revision due to plenty dropped keywords
* pytest-xdist is used if available, make it requirement so that
everybody benefits.
* Disabled timeout for pytest tests. Observed it already take 40s with
xdist and a 12 thread cpu, so you can't trust it to not fail due to high
load congestion.
Closes: https://bugs.gentoo.org/917479
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33864
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild')
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index 4fcf0d647513..4456bf37dfdd 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -23,19 +23,37 @@ IUSE="test" RESTRICT="!test? ( test )" BDEPEND=" - ${PYTHON_DEPS} dev-lang/perl dev-libs/libxslt sys-devel/gettext test? ( + ${PYTHON_DEPS} + x11-apps/xkbcomp + x11-libs/libxkbcommon $(python_gen_any_dep ' + dev-python/pycountry[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] ') ) " +python_check_deps() { + use test || return 0 + python_has_version "dev-python/pycountry[${PYTHON_USEDEP}]" + python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]" + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" +} + pkg_setup() { - python-any-r1_pkg_setup + use test && python-any-r1_pkg_setup +} + +src_prepare() { + eapply_user + + # Remove pytest timeout + sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die } src_configure() { |