aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Luis Duran <jlduran@FreeBSD.org>2026-01-05 20:31:40 +0000
committerJose Luis Duran <jlduran@FreeBSD.org>2026-01-05 20:31:40 +0000
commit9f28e92637e9a29124f407b74d7665a921865a53 (patch)
tree4e7fd63a11b7d46168b0da43bea4e7c3ff22a9f3
parent4b047c3af3fec1607ba1cfe04e1d442a17fc1cf6 (diff)
makefs: tests: Double the timeout of ZFS compression test
The test makefs_zfs_tests:compression is timing out on ci.freebsd.org. Double the default timeout to allow it to finish. While here, check if the file exists before cleaning up, otherwise, cat may fail. Reported by: Jenkins Reviewed by: asomers MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54424
-rw-r--r--usr.sbin/makefs/tests/makefs_zfs_tests.sh22
1 files changed, 16 insertions, 6 deletions
diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh
index 2fafce85b347..ac4c56796011 100644
--- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh
@@ -41,14 +41,18 @@ common_cleanup()
# 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 @@ basic_cleanup()
# Try configuring various compression algorithms.
#
atf_test_case compression cleanup
+compression_head()
+{
+ # Double the default timeout to make it pass on emulated architectures
+ # on ci.freebsd.org
+ atf_set "timeout" 600
+}
compression_body()
{
create_test_inputs