diff options
| author | Bryan Drewery <bryan@shatow.net> | 2019-12-10 02:50:02 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2019-12-10 02:50:02 +0300 |
| commit | 9da4309eb18da693a6bbcd09e51a9dc784cf68b3 (patch) | |
| tree | c5062aeb6192a05468023fd766787120612acd76 /test | |
| parent | ffa5afb19b77aaabcbb080a5291d2fcef7770a14 (diff) | |
tests: Allow multiple OVERLAYS for later
Diffstat (limited to 'test')
| -rw-r--r-- | test/common.bulk.sh | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/test/common.bulk.sh b/test/common.bulk.sh index 77f8693f..ad2cb4a8 100644 --- a/test/common.bulk.sh +++ b/test/common.bulk.sh @@ -421,16 +421,19 @@ export POUDRIERE_BUILD_TYPE=bulk _log_path log # Setup basic overlay to test-ports/overlay/ dir. -pset "overlay" mnt "${PTMNT%/*}/overlay" -pset "overlay" method "-" -# We run port_var_fetch_originspec without a jail so can't use plain -# /overlays. Need to link the host path into our fake MASTERMNT path -# as well as link to the overlay portdir without nullfs. -OVERLAYSDIR="$(mktemp -ut overlays)" -mkdir -p "${MASTERMNT}/${OVERLAYSDIR%/*}" -ln -fs "${MASTERMNT}/${OVERLAYSDIR}" "${OVERLAYSDIR}" -mkdir -p "${MASTERMNT}/${OVERLAYSDIR}" -ln -fs "${PTMNT%/*}/overlay" "${MASTERMNT}/${OVERLAYSDIR}/overlay" +for o in ${OVERLAYS}; do + [ -d "${PTMNT%/*}/${o}" ] || continue + pset "${o}" mnt "${PTMNT%/*}/${o}" + pset "${o}" method "-" + # We run port_var_fetch_originspec without a jail so can't use plain + # /overlays. Need to link the host path into our fake MASTERMNT path + # as well as link to the overlay portdir without nullfs. + OVERLAYSDIR="$(mktemp -ut overlays)" + mkdir -p "${MASTERMNT}/${OVERLAYSDIR%/*}" + ln -fs "${MASTERMNT}/${OVERLAYSDIR}" "${OVERLAYSDIR}" + mkdir -p "${MASTERMNT}/${OVERLAYSDIR}" + ln -fs "${PTMNT%/*}/${o}" "${MASTERMNT}/${OVERLAYSDIR}/${o}" +done echo -n "Pruning previous logs..." ${SUDO} ${POUDRIEREPATH} -e ${POUDRIERE_ETC} logclean -B "${BUILDNAME}" -ay \ |