[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/

["Sam James" <sam@gentoo.org>]

commit:     7ee2eaca9a1a759f617fc5dd1b78aa2a16fa2f33
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 14 04:26:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 14 04:26:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee2eaca

net-firewall/fwbuilder: restrict tests for now

Nearly got a decent chunk working though.

Closes: https://bugs.gentoo.org/810643
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
index f7a06413918..d1417c2d7df 100644
--- a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake virtualx
 
 DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and more"
 HOMEPAGE="https://github.com/fwbuilder/fwbuilder"
@@ -14,7 +14,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test ) test"
 
 RDEPEND="
 	dev-libs/libxml2
@@ -34,6 +34,18 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix_version.patch
 )
 
+src_prepare() {
+	# Hangs
+	sed -i \
+		-e '/add_subdirectory(.*Dialog.*Test)/d' \
+		-e '/add_subdirectory(RuleSetViewTest)/d' \
+		-e '/add_subdirectory(ObjectManipulatorTest)/d' \
+		-e '/add_subdirectory(RuleSetViewContextMenuTest)/d' \
+		src/unit_tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
@@ -42,6 +54,11 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cp "${BUILD_DIR}"/src/libfwbuilder/etc/fwbuilder.dtd "${S}"/src/res || die
+	TEST_VERBOSE=1 FWB_RES_DIR="${S}/src/res" virtx cmake_src_test
+}
+
 src_install() {
 	cmake_src_install
 	docompress -x /usr/share/man