Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
Date: Sun, 07 Oct 2018 02:27:37
Message-Id: 1538879248.259dbf56826547e21d7d3a0b6764f030db7e0782.floppym@gentoo
1 commit: 259dbf56826547e21d7d3a0b6764f030db7e0782
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 7 02:26:40 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 7 02:27:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259dbf56
7
8 dev-util/meson: enable test phase
9
10 Closes: https://bugs.gentoo.org/615028
11 Package-Manager: Portage-2.3.50_p14, Repoman-2.3.11_p21
12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14 dev-util/meson/files/test-llvm.patch | 26 ++++++++++++++++++++++++++
15 dev-util/meson/meson-0.48.0-r2.ebuild | 12 ++++++++++--
16 dev-util/meson/meson-9999.ebuild | 15 +++++++++++++--
17 3 files changed, 49 insertions(+), 4 deletions(-)
18
19 diff --git a/dev-util/meson/files/test-llvm.patch b/dev-util/meson/files/test-llvm.patch
20 new file mode 100644
21 index 00000000000..af7b9834bf3
22 --- /dev/null
23 +++ b/dev-util/meson/files/test-llvm.patch
24 @@ -0,0 +1,26 @@
25 +From 40457b1faa2c5b274447838ff1a041a8030c6c22 Mon Sep 17 00:00:00 2001
26 +From: Mike Gilbert <floppym@g.o>
27 +Date: Sat, 6 Oct 2018 21:11:36 -0400
28 +Subject: [PATCH] Disable testing of static llvm linkage
29 +
30 +Gentoo doesn't provide static libs for llvm.
31 +---
32 + test cases/frameworks/15 llvm/meson.build | 2 +-
33 + 1 file changed, 1 insertion(+), 1 deletion(-)
34 +
35 +diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build
36 +index e05fddd2..9b38a454 100644
37 +--- a/test cases/frameworks/15 llvm/meson.build
38 ++++ b/test cases/frameworks/15 llvm/meson.build
39 +@@ -20,7 +20,7 @@ if not dep_tinfo.found()
40 + dep_tinfo = cpp.find_library('tinfo', required: false)
41 + endif
42 +
43 +-foreach static : [true, false]
44 ++foreach static : [false]
45 + llvm_dep = dependency(
46 + 'llvm',
47 + modules : ['bitwriter', 'asmprinter', 'executionengine', 'target',
48 +--
49 +2.19.0
50 +
51
52 diff --git a/dev-util/meson/meson-0.48.0-r2.ebuild b/dev-util/meson/meson-0.48.0-r2.ebuild
53 index aa2d0f068eb..653033f818b 100644
54 --- a/dev-util/meson/meson-0.48.0-r2.ebuild
55 +++ b/dev-util/meson/meson-0.48.0-r2.ebuild
56 @@ -20,18 +20,26 @@ HOMEPAGE="http://mesonbuild.com/"
57 LICENSE="Apache-2.0"
58 SLOT="0"
59 IUSE=""
60 -RESTRICT="test"
61
62 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
63 RDEPEND=""
64
65 PATCHES=(
66 + "${FILESDIR}"/test-llvm.patch
67 "${FILESDIR}"/0.48.0-multilib.patch
68 "${FILESDIR}"/0.48.0-test-u.patch
69 )
70
71 python_test() {
72 - ${EPYTHON} run_tests.py || die
73 + (
74 + # test_meson_installed
75 + unset PYTHONDONTWRITEBYTECODE
76 +
77 + # test_cross_file_system_paths
78 + unset XDG_DATA_HOME
79 +
80 + ${EPYTHON} -u run_tests.py
81 + ) || die "Testing failed with ${EPYTHON}"
82 }
83
84 python_install_all() {
85
86 diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
87 index aace7f3caa4..0d5b9b4711c 100644
88 --- a/dev-util/meson/meson-9999.ebuild
89 +++ b/dev-util/meson/meson-9999.ebuild
90 @@ -20,13 +20,24 @@ HOMEPAGE="http://mesonbuild.com/"
91 LICENSE="Apache-2.0"
92 SLOT="0"
93 IUSE=""
94 -RESTRICT="test"
95
96 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
97 RDEPEND=""
98
99 +PATCHES=(
100 + "${FILESDIR}"/test-llvm.patch
101 +)
102 +
103 python_test() {
104 - ${EPYTHON} run_tests.py || die
105 + (
106 + # test_meson_installed
107 + unset PYTHONDONTWRITEBYTECODE
108 +
109 + # test_cross_file_system_paths
110 + unset XDG_DATA_HOME
111 +
112 + ${EPYTHON} -u run_tests.py
113 + ) || die "Testing failed with ${EPYTHON}"
114 }
115
116 python_install_all() {