From nobody Thu Oct 2 16:42:56 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 4ccyJx0LPyz69Wdk; Thu, 02 Oct 2025 16:42:57 +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 4ccyJw6d16z3k92; Thu, 02 Oct 2025 16:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759423376; 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=lqAPFVLYZAZhUiu6xkHxPzKrZVBqQch9YmMyqC49H24=; b=calHdT19Lo8ByOhU/r5x6S8SjfdfGC2H1PKv2bOswrCPvNIYiXGtFmsXuzfrVqy1+ra2NF HIoIW5nfcKTixXRRYGXe+xaz1ETSBcAxT3YsnYI7mNjohZoMUnSmOTcUn1gRXBQAMHh3yB JffiVIlxsZzJzJuIZRxmJ/0pwKhy28KVhg/xRZsAycXAQFX2sX8swpXblpa9mP3fhrew38 gPRhmsEZMG0DrPVsiSIncLi/UL8bNdEedWtkujuwvJGU2JkihaLA+Wy9rq9vE6qMXIiSJI 9A8JONVmFCvmqTN2OoVh2oPSrTvraDxRGmE5AMy/MAuvSmHnKul5TByRjaj42A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759423376; 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=lqAPFVLYZAZhUiu6xkHxPzKrZVBqQch9YmMyqC49H24=; b=BxlGne6fStJtMq4SecuYDBUOP+wrSEMjYpk9LS5eZhzhVAFindM8Jmuj3OK7JcqjARbQ8h bSJBGK+9jjok0EsMnUjexcoye3nHRHbBe31MKDQ0NrixN4qe2imoRdi3sbkPpJpp5yrP44 IbWJsn0zv7I7t8UYVwBSKvXHKqQe8atJN6nXxOVCw6UOb7SCA90i5TE1g/dqwVNrWPvIRy +wknXwHLmImDygU+NuH2Q8tFYAy5vbsX3hwxwMoxzPy+UikcKxgMn1LoAKqgdqJONIhpx+ 0NybKzWmyjclqvbnSMN1TZBy11Klo1zxALjpwBNNQovoNQlg/d3tHtQe4xB5tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759423376; a=rsa-sha256; cv=none; b=fYB52mhOIeEZP0IoKWgeQAtC2HMH3a0bB+8f8yMTzeWG2QNV37TRu2gQBTwZgqJh0/i8bf agIiyi6FOdeUJ3BjRZ/URDIuuDBZv5HEFSLw7OGMlyZeuqt86sRJOUQM7GxSlZPW14yIaM 17727vJ1x+syCHEdPXLRc27sw7yQ3H2FgaKpb1Dgxezpkr/oT+xkGnbfTDI23nY9rCITbU ZCRa2fGg+bi4Ea8N7AUuKsXyG10HEuBGg25hWIZ2zOZlPJgkBlEVt6E64W2A5bOUElxZXc 1EB0A4O2ILknnbYiGkn+EQkOfzwXa8bBQgs7XY97jYue4PEJqb6mxd774KQlmw== 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 4ccyJw6CSVz1xR; Thu, 02 Oct 2025 16:42:56 +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 592Gguaj006291; Thu, 2 Oct 2025 16:42:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 592GguT1006288; Thu, 2 Oct 2025 16:42:56 GMT (envelope-from git) Date: Thu, 2 Oct 2025 16:42:56 GMT Message-Id: <202510021642.592GguT1006288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 54b24b9da8be - main - bitstring_test: fix bit_nclear/bit_nset tests for last iteration 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: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54b24b9da8be70192b7baaeae8fc26fda6581222 Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=54b24b9da8be70192b7baaeae8fc26fda6581222 commit 54b24b9da8be70192b7baaeae8fc26fda6581222 Author: Ryan Libby AuthorDate: 2025-10-02 16:40:16 +0000 Commit: Ryan Libby CommitDate: 2025-10-02 16:40:16 +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 --- 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); }