commit: 811e537d7536dea8f47b7213cee77eac737b65aa Author: Joel Anderson <joel <AT> goatshriek <DOT> com> AuthorDate: Sun Feb 2 18:45:26 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 27 04:30:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811e537d
app-text/cherrytree: update and enable tests The tests for cherrytree were restricted, with a comment that dependencies were not available in Gentoo. Upon further investigation and with confirmation from the upstream maintainer (giuspen/cherrytree#2645), the test dependencies have since changed, and now everything needed to run the tests is available. This change updates the dependencies and enables the tests, limiting the number of jobs due to a limitation in the test suite (giuspen/cherrytree#2663). Signed-off-by: Joel Anderson <joel <AT> goatshriek.com> Closes: https://github.com/gentoo/gentoo/pull/40462 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/cherrytree/cherrytree-1.2.0.ebuild | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app-text/cherrytree/cherrytree-1.2.0.ebuild b/app-text/cherrytree/cherrytree-1.2.0.ebuild index 26f7d785b46a..9c67de85be38 100644 --- a/app-text/cherrytree/cherrytree-1.2.0.ebuild +++ b/app-text/cherrytree/cherrytree-1.2.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake python-any-r1 xdg +inherit cmake python-any-r1 virtualx xdg DESCRIPTION="A hierarchical note taking application (C++ version)" HOMEPAGE="https://www.giuspen.com/cherrytree/"; @@ -24,9 +24,6 @@ KEYWORDS="~amd64 ~x86" IUSE="nls test" -# Has deps that aren't available in ::gentoo repo -RESTRICT="test" - RDEPEND="app-i18n/uchardet app-text/gspell:= >=dev-cpp/glibmm-2.64.2:2 @@ -53,7 +50,7 @@ DEPEND="${PYTHON_DEPS} BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) - test? ( dev-util/cpputest )" + test? ( dev-cpp/gtest )" src_prepare() { # disable compress man pages @@ -71,7 +68,16 @@ src_configure() { -DUSE_NLS=$(usex nls) -DBUILD_TESTING=$(usex test) -DUSE_SHARED_FMT_SPDLOG=ON + -DAUTO_RUN_TESTING=OFF + -DUSE_SHARED_GTEST_GMOCK=$(usex test) ) cmake_src_configure } + +src_test() { + # the export test suite fails if more than one job is used for testing, so + # we force it to a single job here, for more detail see + # https://github.com/giuspen/cherrytree/pull/2663 + MAKEOPTS="${MAKEOPTS} -j1" virtx cmake_src_test +}
