From nobody Mon Jun 2 09:33:16 2025 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 4b9pYS45Pqz5xnHW; Mon, 02 Jun 2025 09:33:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9pYS1Yx1z46G2; Mon, 02 Jun 2025 09:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748856796; 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=lc7hrGnF/GhhV5NWDowAoGDtSI50aMAGD9qM55Rl1o0=; b=olk0cEi69qIB1R7iOKG67csaE5on6EpfOrhgget79pK/n8SeYUGZo6e3nciqlOFQKP/r71 damjfray8kt3viR5DbymozQjKTBWDcW6tM2GQ8xGQAyiBl5eJ2EjgFR15X+bqj4zKfMeh0 4ULcA6OVgYgRBC9lrZqU+Jzp5DGg5c2ZqN+fLTmBlhhW7hzpYpl9/hrZWTLja3iqu2m8fz vm2XSrh4jPS6ZU18qTCnRr5XrmIoiyjfIiu/Hp73ksMCbO/Oiw970uPuo2Pv/9HcJ+vmW/ A2nZKPbIXM+m4h+KVVVkactlKor2m/qQyR2cnMy8ntDONe4TFrJgzWp45RQG4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748856796; 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=lc7hrGnF/GhhV5NWDowAoGDtSI50aMAGD9qM55Rl1o0=; b=bJCaK5SElMkVJSaVIgh9K0zyD1gr9VaC7giFHuF5ek98Sgv7skJ0yXGHkk2rWDer68HA2K jzI6EidNf1jehMYAY15J8rmOvSPf0MO8vIMuT3vDzdNteCS3bYxW7PmOZZN9nWwdcc8wdI bU5LC/AiAboQtfcnTSbiJccnidbw14+ocGk63TUQirZvsxRIg5KAoHWm5P2RWkiwkMDWgD 6FESuiod9EqU5QT8ua/OekhPNE/RIBOolXTi/Kkmfi8QqXJSOrzAUn9OIxrGwaemqocGQD uY/BPVfo+wNoCpdy1IeWEqVWXXCvjkXXyv9W/zGO4sYC1PDS7F4zhhdeRDEYRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748856796; a=rsa-sha256; cv=none; b=GFN2jgOGg4hmoIU8KFbctRmkCra09PFg1A19/G+PiN3N5qQJiq1dUZ5YZWD4D78Uw1dYMf s/iwfwsoLvv3FBAJHS6LMUbjPDleW7TfkdxGtOvDkcezN0+jImOsR19grxxV5yBS2YBHMN x+9PRfJUEP6tovyMIwJZOpnRGkulHtP8znJTN0TePtLvwGFVrMhqyHAnNkYQ41FdX0Cog9 hH0vfwqAVieEOU9JqI/tK0h9Mb7BDLYaucwh/AqkeLipUVdIY3znSqNrwIfUCBKpgxA9H1 aHuQQCzSTo2AKmbBz1Ft7G/aukkY0STmrtD4Y/eSuqYiuikSuYkBa0He5hG3ig== 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 4b9pYS17mZz13lX; Mon, 02 Jun 2025 09:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5529XGsB083143; Mon, 2 Jun 2025 09:33:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5529XGe2083140; Mon, 2 Jun 2025 09:33:16 GMT (envelope-from git) Date: Mon, 2 Jun 2025 09:33:16 GMT Message-Id: <202506020933.5529XGe2083140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 4d7c31bca252 - main - glob2_test: Add tests for error callback functions and blocks 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d7c31bca252fbbd0808875cf0ad87fc0d91278f Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=4d7c31bca252fbbd0808875cf0ad87fc0d91278f commit 4d7c31bca252fbbd0808875cf0ad87fc0d91278f Author: Bojan Novković AuthorDate: 2025-05-23 13:26:34 +0000 Commit: Bojan Novković CommitDate: 2025-06-02 09:32:55 +0000 glob2_test: Add tests for error callback functions and blocks This change adds tests that check basic callback functionality for blocks and function pointers. The tests also make sure that GLOB_ERR overrides the callback's return value. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50486 --- lib/libc/tests/gen/Makefile | 5 ++- lib/libc/tests/gen/glob2_test.c | 60 ++++++++++++++++++++++++++++++++++- lib/libc/tests/gen/glob_blocks_test.c | 49 ++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 2 deletions(-) diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile index 2aff14f078bc..006512d30dc4 100644 --- a/lib/libc/tests/gen/Makefile +++ b/lib/libc/tests/gen/Makefile @@ -15,6 +15,9 @@ ATF_TESTS_C+= ftw_test ATF_TESTS_C+= getentropy_test ATF_TESTS_C+= getmntinfo_test ATF_TESTS_C+= glob2_test +.if ${COMPILER_FEATURES:Mblocks} +ATF_TESTS_C+= glob_blocks_test +.endif ATF_TESTS_C+= makecontext_test ATF_TESTS_C+= popen_test ATF_TESTS_C+= posix_spawn_test @@ -97,7 +100,7 @@ TESTS_SUBDIRS= execve TESTS_SUBDIRS+= posix_spawn # Tests that require blocks support -.for t in fts_blocks_test +.for t in fts_blocks_test glob_blocks_test CFLAGS.${t}.c+= -fblocks LIBADD.${t}+= BlocksRuntime .endfor diff --git a/lib/libc/tests/gen/glob2_test.c b/lib/libc/tests/gen/glob2_test.c index 8f69c36fece7..45d17b063593 100644 --- a/lib/libc/tests/gen/glob2_test.c +++ b/lib/libc/tests/gen/glob2_test.c @@ -25,6 +25,8 @@ */ #include +#include + #include #include #include @@ -36,6 +38,8 @@ #include +static int glob_callback_invoked; + /* * Derived from Russ Cox' pathological case test program used for the * https://research.swtch.com/glob article. @@ -102,10 +106,64 @@ ATF_TC_BODY(glob_pathological_test, tc) } } +ATF_TC(glob_period); +ATF_TC_HEAD(glob_period, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test behaviour when matching files that start with a period" + "(documented in the glob(3) CAVEATS section)."); +} +ATF_TC_BODY(glob_period, tc) +{ + int i; + glob_t g; + + atf_utils_create_file(".test", ""); + glob(".", 0, NULL, &g); + ATF_REQUIRE_MSG(g.gl_matchc == 1, + "glob(3) shouldn't match files starting with a period when using '.'"); + for (i = 0; i < g.gl_matchc; i++) + printf("%s\n", g.gl_pathv[i]); + glob(".*", 0, NULL, &g); + ATF_REQUIRE_MSG(g.gl_matchc == 3 && strcmp(g.gl_pathv[2], ".test") == 0, + "glob(3) should match files starting with a period when using '.*'"); +} + +static int +errfunc(const char *path, int err) +{ + ATF_REQUIRE_STREQ(path, "test/"); + ATF_REQUIRE(err == EACCES); + glob_callback_invoked = 1; + /* Suppress EACCES errors. */ + return (0); +} + +ATF_TC_WITHOUT_HEAD(glob_callback_test); +ATF_TC_BODY(glob_callback_test, tc) +{ + int rv; + glob_t g; + + glob_callback_invoked = 0; + ATF_REQUIRE_EQ(0, mkdir("test", 0007)); + rv = glob("test/*", 0, errfunc, &g); + ATF_REQUIRE_MSG(glob_callback_invoked == 1, + "glob(3) failed to invoke callback function"); + ATF_REQUIRE_MSG(rv == GLOB_NOMATCH, + "error callback function failed to suppress EACCES"); + + /* GLOB_ERR should ignore the suppressed error. */ + rv = glob("test/*", GLOB_ERR, errfunc, &g); + ATF_REQUIRE_MSG(rv == GLOB_ABORTED, + "GLOB_ERR didn't override error callback function"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, glob_pathological_test); - + ATF_TP_ADD_TC(tp, glob_period); + ATF_TP_ADD_TC(tp, glob_callback_test); return (atf_no_error()); } diff --git a/lib/libc/tests/gen/glob_blocks_test.c b/lib/libc/tests/gen/glob_blocks_test.c new file mode 100644 index 000000000000..a20aad17ce31 --- /dev/null +++ b/lib/libc/tests/gen/glob_blocks_test.c @@ -0,0 +1,49 @@ +/*- + * Copyright (c) 2025 Klara, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +#include +#include + +#include + +static int glob_callback_invoked; + +ATF_TC_WITHOUT_HEAD(glob_b_callback_test); +ATF_TC_BODY(glob_b_callback_test, tc) +{ + int rv; + glob_t g; + + glob_callback_invoked = 0; + ATF_REQUIRE_EQ(0, mkdir("test", 0007)); + int (^errblk)(const char *, int) = + ^(const char *path, int err) { + ATF_REQUIRE_STREQ(path, "test/"); + ATF_REQUIRE(err == EACCES); + glob_callback_invoked = 1; + /* Suppress EACCES errors. */ + return (0); + }; + + rv = glob_b("test/*", 0, errblk, &g); + ATF_REQUIRE_MSG(glob_callback_invoked == 1, + "glob(3) failed to invoke callback block"); + ATF_REQUIRE_MSG(rv == GLOB_NOMATCH, + "error callback function failed to suppress EACCES"); + + /* GLOB_ERR should ignore the suppressed error. */ + rv = glob_b("test/*", GLOB_ERR, errblk, &g); + ATF_REQUIRE_MSG(rv == GLOB_ABORTED, + "GLOB_ERR didn't override error callback block"); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, glob_b_callback_test); + return (atf_no_error()); +}