D54424.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D54424.diff
View Options

	diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh
	--- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh
	+++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh
	@@ -41,14 +41,18 @@
	# Try to force a TXG, this can help catch bugs by triggering a panic.
	sync

	- pool=$(cat $TEST_ZFS_POOL_NAME)
	- if zpool list "$pool" >/dev/null; then
	- zpool destroy "$pool"
	+ if [ -f "$TEST_ZFS_POOL_NAME" ]; then
	+ pool=$(cat $TEST_ZFS_POOL_NAME)
	+ if zpool list "$pool" >/dev/null; then
	+ zpool destroy "$pool"
	+ fi
	fi

	- md=$(cat $TEST_MD_DEVICE_FILE)
	- if [ -c /dev/"$md" ]; then
	- mdconfig -d -u "$md"
	+ if [ -f "$TEST_MD_DEVICE_FILE" ]; then
	+ md=$(cat $TEST_MD_DEVICE_FILE)
	+ if [ -c /dev/"$md" ]; then
	+ mdconfig -d -u "$md"
	+ fi
	fi
	}

	@@ -128,6 +132,12 @@
	# Try configuring various compression algorithms.
	#
	atf_test_case compression cleanup
	+compression_head()
	+{
	+ # Extend the default timeout to make it pass on emulated architectures
	+ # on ci.freebsd.org
	+ atf_set "timeout" 400
	+}
	compression_body()
	{
	create_test_inputs