D51306.id158477.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51306.id158477.diff
View Options

	diff --git a/tests/ci/Makefile b/tests/ci/Makefile
	--- a/tests/ci/Makefile
	+++ b/tests/ci/Makefile
	@@ -72,6 +72,7 @@
	CIIMAGE= ci-${OSRELEASE}-${GITREV}-${KERNCONF}.${FORMAT}
	CIDISK?= ${.OBJDIR}/${CIIMAGE}
	VMSIZE?= 6g
	+KYUA_TEST_FILTERS?=
	CITYPE?= full
	META_TAR!=mktemp /tmp/meta.XXXXXX
	META_DIR!=mktemp -d /tmp/meta.XXXXXX
	diff --git a/tests/ci/tools/ci.conf b/tests/ci/tools/ci.conf
	--- a/tests/ci/tools/ci.conf
	+++ b/tests/ci/tools/ci.conf
	@@ -61,7 +61,8 @@
	cron_enable="NO" \
	syslogd_enable="NO" \
	newsyslog_enable="NO" \
	- freebsdci_type="${CITYPE}"
	+ freebsdci_type="${CITYPE}" \
	+ freebsdci_test_filters="${KYUA_TEST_FILTERS}"
	cat << EOF >> ${DESTDIR}/etc/sysctl.conf
	kern.cryptodevallowsoft=1
	kern.ipc.tls.enable=1
	diff --git a/tests/ci/tools/freebsdci b/tests/ci/tools/freebsdci
	--- a/tests/ci/tools/freebsdci
	+++ b/tests/ci/tools/freebsdci
	@@ -39,6 +39,7 @@
	load_rc_config $name
	: ${freebsdci_enable:="NO"}
	: ${freebsdci_type:="full"}
	+: ${freebsdci_test_filters:=""}
	PATH="${PATH}:/usr/local/sbin:/usr/local/bin"

	auto_shutdown()
	@@ -77,7 +78,9 @@
	tar xvf ${tardev} -C ${metadir}
	cd /usr/tests
	set +e
	- kyua -v parallelism=${parallelism} test
	+ kyua \
	+ -v parallelism=${parallelism} \
	+ test ${freebsdci_test_filters}
	rc=$?
	set -e
	if [ ${rc} -ne 0 ] && [ ${rc} -ne 1 ]; then