| 1 |
commit: 41de10c78419006249c73e8eb52df1aab86f6d9f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 18 23:24:58 2013 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 18 23:24:58 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=41de10c7 |
| 7 |
|
| 8 |
Fix RESTRICT=test message for bug #469332. |
| 9 |
|
| 10 |
--- |
| 11 |
bin/phase-functions.sh | 24 ++++++++++++++---------- |
| 12 |
1 files changed, 14 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh |
| 15 |
index ea717fe..6d75ef1 100644 |
| 16 |
--- a/bin/phase-functions.sh |
| 17 |
+++ b/bin/phase-functions.sh |
| 18 |
@@ -461,12 +461,6 @@ __dyn_test() { |
| 19 |
return |
| 20 |
fi |
| 21 |
|
| 22 |
- if [[ ${EBUILD_FORCE_TEST} == 1 && test =~ $PORTAGE_IUSE ]]; then |
| 23 |
- # If USE came from ${T}/environment then it might not have USE=test |
| 24 |
- # like it's supposed to here. |
| 25 |
- ! has test ${USE} && export USE="${USE} test" |
| 26 |
- fi |
| 27 |
- |
| 28 |
trap "__abort_test" SIGINT SIGQUIT |
| 29 |
if [ -d "${S}" ]; then |
| 30 |
cd "${S}" |
| 31 |
@@ -474,12 +468,22 @@ __dyn_test() { |
| 32 |
cd "${WORKDIR}" |
| 33 |
fi |
| 34 |
|
| 35 |
- if ! has test $FEATURES && [ "${EBUILD_FORCE_TEST}" != "1" ]; then |
| 36 |
- __vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}" |
| 37 |
- elif has test $RESTRICT; then |
| 38 |
+ if has test ${RESTRICT} ; then |
| 39 |
einfo "Skipping make test/check due to ebuild restriction." |
| 40 |
- __vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}" |
| 41 |
+ __vecho ">>> Test phase [disabled because of RESTRICT=test]: ${CATEGORY}/${PF}" |
| 42 |
+ |
| 43 |
+ # If ${EBUILD_FORCE_TEST} == 1 and FEATURES came from ${T}/environment |
| 44 |
+ # then it might not have FEATURES=test like it's supposed to here. |
| 45 |
+ elif [[ ${EBUILD_FORCE_TEST} != 1 ]] && ! has test ${FEATURES} ; then |
| 46 |
+ __vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}" |
| 47 |
else |
| 48 |
+ # If ${EBUILD_FORCE_TEST} == 1 and USE came from ${T}/environment |
| 49 |
+ # then it might not have USE=test like it's supposed to here. |
| 50 |
+ if [[ ${EBUILD_FORCE_TEST} == 1 && test =~ ${PORTAGE_IUSE} ]] && \ |
| 51 |
+ ! has test ${USE} ; then |
| 52 |
+ export USE="${USE} test" |
| 53 |
+ fi |
| 54 |
+ |
| 55 |
local save_sp=${SANDBOX_PREDICT} |
| 56 |
addpredict / |
| 57 |
__ebuild_phase pre_src_test |
Archives