| 1 |
commit: dff820f4c52ba830543c00e2d335e531bf7de8c0 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 20 10:40:10 2013 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 20 10:40:10 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dff820f4 |
| 7 |
|
| 8 |
Merge v2.2.0_alpha176 |
| 9 |
|
| 10 |
|
| 11 |
NEWS | 2 +- |
| 12 |
RELEASE-NOTES | 7 +- |
| 13 |
bin/archive-conf | 16 ++-- |
| 14 |
bin/clean_locks | 2 - |
| 15 |
bin/dispatch-conf | 9 +- |
| 16 |
bin/dohtml.py | 5 +- |
| 17 |
bin/ebuild-helpers/dohtml | 7 +- |
| 18 |
bin/ebuild-helpers/portageq | 4 +- |
| 19 |
bin/ebuild-ipc | 4 +- |
| 20 |
bin/ebuild.sh | 8 +- |
| 21 |
bin/egencache | 10 +- |
| 22 |
bin/emerge | 1 - |
| 23 |
bin/misc-functions.sh | 6 +- |
| 24 |
bin/phase-functions.sh | 34 +++++-- |
| 25 |
bin/phase-helpers.sh | 23 ++--- |
| 26 |
bin/repoman | 104 +++++++------------- |
| 27 |
cnf/make.globals | 8 +- |
| 28 |
cnf/metadata.dtd | 2 +- |
| 29 |
man/ebuild.5 | 6 +- |
| 30 |
man/egencache.1 | 8 +- |
| 31 |
man/emerge.1 | 4 +- |
| 32 |
man/make.conf.5 | 36 +++++-- |
| 33 |
pym/_emerge/BinpkgFetcher.py | 8 ++- |
| 34 |
pym/_emerge/EbuildBuild.py | 10 ++- |
| 35 |
pym/_emerge/EbuildFetcher.py | 3 +- |
| 36 |
pym/_emerge/JobStatusDisplay.py | 3 +- |
| 37 |
pym/_emerge/actions.py | 6 + |
| 38 |
pym/portage/dbapi/bintree.py | 89 +++++++++++------ |
| 39 |
pym/portage/getbinpkg.py | 33 +++++-- |
| 40 |
.../package/ebuild/_config/special_env_vars.py | 2 +- |
| 41 |
pym/portage/package/ebuild/doebuild.py | 21 ++--- |
| 42 |
pym/portage/package/ebuild/fetch.py | 9 ++- |
| 43 |
pym/portage/tests/util/test_getconfig.py | 4 +- |
| 44 |
pym/portage/util/env_update.py | 63 ++++++++----- |
| 45 |
34 files changed, 324 insertions(+), 233 deletions(-) |
| 46 |
|
| 47 |
diff --cc bin/phase-functions.sh |
| 48 |
index 3031a5a,6d75ef1..828f929 |
| 49 |
--- a/bin/phase-functions.sh |
| 50 |
+++ b/bin/phase-functions.sh |
| 51 |
@@@ -558,36 -461,29 +558,40 @@@ __dyn_test() |
| 52 |
return |
| 53 |
fi |
| 54 |
|
| 55 |
- if [[ ${EBUILD_FORCE_TEST} == 1 && test =~ $PORTAGE_IUSE ]]; then |
| 56 |
- # If USE came from ${T}/environment then it might not have USE=test |
| 57 |
- # like it's supposed to here. |
| 58 |
- ! has test ${USE} && export USE="${USE} test" |
| 59 |
- fi |
| 60 |
- |
| 61 |
trap "__abort_test" SIGINT SIGQUIT |
| 62 |
+ for LOOP_ABI in $(get_abi_list); do |
| 63 |
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; } |
| 64 |
+ |
| 65 |
if [ -d "${S}" ]; then |
| 66 |
cd "${S}" |
| 67 |
else |
| 68 |
cd "${WORKDIR}" |
| 69 |
fi |
| 70 |
|
| 71 |
- if ! has test $FEATURES && [ "${EBUILD_FORCE_TEST}" != "1" ]; then |
| 72 |
- __vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}" |
| 73 |
- elif has test $RESTRICT; then |
| 74 |
+ if has test ${RESTRICT} ; then |
| 75 |
einfo "Skipping make test/check due to ebuild restriction." |
| 76 |
- __vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}" |
| 77 |
+ __vecho ">>> Test phase [disabled because of RESTRICT=test]: ${CATEGORY}/${PF}" |
| 78 |
+ |
| 79 |
+ # If ${EBUILD_FORCE_TEST} == 1 and FEATURES came from ${T}/environment |
| 80 |
+ # then it might not have FEATURES=test like it's supposed to here. |
| 81 |
+ elif [[ ${EBUILD_FORCE_TEST} != 1 ]] && ! has test ${FEATURES} ; then |
| 82 |
+ __vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}" |
| 83 |
else |
| 84 |
+ # If ${EBUILD_FORCE_TEST} == 1 and USE came from ${T}/environment |
| 85 |
+ # then it might not have USE=test like it's supposed to here. |
| 86 |
+ if [[ ${EBUILD_FORCE_TEST} == 1 && test =~ ${PORTAGE_IUSE} ]] && \ |
| 87 |
+ ! has test ${USE} ; then |
| 88 |
+ export USE="${USE} test" |
| 89 |
+ fi |
| 90 |
+ |
| 91 |
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then |
| 92 |
+ if [ ${PORTAGE_BUILDDIR}/.tested.${LOOP_ABI} -nt "${WORKDIR}" ]; then |
| 93 |
+ echo ">>> It appears that ${PN} is already tested for ABI=${LOOP_ABI}; skipping." |
| 94 |
+ echo ">>> Remove '$PORTAGE_BUILDDIR/.tested.${LOOP_ABI}' to force testing." |
| 95 |
+ continue |
| 96 |
+ fi |
| 97 |
+ fi |
| 98 |
+ |
| 99 |
local save_sp=${SANDBOX_PREDICT} |
| 100 |
addpredict / |
| 101 |
__ebuild_phase pre_src_test |
Archives