1 |
commit: 9f14ed80e65a18da06e0834961ea032e3e830319 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 29 16:43:32 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 29 16:43:32 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9f14ed80 |
7 |
|
8 |
EAPI 5: src_test support for parallel tests |
9 |
|
10 |
See bug #363005 and the PMS patch: |
11 |
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=3ec4b3c22582a8ec206bce1e93bab377d7b264b5 |
12 |
|
13 |
--- |
14 |
bin/phase-helpers.sh | 14 ++++++++++---- |
15 |
1 files changed, 10 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
18 |
index a00475c..3f02c07 100644 |
19 |
--- a/bin/phase-helpers.sh |
20 |
+++ b/bin/phase-helpers.sh |
21 |
@@ -544,13 +544,19 @@ _eapi0_src_test() { |
22 |
# we call it in 'nonfatal' mode, we use emake_cmd |
23 |
# to emulate the desired parts of emake behavior. |
24 |
local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}" |
25 |
- if $emake_cmd -j1 check -n &> /dev/null; then |
26 |
+ local internal_opts= |
27 |
+ case "$EAPI" in |
28 |
+ 0|1|2|3|4|4-python|4-slot-abi) |
29 |
+ internal_opts+=" -j1" |
30 |
+ ;; |
31 |
+ esac |
32 |
+ if $emake_cmd ${internal_opts} check -n &> /dev/null; then |
33 |
vecho ">>> Test phase [check]: ${CATEGORY}/${PF}" |
34 |
- $emake_cmd -j1 check || \ |
35 |
+ $emake_cmd ${internal_opts} check || \ |
36 |
die "Make check failed. See above for details." |
37 |
- elif $emake_cmd -j1 test -n &> /dev/null; then |
38 |
+ elif $emake_cmd ${internal_opts} test -n &> /dev/null; then |
39 |
vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" |
40 |
- $emake_cmd -j1 test || \ |
41 |
+ $emake_cmd ${internal_opts} test || \ |
42 |
die "Make test failed. See above for details." |
43 |
else |
44 |
vecho ">>> Test phase [none]: ${CATEGORY}/${PF}" |