Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/
Date: Fri, 21 Aug 2020 07:15:09
Message-Id: 1597994082.5072f7bc81e4d5bf101e55abf7cb45d452a5ebd3.juippis@gentoo
1 commit: 5072f7bc81e4d5bf101e55abf7cb45d452a5ebd3
2 Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
3 AuthorDate: Sun Aug 9 22:45:31 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 21 07:14:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5072f7bc
7
8 sci-astronomy/stellarium: disable broken tests on x86
9
10 Closes: https://bugs.gentoo.org/730116
11 Package-Manager: Portage-2.3.103, Repoman-2.3.23
12 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
13 Closes: https://github.com/gentoo/gentoo/pull/17065
14 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
15
16 .../files/stellarium-0.20.2-disable-x86-test.patch | 24 ++++++++++++++++++++++
17 sci-astronomy/stellarium/stellarium-0.20.2.ebuild | 5 +++++
18 2 files changed, 29 insertions(+)
19
20 diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch b/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch
21 new file mode 100644
22 index 00000000000..27674eb7a1e
23 --- /dev/null
24 +++ b/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch
25 @@ -0,0 +1,24 @@
26 +Disable broken tests on x86
27 +
28 +https://github.com/Stellarium/stellarium/issues/1153
29 +
30 +--- a/src/tests/testConversions.cpp 2020-08-09 23:29:34.794246024 +0100
31 ++++ b/src/tests/testConversions.cpp 2020-08-09 23:30:30.441851564 +0100
32 +@@ -942,6 +942,7 @@ void TestConversions::testVec3fToHtmlCol
33 + }
34 + void TestConversions::testVec3dToHtmlColor()
35 + {
36 ++ return;
37 + QVariantList data;
38 +
39 + data << "#FFFFFF" << 1. << 1. << 1.;
40 +--- a/src/tests/testStelSphereGeometry.cpp 2020-08-09 23:32:43.940770728 +0100
41 ++++ b/src/tests/testStelSphereGeometry.cpp 2020-08-09 23:33:06.671154228 +0100
42 +@@ -309,6 +309,7 @@ void TestStelSphericalGeometry::testEnla
43 +
44 + void TestStelSphericalGeometry::testSphericalPolygon()
45 + {
46 ++ return;
47 + SphericalRegionP holySquare2 = bigSquare.getSubtraction(smallSquare);
48 +
49 + QCOMPARE(holySquare2->getArea(), holySquare.getArea());
50
51 diff --git a/sci-astronomy/stellarium/stellarium-0.20.2.ebuild b/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
52 index b9d232ba256..934e215fc13 100644
53 --- a/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
54 +++ b/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
55 @@ -54,6 +54,11 @@ RESTRICT="!test? ( test )"
56 src_prepare() {
57 cmake_src_prepare
58 use debug || append-cppflags -DQT_NO_DEBUG #415769
59 +
60 + if use x86; then
61 + # https://github.com/Stellarium/stellarium/issues/1153
62 + eapply "${FILESDIR}/stellarium-0.20.2-disable-x86-test.patch"
63 + fi
64 }
65
66 src_configure() {