From nobody Wed Mar 1 21:23:59 2023 X-Original-To: dev-commits-src-all@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 4PRnKr313nz3vNHs; Wed, 1 Mar 2023 21:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRnKr0yFnz3Fb1; Wed, 1 Mar 2023 21:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677705840; 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=4pxm/KdxtBLyLAm+owZrLnSnaDurf4cNRWo5JdX0Nao=; b=ZrN9tTR1/Fv81I2jsMGjB4WaWSdI0NQpQreYIBVv3YNN/0bcYwnot1Y7epFahyyMlzYyIz 5Dv/Wp8tkDqepRoHGGeO5UyfHFBHGSTsJjmyHJcarBloduxRteLyZi3j/Bwy3b1yozMyVa QjwW+4nJ66E6uyhEVKWNqcytH+BAItmzuPXeTiHpIdwB8DrpaMR995dYMf9qhQvxmxrLhQ RftsZN5eXeapBdD32YcPOHmlO+g06122XoXaMgDU1uM0axIFcfXa/js+LcpnjB+VuT02UK bshFl7CSkrYCk2E2XruYpxCAWbPmvzsUuJ5ZRkzuqQ2wKB20ddzftjtvnKggyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677705840; 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=4pxm/KdxtBLyLAm+owZrLnSnaDurf4cNRWo5JdX0Nao=; b=n/ARRPTj8+7SIOz4QfZxW9TQ9FCvWfq1hYvErZ906kGjE2CK7IziPpO1+wo5FhZQsbxA71 ZGM737wA+QgXKXlDTRmPY50p2NaB0PoYstLq0t5uYWKRbQqi1hJNMtOF25rIYjcyNjGEVc 4imTQ5fcv9+/AhlHs26RNhd/2m1ZLdcnQgFIb3J3jiUoyCZOQHKE17tdS5zneQ85rf87u1 O8vEp8Wbxukrzp2GGZ/Ux7K6pMtXww4tT/Fq8WzzlMd2JU1Ix8HehmSMfty+xWgF6qt89K fcQ92Bu/V/Ae06vz7CqRuiTwXSrJxMyny4CnOBKgV9mfW7TTFnIw4+OHDxmrVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677705840; a=rsa-sha256; cv=none; b=L38yxyb1DzjBCheLAnWnntJ6hKWA81eGyjqMyrSweWB2ajof5AmRPVInOS7Z0R7a7u9hNX djW4beDudWpvTrIs03MxO4bxAu4Lt3tm+uAHsbbK6q8ZIErDo6l8egUbcj8i7GKcQeDAxD 9C5b8RMqKkQj/PAWORnPwIyX0cLn/NRIpkxwgGVOza4RkouQ3zXlvSbo3EHpaQn0RYuaKq q6T9jUJhDzO0OTUSLcdy1a5apdlviKhhlW5CoGH69WOrhVFwvNE/Qy5FzFYBvxlsCYQGBi +frKgyq3nHdBSGOKIq+4DqNNXbQnnY5FVbTNgUSSMtoX2mUyGM5H2MGzEVWWTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRnKq6qCdzq4S; Wed, 1 Mar 2023 21:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321LNx1x079029; Wed, 1 Mar 2023 21:23:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321LNxSv079028; Wed, 1 Mar 2023 21:23:59 GMT (envelope-from git) Date: Wed, 1 Mar 2023 21:23:59 GMT Message-Id: <202303012123.321LNxSv079028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: e78dc78e517a - main - testing: skip tarfs tests if module is not loadable. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e78dc78e517ae36143973dd2675da8ec93c4951e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=e78dc78e517ae36143973dd2675da8ec93c4951e commit e78dc78e517ae36143973dd2675da8ec93c4951e Author: Olivier Cochard AuthorDate: 2023-03-01 20:26:54 +0000 Commit: Olivier Cochard CommitDate: 2023-03-01 21:23:07 +0000 testing: skip tarfs tests if module is not loadable. Approved by: asomers Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D38828 --- tests/sys/fs/tarfs/tarfs_test.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 15319e249034..388a78efa476 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -38,6 +38,7 @@ tarfs_basic_head() { atf_set "require.user" "root" } tarfs_basic_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" "${mktar}" tarfs_test.tar.zst atf_check mount -rt tarfs tarfs_test.tar.zst "${mnt}" @@ -47,7 +48,7 @@ tarfs_basic_body() { atf_check_equal "$(sha256 -q "${mnt}"/sparse_file)" ${sum} } tarfs_basic_cleanup() { - umount "${mnt}" + umount "${mnt}" || true } atf_test_case tarfs_notdir_device cleanup @@ -56,6 +57,7 @@ tarfs_notdir_device_head() { atf_set "require.user" "root" } tarfs_notdir_device_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" atf_check mknod d b 0xdead 0xbeef tar cf tarfs_notdir.tar d @@ -76,6 +78,7 @@ tarfs_notdir_dot_head() { atf_set "require.user" "root" } tarfs_notdir_dot_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" echo "hello" >d tar cf tarfs_notdir.tar d @@ -96,6 +99,7 @@ tarfs_notdir_dotdot_head() { atf_set "require.user" "root" } tarfs_notdir_dotdot_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" echo "hello" >d tar cf tarfs_notdir.tar d @@ -116,6 +120,7 @@ tarfs_notdir_file_head() { atf_set "require.user" "root" } tarfs_notdir_file_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" echo "hello" >d tar cf tarfs_notdir.tar d