From nobody Thu Feb 5 15:27:34 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 4f6Lgq2gs9z6QkwJ for ; Thu, 05 Feb 2026 15:27:35 +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 4f6Lgq0kl3z3Xn5 for ; Thu, 05 Feb 2026 15:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305255; 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=wXey5Pevl0k1Ob18bJ1zp5vzrRTfh7Sgw/O726V8OUk=; b=ny6fBJtNirZR536OmBcKzGdVqfWZUm3dDp3xRfapn56RlshOV9gzg4aq3n6Y02+M9Fv1pD wsEl1iN9kJYNOo5qSP+vHc6NY5LaE4n42P2gR2iuIIw1iCTc3a/yd+dOhgQj6iTKlBiobw 46FpL1n7amEQ2lblsgGKmGMSXGzWqlRbZJsFJ+Fwtydx47U9iEDhjcMVpK5MdIncMOxJkY 4iBAjtKzZuavDkiFeH6YkcKqsYuWaB821RPqwgiHll+b9u+919LB4fO51Xi4PIXcviaAsw 5+i9o+aTDJGO08/5KIPaHkyfedET9HR41QXU/rVXgafxPZjGBNzDf1zrTcxv6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770305255; a=rsa-sha256; cv=none; b=jzG+sFaLtFKtytXds5M9bJhT99J5ojzbqT80bTgrF6p1fURf9AkvayhGbRY+n4+H08uVG7 48xnXjHupynYntcXMjsuQPQ8fh3boP22n02vLZ53LNtuKwcgIkY5Xv0cMYZzetfsCCeitr t2Ur96sPjyqw2zmqKCZzw/cqfMg+HOJ9Kniu9yfRHQ222qe5p7vSQSq6pQe8DmqNNqsZBP Y6xQFR4Bzo7hWU2oTM4KavLx7aL8gRHDfjhlAUnMO3I6BOLMVav0ia4/4UjM9zPekwMd2A v69mnQRJj6JLDd2s2D4LAuLquj/TuORLIOXmqKvgs313OAzWQvI351WJC6Yk4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305255; 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=wXey5Pevl0k1Ob18bJ1zp5vzrRTfh7Sgw/O726V8OUk=; b=kRBjF86C6quIzRflE1d9MyoBLYunft3NB5fLL/rh8LxDzI3t20UW6esnCL3LTNXyeCXkur LT4uQXfuD2IBMPuuOWKXWktv/FsI5/9fpDcNDhUHajNdLXn0GIP6Mw4lOOTu+QShbpL0od 0WZyV5IA1jEQz2uX4hziQxCYY0bJPmr+y2yVusHXIaNfFLEGT52XSG1gXO/cFtdf/j6Eo7 02Iq/0slbUPB0qVTp2OEw5tlDLql27WoDOxUVp7e6ZyzV6fSZ6zKxcC9dbfRtlen6BQadJ CcrFUcGxuyn4RZuTzuGcA0f+3xuMnvwnCpNmBJcTJ0Y1msuSUnkq6SKLpixubw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lgq02DHzc13 for ; Thu, 05 Feb 2026 15:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:27:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 0018cfdb91c3 - stable/14 - libc/tests: Clean up *dir() tests 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0018cfdb91c399342a0facd04dfe72cb689d86ea Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:27:34 +0000 Message-Id: <6984b6e6.3fd13.89bce56@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0018cfdb91c399342a0facd04dfe72cb689d86ea commit 0018cfdb91c399342a0facd04dfe72cb689d86ea Author: Dag-Erling Smørgrav AuthorDate: 2026-02-03 14:39:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:50:01 +0000 libc/tests: Clean up *dir() tests Mainly, avoid reusing the name of one of the functions we should be testing (but aren't) for local variables. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55054 (cherry picked from commit d70b9eb74fc4aa430bd2ff4bca37e6a9b6c8004f) --- lib/libc/tests/gen/dir2_test.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/lib/libc/tests/gen/dir2_test.c b/lib/libc/tests/gen/dir2_test.c index 4ec5a1759d06..dac8ccbe472a 100644 --- a/lib/libc/tests/gen/dir2_test.c +++ b/lib/libc/tests/gen/dir2_test.c @@ -41,7 +41,6 @@ ATF_TC(telldir_after_seekdir); ATF_TC_HEAD(telldir_after_seekdir, tc) { - atf_tc_set_md_var(tc, "descr", "Calling telldir(3) after seekdir(3) " "should return the argument passed to seekdir."); } @@ -50,7 +49,7 @@ ATF_TC_BODY(telldir_after_seekdir, tc) const int NUMFILES = 1000; char template[] = "dXXXXXX"; char *tmpdir; - int i, dirfd; + int i, dd; DIR *dirp; struct dirent *de; long beginning, middle, end, td; @@ -58,8 +57,8 @@ ATF_TC_BODY(telldir_after_seekdir, tc) /* Create a temporary directory */ tmpdir = mkdtemp(template); ATF_REQUIRE_MSG(tmpdir != NULL, "mkdtemp failed"); - dirfd = open(tmpdir, O_RDONLY | O_DIRECTORY); - ATF_REQUIRE(dirfd > 0); + dd = open(tmpdir, O_RDONLY | O_DIRECTORY); + ATF_REQUIRE(dd > 0); /* * Fill it with files. Must be > 128 to ensure that the directory @@ -70,14 +69,14 @@ ATF_TC_BODY(telldir_after_seekdir, tc) char filename[16]; snprintf(filename, sizeof(filename), "%d", i); - fd = openat(dirfd, filename, O_WRONLY | O_CREAT, 0600); + fd = openat(dd, filename, O_WRONLY | O_CREAT, 0600); ATF_REQUIRE(fd > 0); close(fd); } /* Get some directory bookmarks in various locations */ - dirp = fdopendir(dirfd); - ATF_REQUIRE_MSG(dirfd >= 0, "fdopendir failed"); + dirp = fdopendir(dd); + ATF_REQUIRE_MSG(dd >= 0, "fdopendir failed"); beginning = telldir(dirp); for (i = 0; i < NUMFILES / 2; i = i+1) { de = readdir(dirp); @@ -126,7 +125,7 @@ ATF_TC_BODY(telldir_at_end_of_block, tc) const int NUMFILES = 129; char template[] = "dXXXXXX"; char *tmpdir; - int i, dirfd; + int i, dd; DIR *dirp; struct dirent *de; long td; @@ -135,8 +134,8 @@ ATF_TC_BODY(telldir_at_end_of_block, tc) /* Create a temporary directory */ tmpdir = mkdtemp(template); ATF_REQUIRE_MSG(tmpdir != NULL, "mkdtemp failed"); - dirfd = open(tmpdir, O_RDONLY | O_DIRECTORY); - ATF_REQUIRE(dirfd > 0); + dd = open(tmpdir, O_RDONLY | O_DIRECTORY); + ATF_REQUIRE(dd > 0); /* * Fill it with files. Must be > 128 to ensure that the directory @@ -147,14 +146,14 @@ ATF_TC_BODY(telldir_at_end_of_block, tc) char filename[16]; snprintf(filename, sizeof(filename), "%d", i); - fd = openat(dirfd, filename, O_WRONLY | O_CREAT, 0600); + fd = openat(dd, filename, O_WRONLY | O_CREAT, 0600); ATF_REQUIRE(fd > 0); close(fd); } /* Read all entries within the first page */ - dirp = fdopendir(dirfd); - ATF_REQUIRE_MSG(dirfd >= 0, "fdopendir failed"); + dirp = fdopendir(dd); + ATF_REQUIRE_MSG(dd >= 0, "fdopendir failed"); for (i = 0; i < NUMFILES - 1; i = i + 1) ATF_REQUIRE_MSG(readdir(dirp) != NULL, "readdir failed"); @@ -178,9 +177,8 @@ ATF_TC_BODY(telldir_at_end_of_block, tc) ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, telldir_after_seekdir); ATF_TP_ADD_TC(tp, telldir_at_end_of_block); - return atf_no_error(); + return (atf_no_error()); }