[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     5eed45569cd54c87a16f967ec52fb5b363948818
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 19:05:29 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 17:10:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eed4556

distutils-r1.eclass: Set PATH in distutils_install_for_testing

Make distutils_install_for_testing set PATH so that newly-installed
scripts are available in the testing environment.  Make PATH local
in all sub-phases to make modifications safe.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/distutils-r1.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 092c0887d87..e0e7a945ab8 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -561,6 +561,7 @@ distutils_install_for_testing() {
        TEST_DIR=${BUILD_DIR}/test
        local bindir=${TEST_DIR}/scripts
        local libdir=${TEST_DIR}/lib
+       PATH=${bindir}:${PATH}
        PYTHONPATH=${libdir}:${PYTHONPATH}
 
        local add_args=(
@@ -951,6 +952,11 @@ distutils-r1_run_phase() {
        fi
        local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
 
+       # make PATH local for distutils_install_for_testing calls
+       # it makes little sense to let user modify PATH in per-impl phases
+       # and _all() already localizes it
+       local -x PATH=${PATH}
+
        # Bug 559644
        # using PYTHONPATH when the ${BUILD_DIR}/lib is not created yet might 
lead to
        # problems in setup.py scripts that try to import modules/packages from 
that path