Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/
Date: Thu, 14 Oct 2021 04:26:49
Message-Id: 1634185578.7ee2eaca9a1a759f617fc5dd1b78aa2a16fa2f33.sam@gentoo
1 commit: 7ee2eaca9a1a759f617fc5dd1b78aa2a16fa2f33
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 14 04:26:18 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 14 04:26:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee2eaca
7
8 net-firewall/fwbuilder: restrict tests for now
9
10 Nearly got a decent chunk working though.
11
12 Closes: https://bugs.gentoo.org/810643
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild | 21 +++++++++++++++++++--
16 1 file changed, 19 insertions(+), 2 deletions(-)
17
18 diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
19 index f7a06413918..d1417c2d7df 100644
20 --- a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
21 +++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
22 @@ -3,7 +3,7 @@
23
24 EAPI=7
25
26 -inherit cmake
27 +inherit cmake virtualx
28
29 DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and more"
30 HOMEPAGE="https://github.com/fwbuilder/fwbuilder"
31 @@ -14,7 +14,7 @@ LICENSE="GPL-2+"
32 SLOT="0"
33 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
34 IUSE="test"
35 -RESTRICT="!test? ( test )"
36 +RESTRICT="!test? ( test ) test"
37
38 RDEPEND="
39 dev-libs/libxml2
40 @@ -34,6 +34,18 @@ PATCHES=(
41 "${FILESDIR}"/${P}-fix_version.patch
42 )
43
44 +src_prepare() {
45 + # Hangs
46 + sed -i \
47 + -e '/add_subdirectory(.*Dialog.*Test)/d' \
48 + -e '/add_subdirectory(RuleSetViewTest)/d' \
49 + -e '/add_subdirectory(ObjectManipulatorTest)/d' \
50 + -e '/add_subdirectory(RuleSetViewContextMenuTest)/d' \
51 + src/unit_tests/CMakeLists.txt || die
52 +
53 + cmake_src_prepare
54 +}
55 +
56 src_configure() {
57 local mycmakeargs=(
58 -DBUILD_TESTING=$(usex test)
59 @@ -42,6 +54,11 @@ src_configure() {
60 cmake_src_configure
61 }
62
63 +src_test() {
64 + cp "${BUILD_DIR}"/src/libfwbuilder/etc/fwbuilder.dtd "${S}"/src/res || die
65 + TEST_VERBOSE=1 FWB_RES_DIR="${S}/src/res" virtx cmake_src_test
66 +}
67 +
68 src_install() {
69 cmake_src_install
70 docompress -x /usr/share/man