diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-28 14:40:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-28 14:40:13 +0000 |
| commit | a731c7d79183644e1bd1566b3677db66a8ca1b4e (patch) | |
| tree | d3f036bd7169fdb311bf3a8da24f824b7b954957 /bin/ebuild.sh | |
| parent | 2384e53b022cd8923dac8fa5386f22700d433dce (diff) | |
| download | portage-a731c7d79183644e1bd1566b3677db66a8ca1b4e.tar.gz portage-a731c7d79183644e1bd1566b3677db66a8ca1b4e.tar.bz2 portage-a731c7d79183644e1bd1566b3677db66a8ca1b4e.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.
svn path=/main/trunk/; revision=9064
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}" |