From nobody Fri Jun 26 16:59:56 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 4gn23J4XkMz6jn98 for ; Fri, 26 Jun 2026 16:59:56 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn23J1d6Nz4DhC for ; Fri, 26 Jun 2026 16:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bfDQY8kgI0yHSifSMg2sP6LrdeF85oRQyFH7Smb0a5Y=; b=inGOQHJF1/iIJdRv4KvYZvXggp/y0dvsiJD50msQj6GASG4hbXu/HtCopHl9l72npgBw/9 WgitDnywLO3EFXQymMSos1LksAuEFwbOkEjRk5dEeobBNOYY13sJb5KDYh0UG4ryUoIrJH 9KN45FZl6hBM8z5wveol69p8kJ1HCTPvoZZhHna5WEWdGR9vzLGXxxk2dON0f8WAZmEfc2 E7CsWRtMR489W6rnKbTlDD2g07yp47nOmnTqDai3XIty6XaqnwBtACeVDD0qJvFQLyOc/D hwv/S70F2wkmT1rDJbb1ipMNGP1eeP24eQXFQwO43e09Q69ihhcjgSy0HvUxPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493196; a=rsa-sha256; cv=none; b=WBzkHNJktS+hsE284H5nmw85ixaiu23pQjAodcIBFLaTmaGZ7pc7j1KcjbVP0lov71ntOL 6wOH3cTB/tSVj67ByaRnl+hr8gjyR7LI/t+Wy3CiQJ6APX03DN0uYNjw0ZAgL6H3GupO/c y1S5MSbH3/M5rqPLdGdCfJtuVvDNahwtIrzZRPb3wM2rkJHHtYDCWy8V2SvCbAKZlpkurk utyV1buJfKifz1oud+Q3MBGJqJHYQ8XYqnaCu09gJ1TkYFJGsfoaAvst1lJNuOe2cAepRC /0wPCq4q4fvx4XXxMms+jZ6cHjBMuCoyoZlTYLYX5HadzmEVX65+S06RuI3bIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bfDQY8kgI0yHSifSMg2sP6LrdeF85oRQyFH7Smb0a5Y=; b=NXZoZTYwkJHKyLDdk/33rWO0oHtPMf85+syOMjEiQuLeujhrRwbQIQMs8M6p6PsZaY5JD7 9Zsz+T1pVQB6hQ5y3QJSgIYiTI1YiSRe47petfw0Pd4apsq7ugZGTe8tY+OV8Z3Y7zTAvT ChGFoyEwHt7LSSj5fD+B8ntDhuE0e3yLGx9hydqyqlBlAM3novbrazqnZLPEyQluBKvr5U 917dg8gcp/K8xHbLQ7xp2y0oonFo4312w6fhi9MaE/ezj/Fb7FW347hPOaUhpwmFpC6FuN ABJzuhD+xssZRErqJ1rZOiW/Cn6VZtHDhYQtVok0hDgW5J1buCAg4Ik1miJ9cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn23J0D1zzmP0 for ; Fri, 26 Jun 2026 16:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36783 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Siva Mahadevan Subject: git: d87110b036ed - stable/14 - lib/msun/tests: Add REQUIRE_ variants of test-utils macros 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 List-Id: 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d87110b036ed45c750c547750e427904d742d5cb Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:56 +0000 Message-Id: <6a3eb00c.36783.1eddc13a@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=d87110b036ed45c750c547750e427904d742d5cb commit d87110b036ed45c750c547750e427904d742d5cb Author: Siva Mahadevan AuthorDate: 2025-10-08 20:38:47 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 16:10:09 +0000 lib/msun/tests: Add REQUIRE_ variants of test-utils macros Signed-off-by: Siva Mahadevan MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1871 (cherry picked from commit a9b1650f90f4dbc62baa52b395082b1714b6cbf3) --- lib/msun/tests/test-utils.h | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/lib/msun/tests/test-utils.h b/lib/msun/tests/test-utils.h index 0a926551639c..984833605fe8 100644 --- a/lib/msun/tests/test-utils.h +++ b/lib/msun/tests/test-utils.h @@ -144,21 +144,20 @@ fpequal_tol(long double x, long double y, long double tol, return (ret); } -#define CHECK_FPEQUAL(x, y) CHECK_FPEQUAL_CS(x, y, true) - -#define CHECK_FPEQUAL_CS(x, y, checksign) do { \ +#define _fpequal_cs(atf_variant, x, y, checksign) do { \ long double _x = x; \ long double _y = y; \ - ATF_CHECK_MSG(fpequal_cs(_x, _y, checksign), \ + ATF_##atf_variant##_MSG(fpequal_cs(_x, _y, checksign), \ "%s (%.25Lg) ~= %s (%.25Lg)", #x, _x, #y, _y); \ } while (0) -#define CHECK_FPEQUAL_TOL(x, y, tol, flags) do { \ +#define _fpequal_tol(atf_variant, x, y, tol, flags) do { \ long double _x = x; \ long double _y = y; \ bool eq = fpequal_tol(_x, _y, tol, flags); \ long double _diff = eq ? 0.0L : fabsl(_x - _y); \ - ATF_CHECK_MSG(eq, "%s (%.25Lg) ~= %s (%.25Lg), diff=%Lg, maxdiff=%Lg,", \ + ATF_##atf_variant##_MSG(eq, \ + "%s (%.25Lg) ~= %s (%.25Lg), diff=%Lg, maxdiff=%Lg,", \ #x, _x, #y, _y, _diff, fabsl(_y * tol)); \ } while (0) @@ -170,32 +169,48 @@ cfpequal(long double complex d1, long double complex d2) fpequal_cs(cimagl(d1), cimagl(d2), true)); } -#define CHECK_CFPEQUAL_CS(x, y, checksign) do { \ +#define _cfpequal_cs(atf_variant, x, y, checksign) do { \ long double _x = x; \ long double _y = y; \ bool equal_cs = \ fpequal_cs(creal(_x), creal(_y), (checksign & CS_REAL) != 0) && \ fpequal_cs(cimag(_x), cimag(_y), (checksign & CS_IMAG) != 0); \ - ATF_CHECK_MSG(equal_cs, "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ + ATF_##atf_variant##_MSG(equal_cs, \ + "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ #x, creall(_x), cimagl(_x), #y, creall(_y), cimagl(_y)); \ } while (0) -#define CHECK_CFPEQUAL_TOL(x, y, tol, flags) do { \ +#define _cfpequal_tol(atf_variant, x, y, tol, flags) do { \ long double _x = x; \ long double _y = y; \ bool equal_tol = (fpequal_tol(creal(_x), creal(_y), tol, flags) && \ fpequal_tol(cimag(_x), cimag(_y), tol, flags)); \ - ATF_CHECK_MSG(equal_tol, "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ + ATF_##atf_variant##_MSG(equal_tol, \ + "%s (%Lg + %Lg I) ~= %s (%Lg + %Lg I)", \ #x, creall(_x), cimagl(_x), #y, creall(_y), cimagl(_y)); \ } while (0) -#define CHECK_FP_EXCEPTIONS(excepts, exceptmask) \ - ATF_CHECK_EQ_MSG((excepts), fetestexcept(exceptmask), \ - "unexpected exception flags: got %#x not %#x", \ +#define _fp_exceptions(atf_variant, excepts, exceptmask) \ + ATF_##atf_variant##_EQ_MSG((excepts), fetestexcept(exceptmask), \ + "unexpected exception flags: got %#x not %#x", \ fetestexcept(exceptmask), (excepts)) -#define CHECK_FP_EXCEPTIONS_MSG(excepts, exceptmask, fmt, ...) \ - ATF_CHECK_EQ_MSG((excepts), fetestexcept(exceptmask), \ +#define _fp_exceptions_msg(atf_variant, excepts, exceptmask, fmt, ...) \ + ATF_##atf_variant##_EQ_MSG((excepts), fetestexcept(exceptmask), \ "unexpected exception flags: got %#x not %#x " fmt, \ fetestexcept(exceptmask), (excepts), __VA_ARGS__) +#define CHECK_FP_EXCEPTIONS(excepts, exceptmask) _fp_exceptions(CHECK, excepts, exceptmask) +#define CHECK_FP_EXCEPTIONS_MSG(excepts, exceptmask, fmt, ...) _fp_exceptions_msg(CHECK, excepts, exceptmask, fmt, __VA_ARGS__) +#define CHECK_CFPEQUAL_TOL(x, y, tol, flags) _cfpequal_tol(CHECK, x, y, tol, flags) +#define CHECK_CFPEQUAL_CS(x, y, checksign) _cfpequal_cs(CHECK, x, y, checksign) +#define CHECK_FPEQUAL(x, y) _fpequal_cs(CHECK, x, y, true) +#define CHECK_FPEQUAL_TOL(x, y, tol, flags) _fpequal_tol(CHECK, x, y, tol, flags) + +#define REQUIRE_FP_EXCEPTIONS(excepts, exceptmask) _fp_exceptions(REQUIRE, excepts, exceptmask) +#define REQUIRE_FP_EXCEPTIONS_MSG(excepts, exceptmask, fmt, ...) _fp_exceptions_msg(REQUIRE, excepts, exceptmask, fmt, __VA_ARGS__) +#define REQUIRE_CFPEQUAL_TOL(x, y, tol, flags) _cfpequal_tol(REQUIRE, x, y, tol, flags) +#define REQUIRE_CFPEQUAL_CS(x, y, checksign) _cfpequal_cs(REQUIRE, x, y, checksign) +#define REQUIRE_FPEQUAL(x, y) _fpequal_cs(REQUIRE, x, y, true) +#define REQUIRE_FPEQUAL_TOL(x, y, tol, flags) _fpequal_tol(REQUIRE, x, y, tol, flags) + #endif /* _TEST_UTILS_H_ */