summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ebuild14
-rwxr-xr-xbin/ebuild.sh3
-rw-r--r--bin/isolated-functions.sh2
3 files changed, 10 insertions, 9 deletions
diff --git a/bin/ebuild b/bin/ebuild
index a44fcad39..d4a3a6667 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -131,13 +131,17 @@ def discard_digests(myebuild, mysettings, mydbapi):
portage._doebuild_manifest_exempt_depend -= 1
tmpsettings = portage.config(clone=portage.settings)
-if "test" in pargs and "test" not in tmpsettings.features:
- print "Forcing test."
+if "test" in pargs:
+ # This variable is a signal to config.regenerate() to
+ # indicate that the test phase should be enabled regardless
+ # of problems such as masked "test" USE flag.
tmpsettings["EBUILD_FORCE_TEST"] = "1"
tmpsettings.backup_changes("EBUILD_FORCE_TEST")
- tmpsettings.features.append("test")
- tmpsettings["FEATURES"] = " ".join(tmpsettings.features)
- tmpsettings.backup_changes("FEATURES")
+ if "test" not in tmpsettings.features:
+ tmpsettings.features.append("test")
+ tmpsettings.features.sort()
+ tmpsettings["FEATURES"] = " ".join(tmpsettings.features)
+ tmpsettings.backup_changes("FEATURES")
build_dir_phases = set(["setup", "unpack", "compile",
"test", "install", "package", "rpm"])
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}"
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index a7e8433ad..e06fbb826 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -434,7 +434,7 @@ save_ebuild_env() {
# portage config variables and variables set directly by portage
unset BAD BRACKET BUILD_PREFIX COLS \
DISTCC_DIR DISTDIR DOC_SYMLINKS_DIR \
- EBUILD_EXIT_STATUS_FILE EBUILD_MASTER_PID \
+ EBUILD_EXIT_STATUS_FILE EBUILD_FORCE_TEST EBUILD_MASTER_PID \
ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY \
GOOD HILITE HOME IMAGE \
LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \