From nobody Fri Jun 5 15:17:01 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 4gX4mL6LzVz6g15f for ; Fri, 05 Jun 2026 15:17:06 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gX4mL4LrTz3rMb for ; Fri, 05 Jun 2026 15:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780672626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1rJrm0ZKqRTZrPhb6ZzPu/rha76CyhuB8s4TG3VrIA=; b=pq9JZ+17xtVDqWSCABsjMPSTa+Iuzkx+9lSNfR9eY0/NO9/g28t85srx1Li1Olk95d5gF/ d8eJ4sS23upmwkIgBdT8v3/hzPGEgsbrNdwFMWIjrX2ccNyt7L4vtxTeM4RcT5FGKbASuB Z4K07RHPu1X6z1cRV51FWh8GEoatgVO6ayfZSDRiuBPPHZCMaWoKsxWimrArugNRSJlxlN N0JNtAZuuyp0XtldMw88Zfah4M7jPMjINhOuaRP1mSI4L3U9/OsVY8Bz19Prdb4mT95xun btV0bTFUJ5NnbuEQ8UqE+tielq8TGoTXzbgWxD7EcoVWKhwqGmDdxYnGYOr2vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780672626; a=rsa-sha256; cv=none; b=j//LZyln5GZ7C08f/TVTuWs/NbwpZuD+2jRsCcHBwCIDNCsCngHvSozQB55GmjYxpPVyJx 7ERUcmmLCG/mc0oX+lG5lTWkx3LksaKbZ4NXx7mzcu5wlq5ZE6V6ZkKRIJO5D3IS/aqYuC ay8h2vCBK0t46B2aMbtBgpkk3c/RXU/9zClxMSS4/7mX20XNBhUj0zJzIOlc9IhHxYjpA/ 5fFDdtMhtT539tmG1TAJUmfTc8d2aHW4Z+DE3lRe7eLBfdKQpqEv/EYYn+IEv3CZT/TvG3 wJDNbvMcCWs8OLdhzufUPdEctwa+6w4hRiIMXEhEbmrM/08TpbQdddSLIckHkg== 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=1780672626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1rJrm0ZKqRTZrPhb6ZzPu/rha76CyhuB8s4TG3VrIA=; b=Q8+4sqzY8akQu43TE8htDwQhWq77c7XPQehd3nSUAas6p5sZVM6vMlKf0WmisN95Hs5OD+ UxbvgQlWt+r31nhnyN5dZCArqD7yCdYH69YGHMB0t2kMtJ/X+tQVY1H49ds7HguU4nKV+k rm2ErN3PiMmjQE64gMU9fkyJolGMuX2YvyAFXcNOHbNca0M6VcFyBtXx0J7tENQDxvUbk7 hEvXKUKGUX5A1ege953kSc4ldU98D1IhATTUVeu984lJte1d6Y+qjYS/YvoRAr6KqJGAq6 Vf+zytp4hT8SI//9MUL/IGp571yVvrUMfmob0HniwcnQjKIPp4QxIIW0gdHmXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gX4mL3Xy0zbQF for ; Fri, 05 Jun 2026 15:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40892 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Jun 2026 15:17:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jitendra Bhati From: Alan Somers Subject: git: c606eb37135d - main - fts: address post-merge feedback on fts_children_test.c 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c606eb37135d3e9cfea4d34c147699e0713dd5d2 Auto-Submitted: auto-generated Date: Fri, 05 Jun 2026 15:17:01 +0000 Message-Id: <6a22e86d.40892.6c0eb223@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=c606eb37135d3e9cfea4d34c147699e0713dd5d2 commit c606eb37135d3e9cfea4d34c147699e0713dd5d2 Author: Jitendra Bhati AuthorDate: 2026-06-04 17:04:51 +0000 Commit: Alan Somers CommitDate: 2026-06-05 15:16:20 +0000 fts: address post-merge feedback on fts_children_test.c - Remove fts_check_debug() which is only needed by test cases that use the fts_test() helper; fts_children_test.c does not call fts_test() - Remove fts_lexical_compar where traversal order does not matter for the test result - Drop fts_test.h and copy fts_lexical_compar locally - Pull up NULL argument onto same line as fts_open Fixes: e624417db8a1 ("lib/libc/tests/gen: add fts_children() tests") Sponsored by: Google LLC (GSoC 2026) Reviewed by: des, asomers MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/2260 --- lib/libc/tests/gen/fts_children_test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libc/tests/gen/fts_children_test.c b/lib/libc/tests/gen/fts_children_test.c index 171b1227104c..c5b0383c0d25 100644 --- a/lib/libc/tests/gen/fts_children_test.c +++ b/lib/libc/tests/gen/fts_children_test.c @@ -21,7 +21,11 @@ #include -#include "fts_test.h" +static int +fts_lexical_compar(const FTSENT * const *a, const FTSENT * const *b) +{ + return (strcmp((*a)->fts_name, (*b)->fts_name)); +} /* * fts_children() before fts_read() returns the list of root entries. @@ -164,8 +168,7 @@ ATF_TC_BODY(called_twice, tc) ATF_REQUIRE_EQ(0, close(creat("dir/x", 0644))); ATF_REQUIRE_EQ(0, close(creat("dir/y", 0644))); - ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, - fts_lexical_compar)) != NULL); + ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, NULL)) != NULL); ent = fts_read(fts); ATF_REQUIRE(ent != NULL); @@ -218,8 +221,7 @@ ATF_TC_BODY(nameonly, tc) ATF_REQUIRE_EQ(0, close(creat("dir/f1", 0644))); ATF_REQUIRE_EQ(0, close(creat("dir/f2", 0644))); - ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, - fts_lexical_compar)) != NULL); + ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, NULL)) != NULL); ent = fts_read(fts); ATF_REQUIRE(ent != NULL); @@ -266,8 +268,7 @@ ATF_TC_BODY(nondirectory, tc) ATF_REQUIRE_EQ(0, mkdir("dir", 0755)); ATF_REQUIRE_EQ(0, close(creat("dir/file", 0644))); - ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, - fts_lexical_compar)) != NULL); + ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, NULL)) != NULL); ent = fts_read(fts); /* FTS_D dir */ ATF_REQUIRE(ent != NULL); @@ -310,7 +311,6 @@ ATF_TC_BODY(invalid_options, tc) ATF_TP_ADD_TCS(tp) { - fts_check_debug(); ATF_TP_ADD_TC(tp, before_read); ATF_TP_ADD_TC(tp, empty_dir); ATF_TP_ADD_TC(tp, nonempty_dir);