diff options
author | Bryan Drewery <bryan@shatow.net> | 2019-08-01 07:55:38 +0300 |
---|---|---|
committer | Bryan Drewery <bryan@shatow.net> | 2019-08-02 20:16:11 +0300 |
commit | 383f6f2ab47df89cb746e132c4ba891af1d435cb (patch) | |
tree | 660811ec1b4ee60db3e453ac727144ca2c00b685 /src/share/poudriere | |
parent | 1fd1aa73ef592d384cae1a5fd006f915507daabc (diff) |
Tobuild should account for ignored/skipped being trimmed out of queued
Diffstat (limited to 'src/share/poudriere')
-rwxr-xr-x | src/share/poudriere/common.sh | 14 | ||||
-rw-r--r-- | src/share/poudriere/html/assets/poudriere.js | 2 | ||||
-rwxr-xr-x | src/share/poudriere/jail.sh | 2 | ||||
-rwxr-xr-x | src/share/poudriere/status.sh | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index e0677588..bb2df508 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -1217,7 +1217,7 @@ show_dry_run_summary() { } show_build_summary() { - local status nbb nbf nbs nbi nbq ndone nbtobuild buildname + local status nbb nbf nbs nbi nbq nbtobuild buildname local log now elapsed buildtime queue_width update_stats 2>/dev/null || return 0 @@ -1228,8 +1228,7 @@ show_build_summary() { _bget nbi stats_ignored || nbi=0 _bget nbs stats_skipped || nbs=0 _bget nbb stats_built || nbb=0 - ndone=$((nbb + nbf + nbi + nbs)) - nbtobuild=$((nbq - ndone)) + nbtobuild=$((nbq - (nbb + nbf))) if [ ${nbq} -gt 9999 ]; then queue_width=5 @@ -3825,18 +3824,15 @@ build_queue() { } calculate_tobuild() { - local nbq nbb nbf nbi nbs ndone nremaining + local nbq nbb nbf nremaining _bget nbq stats_queued || nbq=0 _bget nbb stats_built || nbb=0 _bget nbf stats_failed || nbf=0 - _bget nbi stats_ignored || nbi=0 - _bget nbs stats_skipped || nbs=0 - ndone=$((nbb + nbf + nbi + nbs)) - nremaining=$((nbq - ndone)) + nremaining=$((nbq - (nbb + nbf))) - echo ${nremaining} + echo "${nremaining}" } status_is_stopped() { diff --git a/src/share/poudriere/html/assets/poudriere.js b/src/share/poudriere/html/assets/poudriere.js index cc63640f..c6723c51 100644 --- a/src/share/poudriere/html/assets/poudriere.js +++ b/src/share/poudriere/html/assets/poudriere.js @@ -177,7 +177,7 @@ function update_canvas(stats) { failed = stats.failed; skipped = stats.skipped; ignored = stats.ignored; - remaining = queued - built - failed - skipped - ignored; + remaining = queued - built - failed; context = canvas.getContext('2d'); diff --git a/src/share/poudriere/jail.sh b/src/share/poudriere/jail.sh index 438a18c6..55608bae 100755 --- a/src/share/poudriere/jail.sh +++ b/src/share/poudriere/jail.sh @@ -941,7 +941,7 @@ info_jail() { _bget nbf stats_failed || nbf=0 _bget nbi stats_ignored || nbi=0 _bget nbs stats_skipped || nbs=0 - tobuild=$((nbq - nbb - nbf - nbi - nbs)) + tobuild=$((nbq - (nbb + nbf))) _jget jversion ${JAILNAME} version _jget jversion_vcs ${JAILNAME} version_vcs || jversion_vcs= diff --git a/src/share/poudriere/status.sh b/src/share/poudriere/status.sh index e898bb71..1dd69634 100755 --- a/src/share/poudriere/status.sh +++ b/src/share/poudriere/status.sh @@ -138,7 +138,7 @@ add_summary_build() { _bget nbfailed stats_failed || : _bget nbignored stats_ignored || : _bget nbskipped stats_skipped || : - nbtobuild=$((nbqueued - (nbbuilt + nbfailed + nbskipped + nbignored))) + nbtobuild=$((nbqueued - (nbbuilt + nbfailed))) calculate_elapsed_from_log ${now} ${log} elapsed=${_elapsed_time} |