commit: 54c26a29a5e621717b503937fc04cd45f588b80a Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sun Feb 10 11:43:36 2019 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sun Feb 10 12:00:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c26a29
toolchain.eclass: prepare to rename USE=regression-test->test Starting from gcc-8.3.0 FEATURES=test USE=test will be enough to run gcc's testsuite. Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> eclass/toolchain.eclass | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 635582ff63b..56921228daa 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -128,7 +128,15 @@ else LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" fi -IUSE="regression-test vanilla +nls +nptl" +if tc_version_is_at_least 8.3; then + GCC_EBUILD_TEST_FLAG='test' +else + # Don't force USE regression-test->test change on every + # gcc ebuild just yet. Let's do the change when >=gcc-8.3 + # is commonly used as a main compiler. + GCC_EBUILD_TEST_FLAG='regression-test' +fi +IUSE="${GCC_EBUILD_TEST_FLAG} vanilla +nls +nptl" if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then IUSE+=" altivec debug +cxx +fortran" @@ -199,7 +207,7 @@ DEPEND="${RDEPEND} >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) - regression-test? ( + ${GCC_EBUILD_TEST_FLAG}? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )" @@ -1720,7 +1728,7 @@ gcc_do_make() { #---->> src_test <<---- toolchain_src_test() { - if use regression-test ; then + if use ${GCC_EBUILD_TEST_FLAG} ; then cd "${WORKDIR}"/build emake -k check fi @@ -1860,7 +1868,7 @@ toolchain_src_install() { find "${ED}" -depth -type d -delete 2>/dev/null # install testsuite results - if use regression-test; then + if use ${GCC_EBUILD_TEST_FLAG}; then docinto testsuite find "${WORKDIR}"/build -type f -name "*.sum" -exec dodoc {} + find "${WORKDIR}"/build -type f -path "*/testsuite/*.log" -exec dodoc {} + @@ -2188,7 +2196,7 @@ toolchain_pkg_postinst() { cp "${ROOT%/}${DATAPATH}"/c{89,99} "${EROOT%/}"/usr/bin/ 2>/dev/null fi - if use regression-test ; then + if use ${GCC_EBUILD_TEST_FLAG} ; then elog "Testsuite results have been installed into /usr/share/doc/${PF}/testsuite" echo fi