From nobody Mon Jan 5 20:38:51 2026 X-Original-To: dev-commits-src-main@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 4dlR3J0Jx9z6N1x3 for ; Mon, 05 Jan 2026 20:38:52 +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 4dlR3H58R3z3Z0v for ; Mon, 05 Jan 2026 20:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767645531; 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=3Bk4C4RYnqOR7ZlTRXX9rpXmIRSkK6Z/o+b/PDd8HSQ=; b=eeS6Xlpx26XSroLSWHotoqDAyj9d0gKlNBVE2ik13K5lX+mYDEQqgcr9WEpjhOJz3ypiVg kJI4APD49K5v5RiQ5uYHDtQrai53iyNosUuPir3gyzSzrf6pI0waDyZyWpELtp2aiOOyBN aFUpFqmkH1f2j3F+QGuX2FitzFuKMBx3cSa/NCvHPJdCf9s7mwKBiTaYhQyZFZHsfXXHiM nD/YKNUXowsErBUnsvF8uvKakGIjCMXq5Hn9ZS2Fh7e7l9DfyYHQUjjFe8qxNo0cCbtBAv mMagkfYmzsv+hlfBO6IXp03ra+KkO/DbE/+gGSYFh7h9oUQUK9Jt2aqUisy89g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767645531; 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=3Bk4C4RYnqOR7ZlTRXX9rpXmIRSkK6Z/o+b/PDd8HSQ=; b=KnkEsjCPvu/bf+dYPRCjVT9mF8CoYm/ySMiMYd8c6ZyaECTzb+Fhv09PORWkp1KjKhSxvB Za7b7GSPL00pQ3ixWP89qGogDncWXY3iBxE6tb8EgYfZfnSff8csnZxvFn5zeFOvfQFoVc rRnsbBhPCpak7DzX5oVMKhIa4HVprBgCjjqTRHl9OT5uWTVIhULnpYJXX8FeQQWLxpxGUZ l/y2n+BOgZciH11VKKASfYJ8k/2aj3tjL/NLja51BocC2Tv46+JKduIt7HFHUGdj8qLMPQ wDfwlD05PMrGKvr1q1a49gJCYoA2lf3zro/1k+KkJ+cyaObh3ohhxM55Ms2FUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767645531; a=rsa-sha256; cv=none; b=HOPE/J7KyXhaSsKWPKESDG5LDn6ZXYTdlGD+PXQ6MTNr32HGhugtANO/5B4KW850ysLaSR +mJgWJD6coz9iiT/H574LbbM/2IF520Q4tkr6s8Z337/Veuqk/ML+pAr6HtZWwHp9kjfte yKpSgw3OLxWv63KESKtHRTNQie+Q9qhHx2zPBEhZbmC7/8UM4meN16skZnDd/RIF/MEPuR RB0iHpU7kgFcTmpTmsWa1qkRkcBRPFMJ2UFR/pLpNor2Rr9LlM+yVeHATMZHLQqaA6d9Eo mQbyvePgTYdrELSSv0lb8a8zikJ/rIusxjCOywV0I6/XZmLf2OpMq4o77z93qA== 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 4dlR3H3vCyzcHZ for ; Mon, 05 Jan 2026 20:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ae88 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 20:38:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 9f28e92637e9 - main - makefs: tests: Double the timeout of ZFS compression test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9f28e92637e9a29124f407b74d7665a921865a53 Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 20:38:51 +0000 Message-Id: <695c215b.ae88.68cc70f1@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=9f28e92637e9a29124f407b74d7665a921865a53 commit 9f28e92637e9a29124f407b74d7665a921865a53 Author: Jose Luis Duran AuthorDate: 2026-01-05 20:31:40 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-05 20:31:40 +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 --- 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