From nobody Sun Oct 18 18:10:47 2026 X-Original-To: dev-commits-src-all@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 4j76DY1nHCz6w99b for ; Sun, 18 Oct 2026 18:10:53 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j76DX70bhz4X3P for ; Sun, 18 Oct 2026 18:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792347053; 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=a0a+NHrxFs2ycUcg5OVskAHwVWyHl2A/OBSF/LJau3E=; b=OSoNNmcWH6+JZ3fsQWFsBhzS/v0mZiSQRnizGWL2C3yn8HNEtzfz6fplulFVbE5vcGARDI BCCV1CnBlbjmugmUpr/qqSbuN/NHEcmLLEsTd7Nz2HiX+3W877YK3unsczv2uUpswjYWWb zg0uaaWlyDosK66mWxZC9GvwyzAip90TQLD3CjM4KONj9sbTx4u4LJl9t3xULiahsi1F62 oJGLWQHlMW5CHPKbkNXcb+Veq+1hWvrhG8xPnHyB7Xbfon6G+XkgNG/o156ZybSY2UsJeG NIlCPbaytlK6pv70jNa0n9Xz2OmyK5E933Dr1A2zCFJsGM4NDdO0ad5v/gpGJw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792347053; b=H5v1oD66LrlnpJk1+rMLJGlKQTx6VWbzmNQpmA6479SGUujU5xA03fNLEHEY24CyM5TeD+ GVBUwIbLgiXh7M0zvsPRi+hx6soZM3sZjqrBSP0ZoUzX9odlRwVShNrn4cBN1tMJJ4e4EY irdKJPKTRpkju0fe4hpu1Xxl4ogHfEto2HQ8raFR2tl5/YRPNO+rz0k/LC+fS2BfCxvStc +UijMXSYv+Rr9krG6kPNqn8ym0zOtLcYIwVf3BtZ+XoulrJz8B5qsJk4SHTWM1UAYiFFfd 234pdwW+92xhAOPblwRfKU8rOrbRGwvOyalu+dOlYi7eXrAM8qHeNq7LwRIMxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792347053; 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=a0a+NHrxFs2ycUcg5OVskAHwVWyHl2A/OBSF/LJau3E=; b=O687cieV5xn3H6mk+RCEgrvFC4Zhu7R+g+f9G9DE5R/7D1boyzFUNsTM5yUcpvn1gIuZwS I5YuleiuAm5SK6SdYlfg13SOKpNubjyAHe6ig+ycXWO1L3Vgaa1T0QDyWYYnCfmIsm48O4 knTqpawKi8bILcArPVfsC3jaUEDv7X8oDmlU0HjEMm6d6KTLuV/fLjIHh0NBOAh1gf758X zJpn8g6OKoNRPs2yyCNAQiRmR+11LcS5xZPi8KYJqVeN336pMH35a82UX2ifMpYIuWOTjB +flJCqkjClX9svhhCImBElj+hTckqdu91A9TAIU0OsBG8QnxcnZEeTjxUxvyWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j76DX5xMpz11Vh for ; Sun, 18 Oct 2026 18:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25480 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 18 Oct 2026 18:10:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 23ab9a9d09f4 - main - Revert "sbuf(3): increase test coverage" List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23ab9a9d09f4b46d0b1334742f466526da3662c1 Auto-Submitted: auto-generated Date: Sun, 18 Oct 2026 18:10:47 +0000 Message-Id: <6ad50ba7.25480.1b37b445@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=23ab9a9d09f4b46d0b1334742f466526da3662c1 commit 23ab9a9d09f4b46d0b1334742f466526da3662c1 Author: Enji Cooper AuthorDate: 2026-10-18 18:09:37 +0000 Commit: Enji Cooper CommitDate: 2026-10-18 18:09:37 +0000 Revert "sbuf(3): increase test coverage" ghpr doesn't seem to do a `git status` prior to allowing someone to push changes (bug pending). Revert the change so the properly tested one can be pushed into the tree. This reverts commit 760efcc775c304d175a360dddf499a7b0d5e3935. --- lib/libsbuf/tests/sbuf_core_test.c | 90 ++++++-------------------------------- 1 file changed, 13 insertions(+), 77 deletions(-) diff --git a/lib/libsbuf/tests/sbuf_core_test.c b/lib/libsbuf/tests/sbuf_core_test.c index b736efb36756..14bbc475043a 100644 --- a/lib/libsbuf/tests/sbuf_core_test.c +++ b/lib/libsbuf/tests/sbuf_core_test.c @@ -125,8 +125,6 @@ ATF_TC_BODY(sbuf_drain_ret0_test, tc) "required to return error when drain func returns 0"); ATF_CHECK_EQ_MSG(EDEADLK, errno, "errno required to be EDEADLK when drain func returns 0"); - - sbuf_delete(sb); } ATF_TC_WITHOUT_HEAD(sbuf_len_test); @@ -244,89 +242,27 @@ ATF_TC_BODY(sbuf_setpos_test, tc) sbuf_delete(sb); } -ATF_TC_WITHOUT_HEAD(sbuf_get_flags_test); -ATF_TC_BODY(sbuf_get_flags_test, tc) -{ - struct sbuf *sb; - int flags; - - sb = sbuf_new(NULL, NULL, 0, - SBUF_AUTOEXTEND | SBUF_INCLUDENUL); - - ATF_REQUIRE_MSG(sb != NULL, - "sbuf_new failed: %s", strerror(errno)); - - flags = sbuf_get_flags(sb); - - ATF_CHECK_INTEQ( - flags & (SBUF_AUTOEXTEND | SBUF_AUTOEXTEND), - SBUF_AUTOEXTEND | SBUF_AUTOEXTEND) - ATF_CHECK_INTEQ(flags ^ (SBUF_AUTOEXTEND | SBUF_INCLUDENUL), 0); - sbuf_delete(sb); -} - -ATF_TC_WITHOUT_HEAD(sbuf_set_flags_test); -ATF_TC_BODY(sbuf_set_flags_test, tc) -{ - struct sbuf *sb; - - sb = sbuf_new_auto(); - - ATF_REQUIRE_MSG(sb != NULL, - "sbuf_new_auto failed: %s", strerror(errno)); - - sbuf_set_flags(sb, SBUF_INCLUDENUL); - - ATF_REQUIRE_MSG(sbuf_cat(sb, test_string) == 0, - "sbuf_cat failed"); - - ATF_REQUIRE_EQ_MSG(0, - sbuf_finish(sb), - "sbuf_finish failed: %s", strerror(errno)); - - ATF_CHECK_EQ( - (ssize_t)(strlen(test_string) + 1), - sbuf_len(sb) - ); - - sbuf_delete(sb); -} - -ATF_TC_WITHOUT_HEAD(sbuf_clear_flags_test); -ATF_TC_BODY(sbuf_clear_flags_test, tc) -{ - struct sbuf *sb; - int flags; - - sb = sbuf_new(NULL, NULL, 0, - SBUF_AUTOEXTEND | SBUF_INCLUDENUL); - - ATF_REQUIRE_MSG(sb != NULL, - "sbuf_new failed: %s", strerror(errno)); - - flags = sbuf_get_flags(sb); - ATF_REQUIRE_INTEQ(SBUF_INCLUDENUL, flags & SBUF_INCLUDENUL); - - sbuf_clear_flags(sb, SBUF_INCLUDENUL); - - flags = sbuf_get_flags(sb); - - ATF_CHECK_INTEQ(0, flags & SBUF_INCLUDENUL); - - sbuf_delete(sb); -} - - ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, sbuf_clear_flags_test); ATF_TP_ADD_TC(tp, sbuf_clear_test); ATF_TP_ADD_TC(tp, sbuf_done_and_sbuf_finish_test); ATF_TP_ADD_TC(tp, sbuf_drain_ret0_test); - ATF_TP_ADD_TC(tp, sbuf_get_flags_test); ATF_TP_ADD_TC(tp, sbuf_len_test); ATF_TP_ADD_TC(tp, sbuf_new_fixedlen); +#if 0 + /* TODO */ +#ifdef HAVE_SBUF_CLEAR_FLAGS + ATF_TP_ADD_TC(tp, sbuf_clear_flags_test); +#endif +#ifdef HAVE_SBUF_GET_FLAGS + ATF_TP_ADD_TC(tp, sbuf_get_flags_test); +#endif + ATF_TP_ADD_TC(tp, sbuf_new_positive_test); + ATF_TP_ADD_TC(tp, sbuf_new_negative_test); +#ifdef HAVE_SBUF_SET_FLAGS ATF_TP_ADD_TC(tp, sbuf_set_flags_test); +#endif +#endif ATF_TP_ADD_TC(tp, sbuf_setpos_test); return (atf_no_error());