From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 29 Aug 2012 16:43:32 +0000 (-0700)
Subject: EAPI 5: src_test support for parallel tests
X-Git-Tag: v2.2.0_alpha124~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f14ed80e65a18da06e0834961ea032e3e830319;p=portage.git

EAPI 5: src_test support for parallel tests

See bug #363005 and the PMS patch:
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=3ec4b3c22582a8ec206bce1e93bab377d7b264b5
---

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index a00475cfb..3f02c0701 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -544,13 +544,19 @@ _eapi0_src_test() {
 	# we call it in 'nonfatal' mode, we use emake_cmd
 	# to emulate the desired parts of emake behavior.
 	local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
-	if $emake_cmd -j1 check -n &> /dev/null; then
+	local internal_opts=
+	case "$EAPI" in
+		0|1|2|3|4|4-python|4-slot-abi)
+			internal_opts+=" -j1"
+			;;
+	esac
+	if $emake_cmd ${internal_opts} check -n &> /dev/null; then
 		vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-		$emake_cmd -j1 check || \
+		$emake_cmd ${internal_opts} check || \
 			die "Make check failed. See above for details."
-	elif $emake_cmd -j1 test -n &> /dev/null; then
+	elif $emake_cmd ${internal_opts} test -n &> /dev/null; then
 		vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		$emake_cmd -j1 test || \
+		$emake_cmd ${internal_opts} test || \
 			die "Make test failed. See above for details."
 	else
 		vecho ">>> Test phase [none]: ${CATEGORY}/${PF}"