diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-28 16:42:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-28 16:42:14 +0000 |
| commit | 5a217ecdc46ad1d2318c2b4ddcad7fef4a028022 (patch) | |
| tree | 259ee7346cd56452205debdfa08db6bbb4af5fc1 /bin/ebuild.sh | |
| parent | 2f51b3bf3752c5774fc7a8bcd564eef3a3cb7c70 (diff) | |
| download | portage-5a217ecdc46ad1d2318c2b4ddcad7fef4a028022.tar.gz portage-5a217ecdc46ad1d2318c2b4ddcad7fef4a028022.tar.bz2 portage-5a217ecdc46ad1d2318c2b4ddcad7fef4a028022.zip | |
Fixes for logic related to FEATURES=test to USE=test mapping:
* Add EBUILD_FORCE_TEST to the environment whitelist and filter
it from the saved environment in save_ebuild_env().
* Tweak logic inside the ebuild command and config.regenerate()
so that EBUILD_FORCE_TEST works even in odd cases like when
USE=test is masked.
* Only make FEATURES=test map to USE=test when "test" is
actually in IUSE.
* Remove USE=test from the set of implicit IUSE so that useq()
calls in ebuild.sh properly generate a QA Notice when "test"
is missing from IUSE.
(trunk r9063:9065)
svn path=/main/branches/2.1.2/; revision=9076
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 62a271752..d65ff69e9 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -919,9 +919,6 @@ dyn_test() { fi if ! hasq test $FEATURES && [ "${EBUILD_FORCE_TEST}" != "1" ]; then vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}" - elif ! hasq test ${USE} && [ "${EBUILD_FORCE_TEST}" != "1" ]; then - ewarn "Skipping make test/check since USE=test is masked." - vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}" elif hasq test $RESTRICT; then ewarn "Skipping make test/check due to ebuild restriction." vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}" |