From owner-dev-commits-ports-all@freebsd.org Tue Jul 6 14:44:21 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 72370658E31; Tue, 6 Jul 2021 14:44:21 +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 4GK5112dvRz3H3n; Tue, 6 Jul 2021 14:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3FF501B83E; Tue, 6 Jul 2021 14:44:21 +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 166EiL0Q090198; Tue, 6 Jul 2021 14:44:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 166EiLEI090197; Tue, 6 Jul 2021 14:44:21 GMT (envelope-from git) Date: Tue, 6 Jul 2021 14:44:21 GMT Message-Id: <202107061444.166EiLEI090197@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 791385bcd583 - main - sysutils/fusefs-unreliablefs: Improve do-test MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 791385bcd583d27c22b3f95e716b4d36a7565b34 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jul 2021 14:44:21 -0000 The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=791385bcd583d27c22b3f95e716b4d36a7565b34 commit 791385bcd583d27c22b3f95e716b4d36a7565b34 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-07-06 14:42:12 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-07-06 14:44:12 +0000 sysutils/fusefs-unreliablefs: Improve do-test - Remove an unnecessary testing argument from USES=cmake - Add some additional checks to make sure that FUSE is available. - Simplify providing the build directory to the test suite. --- sysutils/fusefs-unreliablefs/Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sysutils/fusefs-unreliablefs/Makefile b/sysutils/fusefs-unreliablefs/Makefile index f0a8e9bd818f..9af80752c8c3 100644 --- a/sysutils/fusefs-unreliablefs/Makefile +++ b/sysutils/fusefs-unreliablefs/Makefile @@ -17,7 +17,7 @@ BROKEN_FreeBSD_11= error: use of undeclared identifier 'EINTEGRITY' TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ fio:benchmarks/fio -USES= cmake:testing fuse pkgconfig python:env +USES= cmake fuse pkgconfig python:env USE_CSTD= c11 USE_GITHUB= yes GH_ACCOUNT= ligurio @@ -40,11 +40,19 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5 do-test: +# fusefs(5) must be loaded. + if ! kldload -n fusefs; then \ + ${ECHO_MSG} "Cannot load the fusefs kernel module"; \ + ${FALSE}; \ + fi +# /dev/fuse must be writtable and readable to the user running the tests. + if [ ! -r /dev/fuse ] || [ ! -w /dev/fuse ]; then \ + ${ECHO_MSG} "Current user does cannot access /dev/fuse"; \ + ${FALSE}; \ + fi # The test suite assumes that the binaries are available in the ${WRKSRC}/build # directory, which is not the case here. - ${MKDIR} ${WRKSRC}/build/tests - ${RLN} ${INSTALL_WRKSRC}/${PORTNAME} ${WRKSRC}/build/ - ${RLN} ${INSTALL_WRKSRC}/tests/fsx ${WRKSRC}/build/tests + ${LN} -Fs ${INSTALL_WRKSRC} ${WRKSRC}/build cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest --verbose -rxXs tests/ .include