From nobody Sun Nov 01 01:52:50 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 4jHHsZ6GSnz6vZyx for ; Sun, 01 Nov 2026 01:52:50 +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 4jHHsZ5DLPz4MMD for ; Sun, 01 Nov 2026 01:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793497970; 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=2p7TmNTnsR5R4PoHB0PsaTiD8vRKeL9kjsjzQuctcX8=; b=Ckea1bo0437PvPRn7k34149jAB4axO2jjYxqZY1R9w6Zh7JX1ugIrZ15lA9Z6Ld6xz/ud4 ElPuafRQwoxECDMywMgDhuzqdndvHN6FxW0v3gwR+FPaM/o2s1RF7peQpMcfA0nBBPu2Os CypkS2JAcmE1R0+4p9EgCj1J3EM6aXUTNov7drLmNclSYnqSLPVkxYcZ3lylY1Xe622Fwd 7poi6mvMoU2UQDcs/n0d6NP5lEU9le64VvQTxCiyQ5XGAvEam5TdSPbHSTQqXCd9pske+p 8RR/X1ElJTIJY4aK6geatGuhnfPRFYUcR14FeB6gNt3lLV08+QINl3xTo96fYw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793497970; b=j9J9ylt+2tWBBFLUpil6iVvqj7QDiNqH68X8PGkgz0VIeXhqp4V/V054lFj9jN3qlscx3W 0q8UitUIwg+juUfiV+Ty3VBLPZ4Uest2Zpza3uXmzIaCsejsRmEheGExVoO6ulTq6G74js bW5+0UsXSLjq5DMUdUeWTYwuTFiFOKzu3ACUSBLXU8ruOP8EJFGjXnNK91EfsKF04+KnX4 lzRFp5VGtRolBo1q3hZ2KhmbhDS93+D2ggyXTrHveGIz6QvZ0xjonAB0e6aRGMgid2wG1F POUK8X1TyQwtTSoRVP1pRRNY0kQM/BiULQLUlhlWt4riUgdVeeicpuaVoOFM9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793497970; 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=2p7TmNTnsR5R4PoHB0PsaTiD8vRKeL9kjsjzQuctcX8=; b=CtHIeSyApDuiN9fOmOsO6MGjZrpNYeQ5q6JWI8JBqkloQFMug6OXs5I6hyZaj9lsQHXb6k 7TLoCdaMc6wLLBts0uuccXoTaPmk3N5KRMhUXQsxhLKNEEFjO58ic/rk5IQyxc4DMRXcqh kOv5X0xtaNbE53G1sVLncPSMT249jbwDdU7HhH40R4UR/zfC2ELCjdrtRBf3YE73lRqh2D yh+PQJfqQGKnqurQCSAQVQFXqJLO3G2f2ed/hAnDPue7vpt7uaZS0kcDofY1C2wbJSmLy0 us4RD/jeDjMelE/WWekscYk0Iaeq3fUZ0BABXhF0yCF4nIT2yehfrCz1Zz59+g== 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 4jHHsZ4vLbzf2d for ; Sun, 01 Nov 2026 01:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27fa2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Nov 2026 01:52:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 5ab617767196 - stable/15 - sbuf(3): clean up tests 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 5ab617767196d2169d6dfbda48d9c3c73cd25240 Auto-Submitted: auto-generated Date: Sun, 01 Nov 2026 01:52:50 +0000 Message-Id: <6ae69b72.27fa2.72ee502d@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=5ab617767196d2169d6dfbda48d9c3c73cd25240 commit 5ab617767196d2169d6dfbda48d9c3c73cd25240 Author: Enji Cooper AuthorDate: 2026-10-18 18:24:20 +0000 Commit: Enji Cooper CommitDate: 2026-11-01 01:52:02 +0000 sbuf(3): clean up tests - Update the copyright dates and add "Joao Bonifacio" to the top of `sbuf_core_test.c`. - Use `SPDX-Identifier` instead of longform copyright tort. - Remove `sbuf_test_common.h`: the header was originally added to help with the 10.x/11.x split, but is no longer needed given that those releases have been EOLed for multiple years now. MFC after: 1 week (cherry picked from commit 3593be37a49e3f5268259bcc2af58cf730b08335) --- lib/libsbuf/tests/sbuf_core_test.c | 41 ++++-------------------------------- lib/libsbuf/tests/sbuf_stdio_test.c | 25 ++-------------------- lib/libsbuf/tests/sbuf_string_test.c | 25 ++-------------------- lib/libsbuf/tests/sbuf_test_common.h | 37 -------------------------------- 4 files changed, 8 insertions(+), 120 deletions(-) diff --git a/lib/libsbuf/tests/sbuf_core_test.c b/lib/libsbuf/tests/sbuf_core_test.c index 4d30700b76a9..7449f562310d 100644 --- a/lib/libsbuf/tests/sbuf_core_test.c +++ b/lib/libsbuf/tests/sbuf_core_test.c @@ -1,26 +1,8 @@ /*- - * Copyright (c) 2017 Enji Cooper + * Copyright (c) 2017-2026 Enji Cooper + * Copyright (c) 2026 Joao Bonifacio * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause */ #include @@ -34,14 +16,11 @@ #include #include -#include "sbuf_test_common.h" - static char test_string[] = "this is a test string"; #define TEST_STRING_CHOP_COUNT 5 _Static_assert(nitems(test_string) > TEST_STRING_CHOP_COUNT, "test_string is too short"); -#ifdef HAVE_SBUF_CLEAR_FLAGS ATF_TC_WITHOUT_HEAD(sbuf_clear_flags_test); ATF_TC_BODY(sbuf_clear_flags_test, tc) { @@ -104,7 +83,6 @@ ATF_TC_BODY(sbuf_clear_test, tc) sbuf_delete(sb); } -#endif ATF_TC_WITHOUT_HEAD(sbuf_done_and_sbuf_finish_test); ATF_TC_BODY(sbuf_done_and_sbuf_finish_test, tc) @@ -174,11 +152,9 @@ ATF_TC_BODY(sbuf_len_test, tc) "sbuf_cat failed"); } -#ifdef HAVE_SBUF_SET_FLAGS sbuf_set_flags(sb, SBUF_INCLUDENUL); ATF_REQUIRE_MSG((ssize_t)(i * test_string_len + 1) == sbuf_len(sb), "sbuf_len(..) didn't report the NUL char"); -#endif ATF_REQUIRE_MSG(sbuf_finish(sb) == 0, "sbuf_finish failed: %s", strerror(errno)); @@ -269,7 +245,6 @@ ATF_TC_BODY(sbuf_setpos_test, tc) sbuf_delete(sb); } -#ifdef HAVE_SBUF_GET_FLAGS ATF_TC_WITHOUT_HEAD(sbuf_get_flags_test); ATF_TC_BODY(sbuf_get_flags_test, tc) { @@ -288,9 +263,7 @@ ATF_TC_BODY(sbuf_get_flags_test, tc) ATF_CHECK_INTEQ(flags ^ (SBUF_AUTOEXTEND | SBUF_INCLUDENUL), 0); sbuf_delete(sb); } -#endif -#ifdef HAVE_SBUF_SET_FLAGS ATF_TC_WITHOUT_HEAD(sbuf_set_flags_test); ATF_TC_BODY(sbuf_set_flags_test, tc) { @@ -312,24 +285,18 @@ ATF_TC_BODY(sbuf_set_flags_test, tc) sbuf_delete(sb); } -#endif ATF_TP_ADD_TCS(tp) { -#ifdef HAVE_SBUF_CLEAR_FLAGS + ATF_TP_ADD_TC(tp, sbuf_clear_flags_test); ATF_TP_ADD_TC(tp, sbuf_clear_test); -#endif ATF_TP_ADD_TC(tp, sbuf_done_and_sbuf_finish_test); ATF_TP_ADD_TC(tp, sbuf_drain_ret0_test); -#ifdef HAVE_SBUF_GET_FLAGS ATF_TP_ADD_TC(tp, sbuf_get_flags_test); -#endif ATF_TP_ADD_TC(tp, sbuf_len_test); ATF_TP_ADD_TC(tp, sbuf_new_fixedlen); -#ifdef HAVE_SBUF_SET_FLAGS ATF_TP_ADD_TC(tp, sbuf_set_flags_test); -#endif ATF_TP_ADD_TC(tp, sbuf_setpos_test); return (atf_no_error()); diff --git a/lib/libsbuf/tests/sbuf_stdio_test.c b/lib/libsbuf/tests/sbuf_stdio_test.c index 8d8e01a962b9..845b4fbd08bc 100644 --- a/lib/libsbuf/tests/sbuf_stdio_test.c +++ b/lib/libsbuf/tests/sbuf_stdio_test.c @@ -1,26 +1,7 @@ /*- - * Copyright (c) 2017 Enji Cooper + * Copyright (c) 2017-2026 Enji Cooper * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause */ #include @@ -34,8 +15,6 @@ #include #include -#include "sbuf_test_common.h" - static char test_string[] = "this is a test string"; #define MESSAGE_FORMAT "message: %s\n" diff --git a/lib/libsbuf/tests/sbuf_string_test.c b/lib/libsbuf/tests/sbuf_string_test.c index fddaaac9886a..9f00e53dc257 100644 --- a/lib/libsbuf/tests/sbuf_string_test.c +++ b/lib/libsbuf/tests/sbuf_string_test.c @@ -1,26 +1,7 @@ /*- - * Copyright (c) 2017 Enji Cooper + * Copyright (c) 2017-2026 Enji Cooper * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause */ #include @@ -33,8 +14,6 @@ #include #include -#include "sbuf_test_common.h" - static char test_string[] = "this is a test string"; static char test_whitespace_string[] = " \f\n\r\t\v "; static int test_buffer[] = { diff --git a/lib/libsbuf/tests/sbuf_test_common.h b/lib/libsbuf/tests/sbuf_test_common.h deleted file mode 100644 index 5c60abe2826e..000000000000 --- a/lib/libsbuf/tests/sbuf_test_common.h +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * Copyright (c) 2017 Enji Cooper - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef __LIBSBUF_TEST_COMMON_H__ -#define __LIBSBUF_TEST_COMMON_H__ - -#include - -#if __FreeBSD_version > 1100064 -#define HAVE_SBUF_GET_FLAGS -#define HAVE_SBUF_CLEAR_FLAGS -#define HAVE_SBUF_SET_FLAGS -#endif - -#endif