From nobody Tue Oct 28 09:49:44 2025 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 4cwlw91FG7z6DbCc; Tue, 28 Oct 2025 09:49:45 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwlw854v1z3D94; Tue, 28 Oct 2025 09:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761644984; 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=uLTjOPIGdIoEP5tRfTYLuCYVJScMzCLeZLgrA7cZggA=; b=vw8dwO6vt1xjuufhMft/Wb0H+GgjD41iufK8WCJY0ri9W7tE+T5oMQD8CNX9rwY6YhbFg0 syRFdaz5L6hVJ15YuiPWMjK5HEl3FdEAo72ehADM9YqNzrCWDxVyzqA51zbsIeKM6SRJjL NIj0gQFRLtQ4kk0bANqJd1w0Dv8dDnjkXSShzDYhXa0FzKtmp1qe0Vy3f/FEdl+ehg7TZk 9Bk7KCCw49+Dq6Tg5xjr1gkIS6xUXNM6uxLBFTIaMxnNEJ3qG/MCgXOevR0U8Wc/00lFAw ZJ/zP7I5sROXragxM9X5D18C9iUFkSJTinkfB4MVF3Sp+tGHXyuPwxLRdTlrSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761644984; 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=uLTjOPIGdIoEP5tRfTYLuCYVJScMzCLeZLgrA7cZggA=; b=MO4/7hLIUFf9vq1fPiXeRB/AEnkrlcMvwJuOMIj/YzmEUz/0QtYNBl3gj0hqtwwaMIb3y+ ib2MEg8RAQ12f7GaUSe+HhvpKXf9o3S/9WtrMtfxlyDh8wSpA7c1eAsNxMSOBSM3ZinHKm bteC72vNNcyTJd2Hpws9QLjxLA3SXc3d1C53uuj4qu+0apDGzCYdz2TKq6ol4r3KpoRAfg MsuVMvPQOmNybaQqHUzDE6OuPiGojFtL0ogN2Lzivb/rQ41bpfhKhN3NCEZ7lil4TC+BKh BPW5+lMVkFkqJnrO1OSwFK3CW/1iVbHMaWeenBEXOFaif+4Mwkadt3gfum9xYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761644984; a=rsa-sha256; cv=none; b=oitK1+y5TYyoCg4MSWOXzIzDYwUNy9GkHY+UsJrd9gFfCBF1ob6wY1f8ewVdtRX2gUl9ho 7qiHWw1lNBBz1d3/w5b4ZZHTUcE9D7U3vIYdIWxGX4HedNipS7HDlm8AhjPV2d8RG39X7q /2hPS9zaddamuSmEVb6URKjX1TT1BYi51bFi6nJEbBiqt/dUpkUPNagj/FlGl9CJr7BW8b av/ObKNNwFnHzoxQej6IBEV9O9wlcjuoBMUdFFpeZN/fz/LPwEbyHFEHFPsaWZ1Xr4thbk obi06gY1J4vlBMcr8OzqTkpSkwnf+nrp9zMy8X6759QQQNoyEhLMEEeWr1ZJaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cwlw84YtBzltc; Tue, 28 Oct 2025 09:49:44 +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 59S9niiW056907; Tue, 28 Oct 2025 09:49:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S9nib7056904; Tue, 28 Oct 2025 09:49:44 GMT (envelope-from git) Date: Tue, 28 Oct 2025 09:49:44 GMT Message-Id: <202510280949.59S9nib7056904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ryan Libby Subject: git: f699d8aa02a6 - stable/15 - bitstring_test: fix bit_nclear/bit_nset tests for last iteration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f699d8aa02a6845417e8a193165fe99f8e4c6f77 Auto-Submitted: auto-generated The branch stable/15 has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=f699d8aa02a6845417e8a193165fe99f8e4c6f77 commit f699d8aa02a6845417e8a193165fe99f8e4c6f77 Author: Ryan Libby AuthorDate: 2025-10-02 16:40:16 +0000 Commit: Ryan Libby CommitDate: 2025-10-28 09:20:35 +0000 bitstring_test: fix bit_nclear/bit_nset tests for last iteration Also convert nearby ATF_REQUIRE_MSG to ATF_REQUIRE_INTEQ_MSG. Reported by: GCC -Wint-in-bool-context Reviewed by: asomers, des Differential Revision: https://reviews.freebsd.org/D45893 (cherry picked from commit 54b24b9da8be70192b7baaeae8fc26fda6581222) --- tests/sys/sys/bitstring_test.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/sys/sys/bitstring_test.c b/tests/sys/sys/bitstring_test.c index a48042a4a063..bf436040c00f 100644 --- a/tests/sys/sys/bitstring_test.c +++ b/tests/sys/sys/bitstring_test.c @@ -559,14 +559,13 @@ BITSTRING_TC_DEFINE(bit_nclear) bit_nclear(bitstr, i, j); bit_ffc(bitstr, nbits, &found_clear_bit); - ATF_REQUIRE_MSG( - found_clear_bit == i, + ATF_REQUIRE_INTEQ_MSG(i, found_clear_bit, "bit_nclear_%d_%d_%d%s: Failed with result %d", nbits, i, j, memloc, found_clear_bit); bit_ffs_at(bitstr, i, nbits, &found_set_bit); - ATF_REQUIRE_MSG( - (j + 1 < nbits) ? found_set_bit == j + 1 : -1, + ATF_REQUIRE_INTEQ_MSG((j + 1 < nbits) ? j + 1 : -1, + found_set_bit, "bit_nset_%d_%d_%d%s: Failed with result %d", nbits, i, j, memloc, found_set_bit); } @@ -586,14 +585,13 @@ BITSTRING_TC_DEFINE(bit_nset) bit_nset(bitstr, i, j); bit_ffs(bitstr, nbits, &found_set_bit); - ATF_REQUIRE_MSG( - found_set_bit == i, + ATF_REQUIRE_INTEQ_MSG(i, found_set_bit, "bit_nset_%d_%d_%d%s: Failed with result %d", nbits, i, j, memloc, found_set_bit); bit_ffc_at(bitstr, i, nbits, &found_clear_bit); - ATF_REQUIRE_MSG( - (j + 1 < nbits) ? found_clear_bit == j + 1 : -1, + ATF_REQUIRE_INTEQ_MSG((j + 1 < nbits) ? j + 1 : -1, + found_clear_bit, "bit_nset_%d_%d_%d%s: Failed with result %d", nbits, i, j, memloc, found_clear_bit); }