diff options
| author | Bryan Drewery <bryan@shatow.net> | 2014-04-23 05:37:02 +0400 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2014-04-23 05:37:02 +0400 |
| commit | 5bfd2bffdd059aa213f5ddb24176f68000487d9d (patch) | |
| tree | 1dd128974759eeb586b3084afbda8f8c03f838cb | |
| parent | f21f559159fe08ebae08a4f4e25404aedac40198 (diff) | |
testport: Fix regression from off-by-one fix, don't spawn a builder if no deps
| -rwxr-xr-x | src/share/poudriere/common.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 29e95e67..089a6cbe 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -2120,6 +2120,9 @@ parallel_build() { local real_parallel_jobs=${PARALLEL_JOBS} local nremaining=$(calculate_tobuild) + # Subtract the 1 for the main port to test + [ "${0##*/}" = "testport.sh" ] && nremaining=$((${nremaining} - 1)) + # If pool is empty, just return [ ${nremaining} -eq 0 ] && return 0 @@ -3205,6 +3208,7 @@ prepare_ports() { if was_a_bulk_run && [ $resuming_build -eq 0 ]; then nbq=0 nbq=$(find ${MASTERMNT}/poudriere/deps -type d -depth 1 | wc -l) + # Add 1 for the main port to test [ "${0##*/}" = "testport.sh" ] && nbq=$((${nbq} + 1)) bset stats_queued ${nbq##* } fi |