commit:     d16e284022086cb9dad3337099eebe4e90d52691
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  4 22:52:55 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Nov  4 23:04:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16e2840

toolchain.eclass: rename USE=regression-test to USE=test

gcc-8.3 is stable on all the platforms for a while. Renaming
'regression-test' to 'test' for older ebuilds as well.

While at it:
- make test runs unconditional
- drop installation of test results
- add RESTRICT="!test? ( test )"
- drop 'regression-test' from metadata files

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-lang/gnat-gpl/metadata.xml   |  2 --
 eclass/toolchain.eclass          | 33 ++++++---------------------------
 sys-devel/gcc-apple/metadata.xml |  1 -
 sys-devel/gcc/metadata.xml       |  1 -
 sys-devel/kgcc64/metadata.xml    |  3 ---
 5 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml
index 5ce6809c642..923cfc961fa 100644
--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@@ -29,8 +29,6 @@
                <flag name="objc-gc">Build support for the Objective C code 
language
                        Garbage Collector</flag>
                <flag name="pgo">Build GCC using Profile Guided Optimization 
(PGO)</flag>
-               <flag name="regression-test">Run the testsuite and install the 
results
-                       (requires FEATURES=test)</flag>
                <flag name="sanitize">Build support for various sanitizer 
functions (ASAN/TSAN/etc...)</flag>
                <flag name="systemtap">enable systemtap static probe 
points</flag>
                <flag name="ssp">Build packages with stack smashing protector 
on by default</flag>

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d2bfa6ab2f1..5f8fd446c61 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -137,15 +137,8 @@ else
        LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 fi
 
-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"
+IUSE="test vanilla +nls"
+RESTRICT="!test? ( test )"
 
 TC_FEATURES=()
 
@@ -234,7 +227,7 @@ DEPEND="${RDEPEND}
        >=sys-devel/bison-1.875
        >=sys-devel/flex-2.5.4
        nls? ( sys-devel/gettext )
-       ${GCC_EBUILD_TEST_FLAG}? (
+       test? (
                >=dev-util/dejagnu-1.4.4
                >=sys-devel/autogen-5.5.4
        )"
@@ -1769,11 +1762,9 @@ gcc_do_make() {
 #---->> src_test <<----
 
 toolchain_src_test() {
-       if use ${GCC_EBUILD_TEST_FLAG} ; then
-               cd "${WORKDIR}"/build
-               # enable verbose test run and result logging
-               emake -k check RUNTESTFLAGS='-a -v'
-       fi
+       cd "${WORKDIR}"/build
+       # enable verbose test run and result logging
+       emake -k check
 }
 
 #---->> src_install <<----
@@ -1912,13 +1903,6 @@ toolchain_src_install() {
        # prune empty dirs left behind
        find "${ED}" -depth -type d -delete 2>/dev/null
 
-       # install testsuite results
-       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 {} +
-       fi
-
        # Rather install the script, else portage with changing $FILESDIR
        # between binary and source package borks things ....
        if ! is_crosscompile && [[ ${PN} != "kgcc64" ]] ; then
@@ -2253,11 +2237,6 @@ toolchain_pkg_postinst() {
                cp "${ROOT%/}${DATAPATH}"/c{89,99} "${EROOT%/}"/usr/bin/ 
2>/dev/null
        fi
 
-       if use ${GCC_EBUILD_TEST_FLAG} ; then
-               elog "Testsuite results have been installed into 
/usr/share/doc/${PF}/testsuite"
-               echo
-       fi
-
        if [[ -n ${PRERELEASE}${SNAPSHOT} ]] ; then
                einfo "This GCC ebuild is provided for your convenience, and 
the use"
                einfo "of this compiler is not supported by the Gentoo 
Developers."

diff --git a/sys-devel/gcc-apple/metadata.xml b/sys-devel/gcc-apple/metadata.xml
index e6297d1298f..77e886c0ba4 100644
--- a/sys-devel/gcc-apple/metadata.xml
+++ b/sys-devel/gcc-apple/metadata.xml
@@ -9,6 +9,5 @@
     <flag name="bootstrap">!DO NOT SET THIS FLAG YOURSELF! avoids need for 
autoconf during bootstrap stage2</flag>
     <flag name="objc">Build support for the Objective C code language</flag>
     <flag name="objc++">Build support for the Objective C++ language</flag>
-    <flag name="regression-test">Run the testsuite and install the results 
(requires FEATURES=test)</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index 84d7083a3f9..393817b6e62 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -33,7 +33,6 @@
     <flag name="objc-gc">Build support for the Objective C code language 
Garbage
       Collector</flag>
     <flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag>
-    <flag name="regression-test">Run the testsuite and install the results 
(requires FEATURES=test)</flag>
     <flag name="sanitize">Build support for various sanitizer functions 
(ASAN/TSAN/etc...)</flag>
     <flag name="ssp">Build packages with stack smashing protector on by 
default</flag>
     <flag name="systemtap">enable systemtap static probe points</flag>

diff --git a/sys-devel/kgcc64/metadata.xml b/sys-devel/kgcc64/metadata.xml
index df7607df3a8..3a840c8dcd0 100644
--- a/sys-devel/kgcc64/metadata.xml
+++ b/sys-devel/kgcc64/metadata.xml
@@ -5,7 +5,4 @@
     <email>[email protected]</email>
     <name>Gentoo Toolchain Project</name>
   </maintainer>
-  <use>
-    <flag name="regression-test">Run the testsuite and install the results 
(requires FEATURES=test)</flag>
-  </use>
 </pkgmetadata>

Reply via email to