diff options
author | Bryan Drewery <bryan@shatow.net> | 2022-11-08 06:09:03 +0300 |
---|---|---|
committer | Bryan Drewery <bryan@shatow.net> | 2022-11-08 08:09:24 +0300 |
commit | 8931810af7132dd6cb12fcaa02d6925a83fe70e2 (patch) | |
tree | 13702142684a3e72e96975456ca57e9fb9889272 /src | |
parent | 1e4b28709ad5721d129b9182c0fda11f37e6a0a3 (diff) |
bulk tests: Use explicit EXPECTED_QUEUED lists
Diffstat (limited to 'src')
-rwxr-xr-x | src/share/poudriere/common.sh | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index d9356641..34716b1a 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -1422,9 +1422,6 @@ show_log_info() { show_dry_run_summary() { [ ${DRY_RUN} -eq 1 ] || return 0 - local log - - _log_path log bset status "done:" msg "Dry run mode, cleaning up and exiting" @@ -1437,16 +1434,7 @@ show_dry_run_summary() { if [ "${ALL}" -eq 0 ] || [ "${VERBOSE}" -ge 1 ]; then msg_n "Ports to build: " - { - if was_a_testport_run; then - echo "${ORIGINSPEC}" - fi - cat "${log}/.poudriere.ports.queued" - } | while mapfile_read_loop_redir originspec pkgname \ - _ignored; do - pkgqueue_contains "${pkgname}" || continue - echo "${originspec}" - done | sort | tr '\n' ' ' + get_to_build | paste -s -d ' ' - echo fi else @@ -7929,6 +7917,7 @@ prepare_ports() { fi load_priorities + get_to_build > "${log}/.poudriere.ports.tobuild" # Avoid messing with the queue for DRY_RUN or it confuses # the dry run summary output as it doesn't know about @@ -7955,12 +7944,26 @@ prepare_ports() { jget ${JAILNAME} version > "${PACKAGES}/.jailversion" || \ err 1 "Missing version metadata for jail" echo "${BUILDNAME}" > "${PACKAGES}/.buildname" - fi return 0 } +get_to_build() { + local log + + _log_path log + { + if was_a_testport_run; then + echo "${ORIGINSPEC}" + fi + cat "${log}/.poudriere.ports.queued" + } | while mapfile_read_loop_redir originspec pkgname _ignored; do + pkgqueue_contains "${pkgname}" || continue + echo "${originspec}" + done | sort +} + load_priorities_ptsort() { local priority pkgname originspec pkg_boost origin flavor _ignored local - # Keep set -f local |