From owner-dev-commits-src-all@freebsd.org Wed Sep 15 13:09:43 2021 Return-Path: Delivered-To: dev-commits-src-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 4F84E67E8A6; Wed, 15 Sep 2021 13:09:43 +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 4H8gY31CL3z3h12; Wed, 15 Sep 2021 13:09:43 +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 0A3F26908; Wed, 15 Sep 2021 13:09:43 +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 18FD9ghr046102; Wed, 15 Sep 2021 13:09:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18FD9gvp046101; Wed, 15 Sep 2021 13:09:42 GMT (envelope-from git) Date: Wed, 15 Sep 2021 13:09:42 GMT Message-Id: <202109151309.18FD9gvp046101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4bfe0d4059b5 - stable/13 - path_test: Fix test sorting MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4bfe0d4059b59719ce813eec6619df7d9f2147de Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2021 13:09:43 -0000 The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4bfe0d4059b59719ce813eec6619df7d9f2147de commit 4bfe0d4059b59719ce813eec6619df7d9f2147de Author: Mark Johnston AuthorDate: 2021-09-08 14:59:42 +0000 Commit: Mark Johnston CommitDate: 2021-09-15 13:09:32 +0000 path_test: Fix test sorting Sponsored by: The FreeBSD Foundation (cherry picked from commit c4c66153243896f9de49474c817fe450584a3bf3) --- tests/sys/file/path_test.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/sys/file/path_test.c b/tests/sys/file/path_test.c index 0265aa095720..ad88c691a914 100644 --- a/tests/sys/file/path_test.c +++ b/tests/sys/file/path_test.c @@ -63,25 +63,6 @@ #define CHECKED_CLOSE(fd) \ ATF_REQUIRE_MSG(close(fd) == 0, FMT_ERR("close")) -/* - * Verify fstatat(AT_EMPTY_PATH) on non-regular dirfd. - * Verify that fstatat(AT_EMPTY_PATH) on NULL path returns EFAULT. - */ -ATF_TC_WITHOUT_HEAD(path_pipe_fstatat); -ATF_TC_BODY(path_pipe_fstatat, tc) -{ - struct stat sb; - int fd[2]; - - ATF_REQUIRE_MSG(pipe(fd) == 0, FMT_ERR("pipe")); - ATF_REQUIRE_MSG(fstatat(fd[0], "", &sb, AT_EMPTY_PATH) == 0, - FMT_ERR("fstatat pipe")); - ATF_REQUIRE_ERRNO(EFAULT, fstatat(fd[0], NULL, &sb, - AT_EMPTY_PATH) == -1); - CHECKED_CLOSE(fd[0]); - CHECKED_CLOSE(fd[1]); -} - /* Create a temporary regular file containing some data. */ static void mktfile(char path[PATH_MAX], const char *template) @@ -776,6 +757,25 @@ ATF_TC_BODY(path_lock, tc) CHECKED_CLOSE(pathfd); } +/* + * Verify fstatat(AT_EMPTY_PATH) on non-regular dirfd. + * Verify that fstatat(AT_EMPTY_PATH) on NULL path returns EFAULT. + */ +ATF_TC_WITHOUT_HEAD(path_pipe_fstatat); +ATF_TC_BODY(path_pipe_fstatat, tc) +{ + struct stat sb; + int fd[2]; + + ATF_REQUIRE_MSG(pipe(fd) == 0, FMT_ERR("pipe")); + ATF_REQUIRE_MSG(fstatat(fd[0], "", &sb, AT_EMPTY_PATH) == 0, + FMT_ERR("fstatat pipe")); + ATF_REQUIRE_ERRNO(EFAULT, fstatat(fd[0], NULL, &sb, + AT_EMPTY_PATH) == -1); + CHECKED_CLOSE(fd[0]); + CHECKED_CLOSE(fd[1]); +} + /* Verify that we can send an O_PATH descriptor over a unix socket. */ ATF_TC_WITHOUT_HEAD(path_rights); ATF_TC_BODY(path_rights, tc) @@ -890,9 +890,9 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, path_io); ATF_TP_ADD_TC(tp, path_ioctl); ATF_TP_ADD_TC(tp, path_lock); + ATF_TP_ADD_TC(tp, path_pipe_fstatat); ATF_TP_ADD_TC(tp, path_rights); ATF_TP_ADD_TC(tp, path_unix); - ATF_TP_ADD_TC(tp, path_pipe_fstatat); return (atf_no_error()); }