1 |
commit: d16e284022086cb9dad3337099eebe4e90d52691 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 4 22:52:55 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 4 23:04:26 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16e2840 |
7 |
|
8 |
toolchain.eclass: rename USE=regression-test to USE=test |
9 |
|
10 |
gcc-8.3 is stable on all the platforms for a while. Renaming |
11 |
'regression-test' to 'test' for older ebuilds as well. |
12 |
|
13 |
While at it: |
14 |
- make test runs unconditional |
15 |
- drop installation of test results |
16 |
- add RESTRICT="!test? ( test )" |
17 |
- drop 'regression-test' from metadata files |
18 |
|
19 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
20 |
|
21 |
dev-lang/gnat-gpl/metadata.xml | 2 -- |
22 |
eclass/toolchain.eclass | 33 ++++++--------------------------- |
23 |
sys-devel/gcc-apple/metadata.xml | 1 - |
24 |
sys-devel/gcc/metadata.xml | 1 - |
25 |
sys-devel/kgcc64/metadata.xml | 3 --- |
26 |
5 files changed, 6 insertions(+), 34 deletions(-) |
27 |
|
28 |
diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml |
29 |
index 5ce6809c642..923cfc961fa 100644 |
30 |
--- a/dev-lang/gnat-gpl/metadata.xml |
31 |
+++ b/dev-lang/gnat-gpl/metadata.xml |
32 |
@@ -29,8 +29,6 @@ |
33 |
<flag name="objc-gc">Build support for the Objective C code language |
34 |
Garbage Collector</flag> |
35 |
<flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag> |
36 |
- <flag name="regression-test">Run the testsuite and install the results |
37 |
- (requires FEATURES=test)</flag> |
38 |
<flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag> |
39 |
<flag name="systemtap">enable systemtap static probe points</flag> |
40 |
<flag name="ssp">Build packages with stack smashing protector on by default</flag> |
41 |
|
42 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
43 |
index d2bfa6ab2f1..5f8fd446c61 100644 |
44 |
--- a/eclass/toolchain.eclass |
45 |
+++ b/eclass/toolchain.eclass |
46 |
@@ -137,15 +137,8 @@ else |
47 |
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" |
48 |
fi |
49 |
|
50 |
-if tc_version_is_at_least 8.3; then |
51 |
- GCC_EBUILD_TEST_FLAG='test' |
52 |
-else |
53 |
- # Don't force USE regression-test->test change on every |
54 |
- # gcc ebuild just yet. Let's do the change when >=gcc-8.3 |
55 |
- # is commonly used as a main compiler. |
56 |
- GCC_EBUILD_TEST_FLAG='regression-test' |
57 |
-fi |
58 |
-IUSE="${GCC_EBUILD_TEST_FLAG} vanilla +nls" |
59 |
+IUSE="test vanilla +nls" |
60 |
+RESTRICT="!test? ( test )" |
61 |
|
62 |
TC_FEATURES=() |
63 |
|
64 |
@@ -234,7 +227,7 @@ DEPEND="${RDEPEND} |
65 |
>=sys-devel/bison-1.875 |
66 |
>=sys-devel/flex-2.5.4 |
67 |
nls? ( sys-devel/gettext ) |
68 |
- ${GCC_EBUILD_TEST_FLAG}? ( |
69 |
+ test? ( |
70 |
>=dev-util/dejagnu-1.4.4 |
71 |
>=sys-devel/autogen-5.5.4 |
72 |
)" |
73 |
@@ -1769,11 +1762,9 @@ gcc_do_make() { |
74 |
#---->> src_test <<---- |
75 |
|
76 |
toolchain_src_test() { |
77 |
- if use ${GCC_EBUILD_TEST_FLAG} ; then |
78 |
- cd "${WORKDIR}"/build |
79 |
- # enable verbose test run and result logging |
80 |
- emake -k check RUNTESTFLAGS='-a -v' |
81 |
- fi |
82 |
+ cd "${WORKDIR}"/build |
83 |
+ # enable verbose test run and result logging |
84 |
+ emake -k check |
85 |
} |
86 |
|
87 |
#---->> src_install <<---- |
88 |
@@ -1912,13 +1903,6 @@ toolchain_src_install() { |
89 |
# prune empty dirs left behind |
90 |
find "${ED}" -depth -type d -delete 2>/dev/null |
91 |
|
92 |
- # install testsuite results |
93 |
- if use ${GCC_EBUILD_TEST_FLAG}; then |
94 |
- docinto testsuite |
95 |
- find "${WORKDIR}"/build -type f -name "*.sum" -exec dodoc {} + |
96 |
- find "${WORKDIR}"/build -type f -path "*/testsuite/*.log" -exec dodoc {} + |
97 |
- fi |
98 |
- |
99 |
# Rather install the script, else portage with changing $FILESDIR |
100 |
# between binary and source package borks things .... |
101 |
if ! is_crosscompile && [[ ${PN} != "kgcc64" ]] ; then |
102 |
@@ -2253,11 +2237,6 @@ toolchain_pkg_postinst() { |
103 |
cp "${ROOT%/}${DATAPATH}"/c{89,99} "${EROOT%/}"/usr/bin/ 2>/dev/null |
104 |
fi |
105 |
|
106 |
- if use ${GCC_EBUILD_TEST_FLAG} ; then |
107 |
- elog "Testsuite results have been installed into /usr/share/doc/${PF}/testsuite" |
108 |
- echo |
109 |
- fi |
110 |
- |
111 |
if [[ -n ${PRERELEASE}${SNAPSHOT} ]] ; then |
112 |
einfo "This GCC ebuild is provided for your convenience, and the use" |
113 |
einfo "of this compiler is not supported by the Gentoo Developers." |
114 |
|
115 |
diff --git a/sys-devel/gcc-apple/metadata.xml b/sys-devel/gcc-apple/metadata.xml |
116 |
index e6297d1298f..77e886c0ba4 100644 |
117 |
--- a/sys-devel/gcc-apple/metadata.xml |
118 |
+++ b/sys-devel/gcc-apple/metadata.xml |
119 |
@@ -9,6 +9,5 @@ |
120 |
<flag name="bootstrap">!DO NOT SET THIS FLAG YOURSELF! avoids need for autoconf during bootstrap stage2</flag> |
121 |
<flag name="objc">Build support for the Objective C code language</flag> |
122 |
<flag name="objc++">Build support for the Objective C++ language</flag> |
123 |
- <flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag> |
124 |
</use> |
125 |
</pkgmetadata> |
126 |
|
127 |
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml |
128 |
index 84d7083a3f9..393817b6e62 100644 |
129 |
--- a/sys-devel/gcc/metadata.xml |
130 |
+++ b/sys-devel/gcc/metadata.xml |
131 |
@@ -33,7 +33,6 @@ |
132 |
<flag name="objc-gc">Build support for the Objective C code language Garbage |
133 |
Collector</flag> |
134 |
<flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag> |
135 |
- <flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag> |
136 |
<flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag> |
137 |
<flag name="ssp">Build packages with stack smashing protector on by default</flag> |
138 |
<flag name="systemtap">enable systemtap static probe points</flag> |
139 |
|
140 |
diff --git a/sys-devel/kgcc64/metadata.xml b/sys-devel/kgcc64/metadata.xml |
141 |
index df7607df3a8..3a840c8dcd0 100644 |
142 |
--- a/sys-devel/kgcc64/metadata.xml |
143 |
+++ b/sys-devel/kgcc64/metadata.xml |
144 |
@@ -5,7 +5,4 @@ |
145 |
<email>toolchain@g.o</email> |
146 |
<name>Gentoo Toolchain Project</name> |
147 |
</maintainer> |
148 |
- <use> |
149 |
- <flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag> |
150 |
- </use> |
151 |
</pkgmetadata> |