From nobody Thu Jan 15 19:44:59 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dsYNX2Z5Vz6PMJV for ; Thu, 15 Jan 2026 19:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dsYNX0GQMz41LS for ; Thu, 15 Jan 2026 19:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768506300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Py+7LZUzyvsIS9dOHaQS3x/6y3XeTrzVs3SlVaXu/3k=; b=ejgQsRrtPGG3k0/0IbGqJqVwW98Qt14z80t2nL3xl/D0zreIPi8i2oAJRk1cRK5vvBqsiR sEMnGznMkgz58wMUve4CfNj668A1a6zsg4jWcRYie64naKEGI8hBtr5JQYCEzSaxmUZ4fn tZJ1hRAYs1zC7ReKCsWxI6XJsSLX/j41ze8f3SdW068iB0ANeFY9y8p2LCExwAYEbXno4W SneuPJqp8oc3ZY46CwKm95nM+ArR4+oOyvdWO432whl9hhpD0xc5J6W7AsjY3i3H4rq+SU Gc89etIn/rFZIuizAKC3UcJ6arpd4Z7SRLDXp4EkQ8R1izbk8Zl3Zh9dqy3WZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768506300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Py+7LZUzyvsIS9dOHaQS3x/6y3XeTrzVs3SlVaXu/3k=; b=EMODPipcX2Ba42dPTEf3MX9OBiTr0aCPy4Sql4qINUvYnfrF72BlXri521X6dLUT1nMMFl D0TDNdbJJe2XJMHAphixNoqJLxdr7isNrkKiJ6bcK0HqvVz8TUqRCTvd4R1KinUBPuIQ1Y GrvZ8/rRtYJoOJ60CUUiR4PnBKXJmrBT+UtAgibMvb+yR9QkeY1DwQkztFr0aMkGBc1R3E ybHYu9NizGU5EAZ9v9aJF+oRa3a+R/noQJwEOXc9RH1KydBaKgKAz/x2i3mLyJr7+NSfnC iJkRPkS98rs5P14RrY7c+paCp//2xFMXaljSfx3SAIbZETD/PbN4pT7V096s4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768506300; a=rsa-sha256; cv=none; b=FPyk3R45I8Nde03w+bSQ3ZcH3IT7nVV+b9dGZUKWoCkzvOEhfx5gTBPTAGaMRy6109jdqv bYNtcl7i4gbkpWSU44olY+0gme9LK0jPTJReDmBGe83895cN6J58MbqCi205MyeZgpv4ZC 3+pgBrR26mnG/nl4TQVxitZzZspAq84iaR1V6lEpWiMU5onvqgq+eAq3mB25RtLak6SXDR KYmJAx1ZOVdthoMS/d9hinB43kcAUxf60fMzgwn+pLLXdT9RPBsiRZL1zIXVEz9ZMG+1Nx Hoyl3epE2+n3RCSiiddPzN0mvX6hmpe2V3+RkIPLwXJIhzHH/BOHfaBkXtwHVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dsYNW6qWRzjkF for ; Thu, 15 Jan 2026 19:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46977 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Jan 2026 19:44:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: f8b5a8a97743 - stable/15 - makefs: tests: Double the timeout of ZFS compression test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f8b5a8a97743547ee7145606c708d696a86c8abe Auto-Submitted: auto-generated Date: Thu, 15 Jan 2026 19:44:59 +0000 Message-Id: <696943bb.46977.4dba16ce@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f8b5a8a97743547ee7145606c708d696a86c8abe commit f8b5a8a97743547ee7145606c708d696a86c8abe Author: Jose Luis Duran AuthorDate: 2026-01-05 20:31:40 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-15 19:37:38 +0000 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 (cherry picked from commit 9f28e92637e9a29124f407b74d7665a921865a53) --- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 22 ++++++++++++++++------ 1 file 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