diff options
| author | Bryan Drewery <bryan@shatow.net> | 2019-03-13 05:42:48 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2019-05-16 17:27:35 +0300 |
| commit | 67f846c66fb72756652144ef9b89f816526c8fb6 (patch) | |
| tree | bc3106e133c07c3ed59f772f1cbf85ed73add0c0 /test | |
| parent | 9168ff25fdfa1906908636aebc9173d8987f6371 (diff) | |
tests: Properly use make.conf and set perl5 default
Diffstat (limited to 'test')
| -rw-r--r-- | test/common.bulk.sh | 7 | ||||
| -rw-r--r-- | test/etc/poudriere.d/make.conf | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/common.bulk.sh b/test/common.bulk.sh index ea1c1b50..bbec4148 100644 --- a/test/common.bulk.sh +++ b/test/common.bulk.sh @@ -202,9 +202,6 @@ assert_queued() { rm -f "${tmp}" } -export __MAKE_CONF=/dev/null -export SRCCONF=/dev/null -export SRC_ENV_CONF=/dev/null # Avoid injail() for port_var_fetch INJAIL_HOST=1 @@ -253,7 +250,9 @@ PTMNT="${PORTSDIR}" : ${PTNAME:=test} : ${SETNAME:=} export PORT_DBDIR=/dev/null -export PERL5_DEFAULT=5.24 +export __MAKE_CONF="${POUDRIERE_ETC}/poudriere.d/make.conf" +export SRCCONF=/dev/null +export SRC_ENV_CONF=/dev/null set -e diff --git a/test/etc/poudriere.d/make.conf b/test/etc/poudriere.d/make.conf new file mode 100644 index 00000000..4392ae9b --- /dev/null +++ b/test/etc/poudriere.d/make.conf @@ -0,0 +1 @@ +DEFAULT_VERSIONS+=perl5=5.24 |