diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-08-29 09:43:32 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-29 09:43:32 -0700 |
| commit | 9f14ed80e65a18da06e0834961ea032e3e830319 (patch) | |
| tree | 26084abcde3360a05cc7fbfbddbc093a892450dd /bin | |
| parent | cbd3ea6cad4d7ef8103ddbb71245c1ea47fa49ed (diff) | |
| download | portage-9f14ed80e65a18da06e0834961ea032e3e830319.tar.gz portage-9f14ed80e65a18da06e0834961ea032e3e830319.tar.bz2 portage-9f14ed80e65a18da06e0834961ea032e3e830319.zip | |
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
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/phase-helpers.sh | 14 |
1 files changed, 10 insertions, 4 deletions
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}" |