diff options
| author | Bryan Drewery <bryan@shatow.net> | 2020-06-05 04:33:44 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2021-04-06 02:47:49 +0300 |
| commit | 22fd1bc2c2cd336682eefc7cefb50a13a1594b42 (patch) | |
| tree | 947dc7918caa42ee6f7f08e4612f9b9f6d35850d /test | |
| parent | 46d5f76800c267bfda02b32350311ea3ad983ea3 (diff) | |
bulk tests: Fix per-test poudriere.conf not being included
Diffstat (limited to 'test')
| -rw-r--r-- | test/common.bulk.sh | 5 | ||||
| -rw-r--r-- | test/common.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/common.bulk.sh b/test/common.bulk.sh index 934758fb..193122d9 100644 --- a/test/common.bulk.sh +++ b/test/common.bulk.sh @@ -603,8 +603,6 @@ if [ ${ALL:-0} -eq 0 ]; then assert_not "" "${LISTPORTS}" "LISTPORTS empty" fi -. ${SCRIPTPREFIX}/common.sh - : ${PORTSDIR:=${THISDIR%/*}/test-ports/default} export PORTSDIR PTMNT="${PORTSDIR}" @@ -620,8 +618,11 @@ export PACKAGE_BUILDING=yes write_cmp "${POUDRIERE_ETC}/poudriere.d/${SETNAME}-poudriere.conf" << EOF ${FLAVOR_DEFAULT_ALL:+FLAVOR_DEFAULT_ALL=${FLAVOR_DEFAULT_ALL}} ${FLAVOR_ALL:+FLAVOR_ALL=${FLAVOR_ALL}} +${MUTABLE_BASE:+MUTABLE_BASE=${MUTABLE_BASE}} EOF +. ${SCRIPTPREFIX}/common.sh + echo -n "Pruning stale jails..." ${SUDO} ${POUDRIEREPATH} -e ${POUDRIERE_ETC} jail -k \ -j "${JAILNAME}" -p "${PTNAME}" ${SETNAME:+-z "${SETNAME}"} \ diff --git a/test/common.sh b/test/common.sh index db5b6afc..d5d801bd 100644 --- a/test/common.sh +++ b/test/common.sh @@ -45,7 +45,7 @@ NOLINUX=yes NO_LIB32=yes NO_SRC=yes SHARED_LOCK_DIR="${POUDRIERE_ETC}/run" -MUTABLE_BASE=${MUTABLE_BASE:-nullfs} +MUTABLE_BASE=nullfs $(env | grep -q 'CCACHE_STATIC_PREFIX' && { env | awk '/^CCACHE/ {print "export " $0}'; } || :) EOF write_cmp "${POUDRIERE_ETC}/poudriere.d/make.conf" << EOF |