Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/dbus-c++/, dev-libs/dbus-c++/files/
Date: Sun, 30 Oct 2022 09:35:06
Message-Id: 1667122407.e62ae148d712c4ce23398991048959d054b589bc.sam@gentoo
1 commit: e62ae148d712c4ce23398991048959d054b589bc
2 Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
3 AuthorDate: Fri Oct 7 20:10:49 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 09:33:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e62ae148
7
8 dev-libs/dbus-c++: add tests
9
10 Current tests are a no-op due to not including them in TESTS for
11 whatever unknown reason. Same on Debian. Tests pass on alpha but need
12 virtx.
13
14 Bug: https://bugs.gentoo.org/873487
15 Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com>
16 Closes: https://github.com/gentoo/gentoo/pull/27679
17 Signed-off-by: Sam James <sam <AT> gentoo.org>
18
19 dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild | 15 +++++++++++++--
20 .../files/dbus-c++-0.9.0-enable-tests.patch | 22 ++++++++++++++++++++++
21 2 files changed, 35 insertions(+), 2 deletions(-)
22
23 diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild
24 index bd749ca5481f..a2a4913da27c 100644
25 --- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild
26 +++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild
27 @@ -3,7 +3,7 @@
28
29 EAPI=8
30
31 -inherit multilib-minimal
32 +inherit multilib-minimal autotools virtualx
33
34 DESCRIPTION="Provides a C++ API for D-BUS"
35 HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/"
36 @@ -24,7 +24,8 @@ DEPEND="${RDEPEND}
37 dev-util/cppunit[${MULTILIB_USEDEP}]"
38 BDEPEND="
39 virtual/pkgconfig
40 - doc? ( app-doc/doxygen )"
41 + doc? ( app-doc/doxygen )
42 + test? ( sys-apps/dbus[X,${MULTILIB_USEDEP}] )"
43
44 S="${WORKDIR}/lib${P}"
45
46 @@ -32,8 +33,14 @@ PATCHES=(
47 "${FILESDIR}"/${P}-gcc-4.7.patch #424707
48 "${FILESDIR}"/${PN}-gcc7.patch #622790
49 "${FILESDIR}"/${P}-gcc12.patch
50 + "${FILESDIR}"/${PN}-0.9.0-enable-tests.patch #873487
51 )
52
53 +src_prepare() {
54 + default
55 + eautoreconf
56 +}
57 +
58 multilib_src_configure() {
59 # TODO : add ecore multilib support if/when it is multilibified
60 ECONF_SOURCE="${S}" econf \
61 @@ -55,6 +62,10 @@ multilib_src_configure() {
62 fi
63 }
64
65 +src_test() {
66 + virtx multilib-minimal_src_test
67 +}
68 +
69 multilib_src_install_all() {
70 use doc && HTML_DOCS=( doc/html/. )
71 einstalldocs
72
73 diff --git a/dev-libs/dbus-c++/files/dbus-c++-0.9.0-enable-tests.patch b/dev-libs/dbus-c++/files/dbus-c++-0.9.0-enable-tests.patch
74 new file mode 100644
75 index 000000000000..827332c9f679
76 --- /dev/null
77 +++ b/dev-libs/dbus-c++/files/dbus-c++-0.9.0-enable-tests.patch
78 @@ -0,0 +1,22 @@
79 +https://bugs.gentoo.org/873487
80 +https://github.com/gentoo/gentoo/pull/27679
81 +
82 +diff --git a/test/functional/Test1/Makefile.am b/test/functional/Test1/Makefile.am
83 +index 3269751..50dd2a9 100644
84 +--- a/test/functional/Test1/Makefile.am
85 ++++ b/test/functional/Test1/Makefile.am
86 +@@ -40,3 +40,4 @@ AM_CPPFLAGS =
87 +
88 + ## File created by the gnome-build tools
89 +
90 ++TESTS = $(noinst_PROGRAMS)
91 +diff --git a/test/generator/Makefile.am b/test/generator/Makefile.am
92 +index 6c2403d..c6781aa 100644
93 +--- a/test/generator/Makefile.am
94 ++++ b/test/generator/Makefile.am
95 +@@ -38,3 +38,5 @@ dist-hook:
96 +
97 + MAINTAINERCLEANFILES = \
98 + Makefile.in
99 ++
100 ++TESTS = $(noinst_PROGRAMS)