[gentoo-commits] portage r12245 - in main/branches/2.1.6: man pym/_emerge pym/portage

[gentoo-commits] portage r12245 - in main/branches/2.1.6: man pym/_emerge pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-12-12 21:51:45 +0000 (Fri, 12 Dec 2008)
New Revision: 12245

Modified:
   main/branches/2.1.6/man/make.conf.5
   main/branches/2.1.6/pym/_emerge/__init__.py
   main/branches/2.1.6/pym/portage/__init__.py
Log:
Add a new FEATURES=test-fail-continue value which causes ebuild execution
to continue after the test phase has failed. Thanks to Diego Petten?\195?\178
<flameeyes@g.o> for the suggestion. (trunk r12214)

Modified: main/branches/2.1.6/man/make.conf.5
===================================================================
--- main/branches/2.1.6/man/make.conf.5	2008-12-12 21:51:21 UTC (rev 12244)
+++ main/branches/2.1.6/man/make.conf.5	2008-12-12 21:51:45 UTC (rev 12245)
@@ -334,6 +334,12 @@
 and \fIsrc_test()\fR in \fBebuild\fR(5). This feature implies the "test"
 \fBUSE\fR flag.
 .TP
+.B test\-fail\-continue
+If "test" is enabled \fBFEATURES\fR and the test phase of an ebuild fails,
+continue to execute the remaining phases as if the failure had not occurred.
+Note that the test phase for a specific package may be disabled by masking
+the "test" \fBUSE\fR flag in \fBpackage.use.mask\fR (see \fBportage\fR(5)).
+.TP
 .B unmerge\-orphans
 If a file is not claimed by another package in the same slot and it is not
 protected by \fICONFIG_PROTECT\fR, unmerge it even if the modification time or

Modified: main/branches/2.1.6/pym/_emerge/__init__.py
===================================================================
--- main/branches/2.1.6/pym/_emerge/__init__.py	2008-12-12 21:51:21 UTC (rev 12244)
+++ main/branches/2.1.6/pym/_emerge/__init__.py	2008-12-12 21:51:45 UTC (rev 12245)
@@ -2908,6 +2908,10 @@
 			self.returncode = portage._doebuild_exit_status_check_and_log(
 				self.settings, self.phase, self.returncode)
 
+		if self.phase == "test" and self.returncode != os.EX_OK and \
+			"test-fail-continue" in self.settings.features:
+			self.returncode = os.EX_OK
+
 		portage._post_phase_userpriv_perms(self.settings)
 
 class EbuildPhase(CompositeTask):

Modified: main/branches/2.1.6/pym/portage/__init__.py
===================================================================
--- main/branches/2.1.6/pym/portage/__init__.py	2008-12-12 21:51:21 UTC (rev 12244)
+++ main/branches/2.1.6/pym/portage/__init__.py	2008-12-12 21:51:45 UTC (rev 12245)
@@ -4493,6 +4493,11 @@
 		_check_build_log(mysettings)
 		if phase_retval == os.EX_OK:
 			phase_retval = _post_src_install_checks(mysettings)
+
+	if mydo == "test" and phase_retval != os.EX_OK and \
+		"test-fail-continue" in mysettings.features:
+		phase_retval = os.EX_OK
+
 	return phase_retval
 
 _post_phase_cmds = {