[libc] [llvm] [libc] Make fenv and math tests preserve fenv_t state (PR #89658)
Roland McGrath via llvm-commits
llvm-commits at lists.llvm.org
Tue Apr 23 13:21:21 PDT 2024
https://github.com/frobtech updated https://github.com/llvm/llvm-project/pull/89658
>From eb479dc566688fd79cc63168120fc3422815e473 Mon Sep 17 00:00:00 2001
From: Roland McGrath <mcgrathr at google.com>
Date: Sat, 20 Apr 2024 01:00:22 -0700
Subject: [PATCH 1/3] [libc] Make fenv and math tests preserve fenv_t state
This adds a new test fixture class FEnvSafeTest (usable as a base
class for other fixtures) that ensures each test doesn't perturb
the `fenv_t` state that the next test will start with. It also
provides types and methods tests can use to explicitly wrap code
under test either to check that it doesn't perturb the state or
to save and restore the state around particular test code.
All the fenv and math tests are updated to use this so that none
can affect another. Expectations that code under test and/or
tests themselves don't perturb state can be added later.
---
libc/test/UnitTest/CMakeLists.txt | 2 +
libc/test/UnitTest/FEnvSafeTest.cpp | 84 +++++++++++++++
libc/test/UnitTest/FEnvSafeTest.h | 101 ++++++++++++++++++
libc/test/src/fenv/CMakeLists.txt | 16 +++
.../test/src/fenv/enabled_exceptions_test.cpp | 23 ++--
libc/test/src/fenv/exception_flags_test.cpp | 12 ++-
libc/test/src/fenv/exception_status_test.cpp | 43 ++++----
libc/test/src/fenv/excepts.h | 24 +++++
libc/test/src/fenv/feclearexcept_test.cpp | 21 ++--
libc/test/src/fenv/feenableexcept_test.cpp | 7 +-
libc/test/src/fenv/feholdexcept_test.cpp | 7 +-
libc/test/src/fenv/feupdateenv_test.cpp | 5 +-
libc/test/src/fenv/getenv_and_setenv_test.cpp | 14 +--
libc/test/src/fenv/rounding_mode_test.cpp | 9 +-
libc/test/src/math/CeilTest.h | 3 +-
libc/test/src/math/CopySignTest.h | 3 +-
libc/test/src/math/FAbsTest.h | 3 +-
libc/test/src/math/FDimTest.h | 3 +-
libc/test/src/math/FMaxTest.h | 3 +-
libc/test/src/math/FMinTest.h | 3 +-
libc/test/src/math/FModTest.h | 3 +-
libc/test/src/math/FloorTest.h | 3 +-
libc/test/src/math/FmaTest.h | 3 +-
libc/test/src/math/FrexpTest.h | 3 +-
libc/test/src/math/HypotTest.h | 3 +-
libc/test/src/math/ILogbTest.h | 3 +-
libc/test/src/math/LdExpTest.h | 3 +-
libc/test/src/math/LogbTest.h | 3 +-
libc/test/src/math/ModfTest.h | 3 +-
libc/test/src/math/NextAfterTest.h | 3 +-
libc/test/src/math/RIntTest.h | 3 +-
libc/test/src/math/RemQuoTest.h | 3 +-
libc/test/src/math/RoundEvenTest.h | 3 +-
libc/test/src/math/RoundTest.h | 3 +-
libc/test/src/math/RoundToIntegerTest.h | 5 +-
libc/test/src/math/SqrtTest.h | 3 +-
libc/test/src/math/TruncTest.h | 3 +-
.../exhaustive/fmod_generic_impl_test.cpp | 3 +-
libc/test/src/math/smoke/CanonicalizeTest.h | 3 +-
libc/test/src/math/smoke/CeilTest.h | 3 +-
libc/test/src/math/smoke/CopySignTest.h | 3 +-
libc/test/src/math/smoke/FAbsTest.h | 3 +-
libc/test/src/math/smoke/FDimTest.h | 3 +-
libc/test/src/math/smoke/FMaxTest.h | 3 +-
libc/test/src/math/smoke/FMaximumMagNumTest.h | 3 +-
libc/test/src/math/smoke/FMaximumMagTest.h | 3 +-
libc/test/src/math/smoke/FMaximumNumTest.h | 3 +-
libc/test/src/math/smoke/FMaximumTest.h | 3 +-
libc/test/src/math/smoke/FMinTest.h | 3 +-
libc/test/src/math/smoke/FMinimumMagNumTest.h | 3 +-
libc/test/src/math/smoke/FMinimumMagTest.h | 3 +-
libc/test/src/math/smoke/FMinimumNumTest.h | 3 +-
libc/test/src/math/smoke/FMinimumTest.h | 3 +-
libc/test/src/math/smoke/FModTest.h | 3 +-
libc/test/src/math/smoke/FloorTest.h | 3 +-
libc/test/src/math/smoke/FmaTest.h | 3 +-
libc/test/src/math/smoke/FrexpTest.h | 3 +-
libc/test/src/math/smoke/FromfpTest.h | 3 +-
libc/test/src/math/smoke/FromfpxTest.h | 3 +-
libc/test/src/math/smoke/HypotTest.h | 3 +-
libc/test/src/math/smoke/ILogbTest.h | 3 +-
libc/test/src/math/smoke/LdExpTest.h | 3 +-
libc/test/src/math/smoke/LogbTest.h | 3 +-
libc/test/src/math/smoke/ModfTest.h | 3 +-
libc/test/src/math/smoke/NextAfterTest.h | 3 +-
libc/test/src/math/smoke/NextDownTest.h | 3 +-
libc/test/src/math/smoke/NextTowardTest.h | 3 +-
libc/test/src/math/smoke/NextUpTest.h | 3 +-
libc/test/src/math/smoke/RIntTest.h | 3 +-
libc/test/src/math/smoke/RemQuoTest.h | 3 +-
libc/test/src/math/smoke/RoundEvenTest.h | 3 +-
libc/test/src/math/smoke/RoundTest.h | 3 +-
libc/test/src/math/smoke/RoundToIntegerTest.h | 5 +-
libc/test/src/math/smoke/SqrtTest.h | 3 +-
libc/test/src/math/smoke/TruncTest.h | 3 +-
libc/test/src/math/smoke/UfromfpTest.h | 3 +-
libc/test/src/math/smoke/UfromfpxTest.h | 3 +-
libc/test/src/math/smoke/nan_test.cpp | 3 +-
libc/test/src/math/smoke/nanf128_test.cpp | 3 +-
libc/test/src/math/smoke/nanf_test.cpp | 3 +-
libc/test/src/math/smoke/nanl_test.cpp | 3 +-
81 files changed, 443 insertions(+), 130 deletions(-)
create mode 100644 libc/test/UnitTest/FEnvSafeTest.cpp
create mode 100644 libc/test/UnitTest/FEnvSafeTest.h
create mode 100644 libc/test/src/fenv/excepts.h
diff --git a/libc/test/UnitTest/CMakeLists.txt b/libc/test/UnitTest/CMakeLists.txt
index 9113eca388e05b..302af3044ca3d6 100644
--- a/libc/test/UnitTest/CMakeLists.txt
+++ b/libc/test/UnitTest/CMakeLists.txt
@@ -111,8 +111,10 @@ add_header_library(
add_unittest_framework_library(
LibcFPTestHelpers
SRCS
+ FEnvSafeTest.cpp
RoundingModeUtils.cpp
HDRS
+ FEnvSafeTest.h
FPMatcher.h
RoundingModeUtils.h
DEPENDS
diff --git a/libc/test/UnitTest/FEnvSafeTest.cpp b/libc/test/UnitTest/FEnvSafeTest.cpp
new file mode 100644
index 00000000000000..43aebc3f36e7b3
--- /dev/null
+++ b/libc/test/UnitTest/FEnvSafeTest.cpp
@@ -0,0 +1,84 @@
+//===-- FEnvSafeTest.cpp ---------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===---------------------------------------------------------------------===//
+
+#include "FEnvSafeTest.h"
+
+#include "src/__support/FPUtil/FEnvImpl.h"
+#include "src/__support/macros/properties/architectures.h"
+
+namespace LIBC_NAMESPACE::testing {
+
+void FEnvSafeTest::PreserveFEnv::check() {
+ fenv_t after;
+ test.get_fenv(after);
+ test.expect_fenv_eq(before, after);
+}
+
+void FEnvSafeTest::TearDown() {
+ if (!should_be_unchanged) {
+ restore_fenv();
+ }
+}
+
+void FEnvSafeTest::get_fenv(fenv_t &fenv) {
+ ASSERT_EQ(LIBC_NAMESPACE::fputil::get_env(&fenv), 0);
+}
+
+void FEnvSafeTest::set_fenv(const fenv_t &fenv) {
+ ASSERT_EQ(LIBC_NAMESPACE::fputil::set_env(&fenv), 0);
+}
+
+void FEnvSafeTest::expect_fenv_eq(const fenv_t &before_fenv,
+ const fenv_t &after_fenv) {
+#if defined(LIBC_TARGET_ARCH_IS_AARCH64)
+ using LIBC_NAMESPACE::fputil::FEnv::FPState;
+ const FPState &before_state = reinterpret_cast<const FPState &>(before_fenv);
+ const FPState &after_state = reinterpret_cast<const FPState &>(after_fenv);
+
+ EXPECT_EQ(before_state.ControlWord, after_state.ControlWord);
+ EXPECT_EQ(before_state.StatusWord, after_state.StatusWord);
+
+#elif defined(LIBC_TARGET_ARCH_IS_X86) && !defined(__APPLE__)
+ using LIBC_NAMESPACE::fputil::internal::FPState;
+ const FPState &before_state = reinterpret_cast<const FPState &>(before_fenv);
+ const FPState &after_state = reinterpret_cast<const FPState &>(after_fenv);
+
+#if defined(_WIN32)
+ EXPECT_EQ(before_state.control_word, after_state.control_word);
+ EXPECT_EQ(before_state.status_word, after_state.status_word);
+#elif defined(__APPLE__)
+ EXPECT_EQ(before_state.control_word, after_state.control_word);
+ EXPECT_EQ(before_state.status_word, after_state.status_word);
+ EXPECT_EQ(before_state.mxcsr, after_state.mxcsr);
+#else
+ EXPECT_EQ(before_state.x87_status.control_word,
+ after_state.x87_status.control_word);
+ EXPECT_EQ(before_state.x87_status.status_word,
+ after_state.x87_status.status_word);
+ EXPECT_EQ(before_state.mxcsr, after_state.mxcsr);
+#endif
+
+#elif defined(LIBC_TARGET_ARCH_IS_ARM) && defined(__ARM_FP)
+ using LIBC_NAMESPACE::fputil::FEnv;
+ const FEnv &before_state = reinterpret_cast<const FEnv &>(before_fenv);
+ const FEnv &after_state = reinterpret_cast<const FEnv &>(after_fenv);
+
+ EXPECT_EQ(before_state.fpscr, after_state.fpscr);
+
+#elif defined(LIBC_TARGET_ARCH_IS_ANY_RISCV)
+ const uint32_t &before_fcsr = reinterpret_cast<const uint32_t &>(before_fenv);
+ const uint32_t &after_fcsr = reinterpret_cast<const uint32_t &>(after_fenv);
+ EXPECT_EQ(before_fcsr, after_fcsr);
+
+#else
+ // No arch-specific `fenv_t` support, so nothing to compare.
+
+#endif
+}
+
+} // namespace LIBC_NAMESPACE::testing
diff --git a/libc/test/UnitTest/FEnvSafeTest.h b/libc/test/UnitTest/FEnvSafeTest.h
new file mode 100644
index 00000000000000..a7565456c68a62
--- /dev/null
+++ b/libc/test/UnitTest/FEnvSafeTest.h
@@ -0,0 +1,101 @@
+//===-- FEnvSafeTest.h -----------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===---------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TEST_UNITTEST_FPENVSAFE_H
+#define LLVM_LIBC_TEST_UNITTEST_FPENVSAFE_H
+
+#include "hdr/types/fenv_t.h"
+#include "src/__support/CPP/utility.h"
+#include "test/UnitTest/Test.h"
+
+namespace LIBC_NAMESPACE::testing {
+
+// This provides a test fixture (or base class for other test fixtures) that
+// asserts that each test does not leave the FPU state represented by `fenv_t`
+// (aka `FPState`) perturbed from its initial state.
+class FEnvSafeTest : public Test {
+public:
+ void TearDown() override;
+
+protected:
+ // This is an RAII type where `PreserveFEnv preserve{this};` will sample the
+ // `fenv_t` state and restore it when `preserve` goes out of scope.
+ class PreserveFEnv {
+ fenv_t before;
+ FEnvSafeTest &test;
+
+ public:
+ explicit PreserveFEnv(FEnvSafeTest *self) : test{*self} {
+ test.get_fenv(before);
+ }
+
+ // Cause test expectation failures if the current state doesn't match what
+ // was captured in the constructor.
+ void check();
+
+ // Restore the state captured in the constructor.
+ void restore() { test.set_fenv(before); }
+
+ ~PreserveFEnv() { restore(); }
+ };
+
+ // This is an RAII type where `CheckFEnv check{this};` will sample the
+ // `fenv_t` state and require it be the same when `check` goes out of scope.
+ struct CheckFEnv : public PreserveFEnv {
+ using PreserveFEnv::PreserveFEnv;
+
+ ~CheckFEnv() { check(); }
+ };
+
+ // This calls callable() and returns its value, but has EXPECT_* failures if
+ // the `fenv_t` state is not preserved by the call.
+ template <typename T> decltype(auto) check_fenv_preserved(T &&callable) {
+ CheckFEnv check{this};
+ return cpp::forward<T>(callable)();
+ }
+
+ // This calls callable() and returns its value, but saves and restores the
+ // `fenv_t` state around the call.
+ template <typename T>
+ auto with_fenv_preserved(T &&callable)
+ -> decltype(cpp::forward<decltype(callable)>(callable)()) {
+ PreserveFEnv preserve{this};
+ return cpp::forward<T>(callable)();
+ }
+
+ // A test can call these to indicate it will or won't change `fenv_t` state.
+ void will_change_fenv() { should_be_unchanged = false; }
+ void will_not_change_fenv() { should_be_unchanged = true; }
+
+ // This explicitly resets back to the "before" state captured in SetUp().
+ // TearDown() always does this, but should_be_unchanged controls whether
+ // it also causes test failures if a test fails to restore it.
+ void restore_fenv() { check.restore(); }
+
+private:
+ void get_fenv(fenv_t &fenv);
+ void set_fenv(const fenv_t &fenv);
+ void expect_fenv_eq(const fenv_t &before_fenv, const fenv_t &after_fenv);
+
+ CheckFEnv check{this};
+
+ // TODO: Many tests fail if this is true. It needs to be figured out whether
+ // the state should be preserved by each library function under test, and
+ // separately whether each test itself should preserve the state. It
+ // probably isn't important that tests be explicitly written to preserve the
+ // state, as the fixture can (and does) reset it--the next test can rely on
+ // getting "normal" ambient state initially. For library functions that
+ // should preserve the state, that should be checked after each call, not
+ // just after the whole test. So they can use check_fenv_preserved or
+ // with_fenv_preserved as appropriate.
+ bool should_be_unchanged = false;
+};
+
+} // namespace LIBC_NAMESPACE::testing
+
+#endif // LLVM_LIBC_TEST_UNITTEST_FPENVSAFE_H
diff --git a/libc/test/src/fenv/CMakeLists.txt b/libc/test/src/fenv/CMakeLists.txt
index f277b65e2d42be..b776f9a0706e86 100644
--- a/libc/test/src/fenv/CMakeLists.txt
+++ b/libc/test/src/fenv/CMakeLists.txt
@@ -9,6 +9,8 @@ add_libc_unittest(
DEPENDS
libc.src.fenv.fegetround
libc.src.fenv.fesetround
+ LINK_LIBRARIES
+ LibcFPTestHelpers
)
add_libc_unittest(
@@ -23,6 +25,8 @@ add_libc_unittest(
libc.src.fenv.fesetexcept
libc.src.fenv.fetestexcept
libc.src.__support.FPUtil.fenv_impl
+ LINK_LIBRARIES
+ LibcFPTestHelpers
)
add_libc_unittest(
@@ -37,6 +41,8 @@ add_libc_unittest(
libc.src.fenv.fesetenv
libc.src.fenv.fesetround
libc.src.__support.FPUtil.fenv_impl
+ LINK_LIBRARIES
+ LibcFPTestHelpers
)
add_libc_unittest(
@@ -50,6 +56,8 @@ add_libc_unittest(
libc.src.fenv.fesetexceptflag
libc.src.fenv.fetestexceptflag
libc.src.__support.FPUtil.fenv_impl
+ LINK_LIBRARIES
+ LibcFPTestHelpers
)
add_libc_unittest(
@@ -62,6 +70,8 @@ add_libc_unittest(
libc.include.signal
libc.src.fenv.feupdateenv
libc.src.__support.FPUtil.fenv_impl
+ LINK_LIBRARIES
+ LibcFPTestHelpers
)
add_libc_unittest(
@@ -73,6 +83,8 @@ add_libc_unittest(
DEPENDS
libc.src.fenv.feclearexcept
libc.src.__support.FPUtil.fenv_impl
+ LINK_LIBRARIES
+ LibcFPTestHelpers
)
add_libc_unittest(
@@ -85,6 +97,8 @@ add_libc_unittest(
libc.src.fenv.fedisableexcept
libc.src.fenv.feenableexcept
libc.src.fenv.fegetexcept
+ LINK_LIBRARIES
+ LibcFPTestHelpers
)
if (NOT (LLVM_USE_SANITIZER OR (${LIBC_TARGET_OS} STREQUAL "windows")
@@ -109,6 +123,7 @@ if (NOT (LLVM_USE_SANITIZER OR (${LIBC_TARGET_OS} STREQUAL "windows")
libc.src.__support.FPUtil.fenv_impl
LINK_LIBRARIES
LibcFPExceptionHelpers
+ LibcFPTestHelpers
)
add_fp_unittest(
@@ -124,5 +139,6 @@ if (NOT (LLVM_USE_SANITIZER OR (${LIBC_TARGET_OS} STREQUAL "windows")
libc.src.__support.FPUtil.fenv_impl
LINK_LIBRARIES
LibcFPExceptionHelpers
+ LibcFPTestHelpers
)
endif()
diff --git a/libc/test/src/fenv/enabled_exceptions_test.cpp b/libc/test/src/fenv/enabled_exceptions_test.cpp
index 53440b704ca761..0b0c2b369d476e 100644
--- a/libc/test/src/fenv/enabled_exceptions_test.cpp
+++ b/libc/test/src/fenv/enabled_exceptions_test.cpp
@@ -13,16 +13,20 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/macros/properties/architectures.h"
#include "test/UnitTest/FPExceptMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/fenv_macros.h"
#include <signal.h>
+#include "excepts.h"
+
+using LlvmLibcExceptionStatusTest = LIBC_NAMESPACE::testing::FEnvSafeTest;
+
// This test enables an exception and verifies that raising that exception
// triggers SIGFPE.
-TEST(LlvmLibcExceptionStatusTest, RaiseAndCrash) {
-#if defined(LIBC_TARGET_ARCH_IS_ANY_ARM) || \
- defined(LIBC_TARGET_ARCH_IS_ANY_RISCV)
+TEST_F(LlvmLibcExceptionStatusTest, RaiseAndCrash) {
+#if defined(LIBC_TARGET_ARCH_IS_ANY_ARM) || defined(LIBC_TARGET_ARCH_IS_ANY_RISCV)
// Few Arm HW implementations do not trap exceptions. We skip this test
// completely on such HW.
//
@@ -34,23 +38,14 @@ TEST(LlvmLibcExceptionStatusTest, RaiseAndCrash) {
LIBC_NAMESPACE::fputil::enable_except(FE_DIVBYZERO);
if (LIBC_NAMESPACE::fputil::get_except() == 0)
return;
-#endif // Architectures where exception trapping is not supported
+#endif // Architectures where exception trapping is not supported
// TODO: Install a floating point exception handler and verify that the
// the expected exception was raised. One will have to longjmp back from
// that exception handler, so such a testing can be done after we have
// longjmp implemented.
- int excepts[] = {FE_DIVBYZERO, FE_INVALID, FE_INEXACT, FE_OVERFLOW,
- FE_UNDERFLOW};
-
- // We '|' the individual exception flags instead of using FE_ALL_EXCEPT
- // as it can include non-standard extensions. Note that we should be able
- // to compile this file with headers from other libcs as well.
- constexpr int ALL_EXCEPTS =
- FE_DIVBYZERO | FE_INVALID | FE_INEXACT | FE_OVERFLOW | FE_UNDERFLOW;
-
- for (int e : excepts) {
+ for (int e : EXCEPTS) {
LIBC_NAMESPACE::fputil::disable_except(FE_ALL_EXCEPT);
LIBC_NAMESPACE::fputil::enable_except(e);
ASSERT_EQ(LIBC_NAMESPACE::feclearexcept(FE_ALL_EXCEPT), 0);
diff --git a/libc/test/src/fenv/exception_flags_test.cpp b/libc/test/src/fenv/exception_flags_test.cpp
index 9d2be6426a6d0b..2f4332df861fec 100644
--- a/libc/test/src/fenv/exception_flags_test.cpp
+++ b/libc/test/src/fenv/exception_flags_test.cpp
@@ -12,18 +12,20 @@
#include "src/fenv/fetestexceptflag.h"
#include "src/__support/FPUtil/FEnvImpl.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
-TEST(LlvmLibcFenvTest, GetSetTestExceptFlag) {
+#include "excepts.h"
+
+using LlvmLibcFEnvTest = LIBC_NAMESPACE::testing::FEnvSafeTest;
+
+TEST_F(LlvmLibcFEnvTest, GetSetTestExceptFlag) {
// We will disable all exceptions to prevent invocation of the exception
// handler.
LIBC_NAMESPACE::fputil::disable_except(FE_ALL_EXCEPT);
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
- int excepts[] = {FE_DIVBYZERO, FE_INVALID, FE_INEXACT, FE_OVERFLOW,
- FE_UNDERFLOW};
-
- for (int e : excepts) {
+ for (int e : EXCEPTS) {
// The overall idea is to raise an except and save the exception flags.
// Next, clear the flags and then set the saved exception flags. This
// should set the flag corresponding to the previously raised exception.
diff --git a/libc/test/src/fenv/exception_status_test.cpp b/libc/test/src/fenv/exception_status_test.cpp
index a7000020b1a3c8..fdf9421457866e 100644
--- a/libc/test/src/fenv/exception_status_test.cpp
+++ b/libc/test/src/fenv/exception_status_test.cpp
@@ -13,24 +13,23 @@
#include "src/fenv/fetestexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/fenv_macros.h"
-TEST(LlvmLibcExceptionStatusTest, RaiseAndTest) {
+#include "excepts.h"
+
+using LlvmLibcExceptionStatusTest = LIBC_NAMESPACE::testing::FEnvSafeTest;
+
+TEST_F(LlvmLibcExceptionStatusTest, RaiseAndTest) {
// This test raises a set of exceptions and checks that the exception
// status flags are updated. The intention is really not to invoke the
// exception handler. Hence, we will disable all exceptions at the
// beginning.
LIBC_NAMESPACE::fputil::disable_except(FE_ALL_EXCEPT);
- int excepts[] = {FE_DIVBYZERO, FE_INVALID, FE_INEXACT, FE_OVERFLOW,
- FE_UNDERFLOW};
-
- constexpr int ALL_EXCEPTS =
- FE_DIVBYZERO | FE_INVALID | FE_INEXACT | FE_OVERFLOW | FE_UNDERFLOW;
-
- for (int e : excepts) {
+ for (int e : EXCEPTS) {
int r = LIBC_NAMESPACE::feraiseexcept(e);
ASSERT_EQ(r, 0);
int s = LIBC_NAMESPACE::fetestexcept(e);
@@ -47,8 +46,8 @@ TEST(LlvmLibcExceptionStatusTest, RaiseAndTest) {
ASSERT_EQ(s, e);
}
- for (int e1 : excepts) {
- for (int e2 : excepts) {
+ for (int e1 : EXCEPTS) {
+ for (int e2 : EXCEPTS) {
int e = e1 | e2;
int r = LIBC_NAMESPACE::feraiseexcept(e);
ASSERT_EQ(r, 0);
@@ -67,9 +66,9 @@ TEST(LlvmLibcExceptionStatusTest, RaiseAndTest) {
}
}
- for (int e1 : excepts) {
- for (int e2 : excepts) {
- for (int e3 : excepts) {
+ for (int e1 : EXCEPTS) {
+ for (int e2 : EXCEPTS) {
+ for (int e3 : EXCEPTS) {
int e = e1 | e2 | e3;
int r = LIBC_NAMESPACE::feraiseexcept(e);
ASSERT_EQ(r, 0);
@@ -89,10 +88,10 @@ TEST(LlvmLibcExceptionStatusTest, RaiseAndTest) {
}
}
- for (int e1 : excepts) {
- for (int e2 : excepts) {
- for (int e3 : excepts) {
- for (int e4 : excepts) {
+ for (int e1 : EXCEPTS) {
+ for (int e2 : EXCEPTS) {
+ for (int e3 : EXCEPTS) {
+ for (int e4 : EXCEPTS) {
int e = e1 | e2 | e3 | e4;
int r = LIBC_NAMESPACE::feraiseexcept(e);
ASSERT_EQ(r, 0);
@@ -113,11 +112,11 @@ TEST(LlvmLibcExceptionStatusTest, RaiseAndTest) {
}
}
- for (int e1 : excepts) {
- for (int e2 : excepts) {
- for (int e3 : excepts) {
- for (int e4 : excepts) {
- for (int e5 : excepts) {
+ for (int e1 : EXCEPTS) {
+ for (int e2 : EXCEPTS) {
+ for (int e3 : EXCEPTS) {
+ for (int e4 : EXCEPTS) {
+ for (int e5 : EXCEPTS) {
int e = e1 | e2 | e3 | e4 | e5;
int r = LIBC_NAMESPACE::feraiseexcept(e);
ASSERT_EQ(r, 0);
diff --git a/libc/test/src/fenv/excepts.h b/libc/test/src/fenv/excepts.h
new file mode 100644
index 00000000000000..e9517d319a9b79
--- /dev/null
+++ b/libc/test/src/fenv/excepts.h
@@ -0,0 +1,24 @@
+//===-- List of all FE_* constants for tests -----------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===---------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TEST_SRC_FENV_EXCEPTS_H
+#define LLVM_LIBC_TEST_SRC_FENV_EXCEPTS_H
+
+#include "hdr/fenv_macros.h"
+
+constexpr int EXCEPTS[] = {
+ FE_DIVBYZERO, FE_INVALID, FE_INEXACT, FE_OVERFLOW, FE_UNDERFLOW,
+};
+
+// We '|' the individual exception flags instead of using FE_ALL_EXCEPT
+// as it can include non-standard extensions. Note that we should be able
+// to compile this file with headers from other libcs as well.
+constexpr int ALL_EXCEPTS =
+ FE_DIVBYZERO | FE_INVALID | FE_INEXACT | FE_OVERFLOW | FE_UNDERFLOW;
+
+#endif // LLVM_LIBC_TEST_SRC_FENV_EXCEPTS_H
diff --git a/libc/test/src/fenv/feclearexcept_test.cpp b/libc/test/src/fenv/feclearexcept_test.cpp
index bb42d9070358ef..52adda46adf2f0 100644
--- a/libc/test/src/fenv/feclearexcept_test.cpp
+++ b/libc/test/src/fenv/feclearexcept_test.cpp
@@ -9,27 +9,30 @@
#include "src/fenv/feclearexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/fenv_macros.h"
#include <stdint.h>
-TEST(LlvmLibcFEnvTest, ClearTest) {
- uint16_t excepts[] = {FE_DIVBYZERO, FE_INVALID, FE_INEXACT, FE_OVERFLOW,
- FE_UNDERFLOW};
+#include "excepts.h"
+
+using LlvmLibcFEnvTest = LIBC_NAMESPACE::testing::FEnvSafeTest;
+
+TEST_F(LlvmLibcFEnvTest, ClearTest) {
LIBC_NAMESPACE::fputil::disable_except(FE_ALL_EXCEPT);
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
- for (uint16_t e : excepts)
+ for (int e : EXCEPTS)
ASSERT_EQ(LIBC_NAMESPACE::fputil::test_except(e), 0);
LIBC_NAMESPACE::fputil::raise_except(FE_ALL_EXCEPT);
- for (uint16_t e1 : excepts) {
- for (uint16_t e2 : excepts) {
- for (uint16_t e3 : excepts) {
- for (uint16_t e4 : excepts) {
- for (uint16_t e5 : excepts) {
+ for (int e1 : EXCEPTS) {
+ for (int e2 : EXCEPTS) {
+ for (int e3 : EXCEPTS) {
+ for (int e4 : EXCEPTS) {
+ for (int e5 : EXCEPTS) {
// We clear one exception and test to verify that it was cleared.
LIBC_NAMESPACE::feclearexcept(e1 | e2 | e3 | e4 | e5);
ASSERT_EQ(
diff --git a/libc/test/src/fenv/feenableexcept_test.cpp b/libc/test/src/fenv/feenableexcept_test.cpp
index aeb4f955fd69b6..232e2a1c8316c6 100644
--- a/libc/test/src/fenv/feenableexcept_test.cpp
+++ b/libc/test/src/fenv/feenableexcept_test.cpp
@@ -11,11 +11,16 @@
#include "src/fenv/feenableexcept.h"
#include "src/fenv/fegetexcept.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/fenv_macros.h"
-TEST(LlvmLibcFEnvTest, EnableTest) {
+#include "excepts.h"
+
+using LlvmLibcFEnvTest = LIBC_NAMESPACE::testing::FEnvSafeTest;
+
+TEST_F(LlvmLibcFEnvTest, EnableTest) {
#if defined(LIBC_TARGET_ARCH_IS_ANY_ARM) || \
defined(LIBC_TARGET_ARCH_IS_ANY_RISCV)
// Few Arm HW implementations do not trap exceptions. We skip this test
diff --git a/libc/test/src/fenv/feholdexcept_test.cpp b/libc/test/src/fenv/feholdexcept_test.cpp
index 0689d89ab233a3..b4e8201d6afb39 100644
--- a/libc/test/src/fenv/feholdexcept_test.cpp
+++ b/libc/test/src/fenv/feholdexcept_test.cpp
@@ -12,9 +12,14 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/macros/properties/architectures.h"
#include "test/UnitTest/FPExceptMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
-TEST(LlvmLibcFEnvTest, RaiseAndCrash) {
+#include "excepts.h"
+
+using LlvmLibcFEnvTest = LIBC_NAMESPACE::testing::FEnvSafeTest;
+
+TEST_F(LlvmLibcFEnvTest, RaiseAndCrash) {
#if defined(LIBC_TARGET_ARCH_IS_ANY_ARM) || \
defined(LIBC_TARGET_ARCH_IS_ANY_RISCV)
// Few Arm HW implementations do not trap exceptions. We skip this test
diff --git a/libc/test/src/fenv/feupdateenv_test.cpp b/libc/test/src/fenv/feupdateenv_test.cpp
index 251b8566aac3d6..d2ffc0ef8e84d3 100644
--- a/libc/test/src/fenv/feupdateenv_test.cpp
+++ b/libc/test/src/fenv/feupdateenv_test.cpp
@@ -10,11 +10,12 @@
#include "src/fenv/feupdateenv.h"
#include "src/__support/FPUtil/FEnvImpl.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
-#include <signal.h>
+using LlvmLibcFEnvTest = LIBC_NAMESPACE::testing::FEnvSafeTest;
-TEST(LlvmLibcFEnvTest, UpdateEnvTest) {
+TEST_F(LlvmLibcFEnvTest, UpdateEnvTest) {
LIBC_NAMESPACE::fputil::disable_except(FE_ALL_EXCEPT);
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
diff --git a/libc/test/src/fenv/getenv_and_setenv_test.cpp b/libc/test/src/fenv/getenv_and_setenv_test.cpp
index f767e8ab9b2fb8..7257e75cb421ae 100644
--- a/libc/test/src/fenv/getenv_and_setenv_test.cpp
+++ b/libc/test/src/fenv/getenv_and_setenv_test.cpp
@@ -13,17 +13,19 @@
#include "src/fenv/fesetround.h"
#include "src/__support/FPUtil/FEnvImpl.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
-TEST(LlvmLibcFenvTest, GetEnvAndSetEnv) {
+#include "excepts.h"
+
+using LlvmLibcFEnvTest = LIBC_NAMESPACE::testing::FEnvSafeTest;
+
+TEST_F(LlvmLibcFEnvTest, GetEnvAndSetEnv) {
// We will disable all exceptions to prevent invocation of the exception
// handler.
LIBC_NAMESPACE::fputil::disable_except(FE_ALL_EXCEPT);
- int excepts[] = {FE_DIVBYZERO, FE_INVALID, FE_INEXACT, FE_OVERFLOW,
- FE_UNDERFLOW};
-
- for (int e : excepts) {
+ for (int e : EXCEPTS) {
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
// Save the cleared environment.
@@ -71,7 +73,7 @@ TEST(LlvmLibcFenvTest, Set_FE_DFL_ENV) {
}
#ifdef _WIN32
-TEST(LlvmLibcFenvTest, Windows_Set_Get_Test) {
+TEST_F(LlvmLibcFEnvTest, Windows_Set_Get_Test) {
// If a valid fenv_t is written, then reading it back out should be identical.
fenv_t setEnv = {0x7e00053e, 0x0f00000f};
fenv_t getEnv;
diff --git a/libc/test/src/fenv/rounding_mode_test.cpp b/libc/test/src/fenv/rounding_mode_test.cpp
index ec2e27ecc818b2..f242ed9aaffe5b 100644
--- a/libc/test/src/fenv/rounding_mode_test.cpp
+++ b/libc/test/src/fenv/rounding_mode_test.cpp
@@ -9,15 +9,18 @@
#include "src/fenv/fegetround.h"
#include "src/fenv/fesetround.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/fenv_macros.h"
-TEST(LlvmLibcRoundingModeTest, SetAndGet) {
+using LlvmLibcRoundingModeTest = LIBC_NAMESPACE::testing::FEnvSafeTest;
+
+TEST_F(LlvmLibcRoundingModeTest, SetAndGet) {
struct ResetDefaultRoundingMode {
- int original;
+ int original = LIBC_NAMESPACE::fegetround();
~ResetDefaultRoundingMode() { LIBC_NAMESPACE::fesetround(original); }
- } reset{LIBC_NAMESPACE::fegetround()};
+ } reset;
int s = LIBC_NAMESPACE::fesetround(FE_TONEAREST);
EXPECT_EQ(s, 0);
diff --git a/libc/test/src/math/CeilTest.h b/libc/test/src/math/CeilTest.h
index da3f3c0e8f5abd..5cb7c078fa0a8f 100644
--- a/libc/test/src/math/CeilTest.h
+++ b/libc/test/src/math/CeilTest.h
@@ -7,6 +7,7 @@
//===----------------------------------------------------------------------===//
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -14,7 +15,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class CeilTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class CeilTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/CopySignTest.h b/libc/test/src/math/CopySignTest.h
index 052ff0333438e9..9e885d2db94930 100644
--- a/libc/test/src/math/CopySignTest.h
+++ b/libc/test/src/math/CopySignTest.h
@@ -7,6 +7,7 @@
//===----------------------------------------------------------------------===//
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -15,7 +16,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
template <typename T>
-class CopySignTest : public LIBC_NAMESPACE::testing::Test {
+class CopySignTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FAbsTest.h b/libc/test/src/math/FAbsTest.h
index 23ad8a26c481c2..7cfcac100cd1ef 100644
--- a/libc/test/src/math/FAbsTest.h
+++ b/libc/test/src/math/FAbsTest.h
@@ -10,6 +10,7 @@
#define LLVM_LIBC_TEST_SRC_MATH_FABSTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -17,7 +18,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class FAbsTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FAbsTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FDimTest.h b/libc/test/src/math/FDimTest.h
index 44aba9caf6463e..e006bfcad6faa5 100644
--- a/libc/test/src/math/FDimTest.h
+++ b/libc/test/src/math/FDimTest.h
@@ -10,10 +10,11 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FDimTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class FDimTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
using FuncPtr = T (*)(T, T);
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
diff --git a/libc/test/src/math/FMaxTest.h b/libc/test/src/math/FMaxTest.h
index e9857f332e6518..c4f42e3b965fbf 100644
--- a/libc/test/src/math/FMaxTest.h
+++ b/libc/test/src/math/FMaxTest.h
@@ -10,6 +10,7 @@
#define LLVM_LIBC_TEST_SRC_MATH_FMAXTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -17,7 +18,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class FMaxTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FMaxTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FMinTest.h b/libc/test/src/math/FMinTest.h
index c6b9f4439b79b7..a05f1b6cad1c52 100644
--- a/libc/test/src/math/FMinTest.h
+++ b/libc/test/src/math/FMinTest.h
@@ -10,6 +10,7 @@
#define LLVM_LIBC_TEST_SRC_MATH_FMINTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -17,7 +18,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class FMinTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FMinTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FModTest.h b/libc/test/src/math/FModTest.h
index bc909987a161b8..da5f502151cb34 100644
--- a/libc/test/src/math/FModTest.h
+++ b/libc/test/src/math/FModTest.h
@@ -12,6 +12,7 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
@@ -24,7 +25,7 @@
#define TEST_REGULAR(x, y, expected) TEST_SPECIAL(x, y, expected, false, 0)
-template <typename T> class FmodTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FloorTest.h b/libc/test/src/math/FloorTest.h
index 679dc26e124806..892c819cb8861a 100644
--- a/libc/test/src/math/FloorTest.h
+++ b/libc/test/src/math/FloorTest.h
@@ -10,6 +10,7 @@
#define LLVM_LIBC_TEST_SRC_MATH_FLOORTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -17,7 +18,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class FloorTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FloorTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FmaTest.h b/libc/test/src/math/FmaTest.h
index 76bd221fcb1f2f..5f315c53c2624a 100644
--- a/libc/test/src/math/FmaTest.h
+++ b/libc/test/src/math/FmaTest.h
@@ -13,13 +13,14 @@
#include "src/stdlib/rand.h"
#include "src/stdlib/srand.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
template <typename T>
-class FmaTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class FmaTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
private:
using Func = T (*)(T, T, T);
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
diff --git a/libc/test/src/math/FrexpTest.h b/libc/test/src/math/FrexpTest.h
index 5f993f604999d8..2bd8bd17e9a11c 100644
--- a/libc/test/src/math/FrexpTest.h
+++ b/libc/test/src/math/FrexpTest.h
@@ -8,6 +8,7 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -15,7 +16,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class FrexpTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FrexpTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/HypotTest.h b/libc/test/src/math/HypotTest.h
index 0c15f02fe37193..c86f1ffda577a9 100644
--- a/libc/test/src/math/HypotTest.h
+++ b/libc/test/src/math/HypotTest.h
@@ -11,6 +11,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -19,7 +20,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
template <typename T>
-class HypotTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class HypotTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
private:
using Func = T (*)(T, T);
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
diff --git a/libc/test/src/math/ILogbTest.h b/libc/test/src/math/ILogbTest.h
index 3d1f047a480613..c2d5a1326e0ed2 100644
--- a/libc/test/src/math/ILogbTest.h
+++ b/libc/test/src/math/ILogbTest.h
@@ -13,9 +13,10 @@
#include "src/__support/CPP/limits.h" // INT_MAX
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
-class LlvmLibcILogbTest : public LIBC_NAMESPACE::testing::Test {
+class LlvmLibcILogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
template <typename T> struct ILogbFunc {
typedef int (*Func)(T);
diff --git a/libc/test/src/math/LdExpTest.h b/libc/test/src/math/LdExpTest.h
index 2a406feed52fc1..68515e683f0878 100644
--- a/libc/test/src/math/LdExpTest.h
+++ b/libc/test/src/math/LdExpTest.h
@@ -13,13 +13,14 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/NormalFloat.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
#include <stdint.h>
template <typename T>
-class LdExpTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class LdExpTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
using NormalFloat = LIBC_NAMESPACE::fputil::NormalFloat<T>;
using StorageType = typename FPBits::StorageType;
diff --git a/libc/test/src/math/LogbTest.h b/libc/test/src/math/LogbTest.h
index f066d5f9de02b1..cdcbeb084d1cd9 100644
--- a/libc/test/src/math/LogbTest.h
+++ b/libc/test/src/math/LogbTest.h
@@ -8,6 +8,7 @@
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -15,7 +16,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class LogbTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class LogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/ModfTest.h b/libc/test/src/math/ModfTest.h
index 49b0328753b3bc..1d5228f8326589 100644
--- a/libc/test/src/math/ModfTest.h
+++ b/libc/test/src/math/ModfTest.h
@@ -9,6 +9,7 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -16,7 +17,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class ModfTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class ModfTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/NextAfterTest.h b/libc/test/src/math/NextAfterTest.h
index a7248dd7042d46..2aac69d3f70246 100644
--- a/libc/test/src/math/NextAfterTest.h
+++ b/libc/test/src/math/NextAfterTest.h
@@ -15,10 +15,11 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class NextAfterTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class NextAfterTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
using StorageType = typename FPBits::StorageType;
diff --git a/libc/test/src/math/RIntTest.h b/libc/test/src/math/RIntTest.h
index c706ff18f186e5..4431f0da6ad6b5 100644
--- a/libc/test/src/math/RIntTest.h
+++ b/libc/test/src/math/RIntTest.h
@@ -12,6 +12,7 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -25,7 +26,7 @@ static constexpr int ROUNDING_MODES[4] = {FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO,
FE_TONEAREST};
template <typename T>
-class RIntTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class RIntTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
typedef T (*RIntFunc)(T);
diff --git a/libc/test/src/math/RemQuoTest.h b/libc/test/src/math/RemQuoTest.h
index 677772dd9fccfd..339faf50798e3d 100644
--- a/libc/test/src/math/RemQuoTest.h
+++ b/libc/test/src/math/RemQuoTest.h
@@ -13,13 +13,14 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
template <typename T>
-class RemQuoTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class RemQuoTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
using StorageType = typename FPBits::StorageType;
diff --git a/libc/test/src/math/RoundEvenTest.h b/libc/test/src/math/RoundEvenTest.h
index 68b8b9ae1d964b..560c4b27a5e196 100644
--- a/libc/test/src/math/RoundEvenTest.h
+++ b/libc/test/src/math/RoundEvenTest.h
@@ -10,6 +10,7 @@
#define LLVM_LIBC_TEST_SRC_MATH_ROUNDEVENTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -18,7 +19,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
template <typename T>
-class RoundEvenTest : public LIBC_NAMESPACE::testing::Test {
+class RoundEvenTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/RoundTest.h b/libc/test/src/math/RoundTest.h
index eecf95982729be..0a7f57b8be85ec 100644
--- a/libc/test/src/math/RoundTest.h
+++ b/libc/test/src/math/RoundTest.h
@@ -10,6 +10,7 @@
#define LLVM_LIBC_TEST_SRC_MATH_ROUNDTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -17,7 +18,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class RoundTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class RoundTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/RoundToIntegerTest.h b/libc/test/src/math/RoundToIntegerTest.h
index 7c93451235f296..3444d2039c31f1 100644
--- a/libc/test/src/math/RoundToIntegerTest.h
+++ b/libc/test/src/math/RoundToIntegerTest.h
@@ -12,6 +12,7 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -24,7 +25,7 @@ static constexpr int ROUNDING_MODES[4] = {FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO,
FE_TONEAREST};
template <typename F, typename I, bool TestModes = false>
-class RoundToIntegerTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class RoundToIntegerTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
typedef I (*RoundToIntegerFunc)(F);
@@ -81,6 +82,8 @@ class RoundToIntegerTestTemplate : public LIBC_NAMESPACE::testing::Test {
public:
void SetUp() override {
+ LIBC_NAMESPACE::testing::FEnvSafeTest::SetUp();
+
if (math_errhandling & MATH_ERREXCEPT) {
// We will disable all exceptions so that the test will not
// crash with SIGFPE. We can still use fetestexcept to check
diff --git a/libc/test/src/math/SqrtTest.h b/libc/test/src/math/SqrtTest.h
index 799b7862a37260..9f9dd0899be838 100644
--- a/libc/test/src/math/SqrtTest.h
+++ b/libc/test/src/math/SqrtTest.h
@@ -8,6 +8,7 @@
#include "src/__support/CPP/bit.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -15,7 +16,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class SqrtTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class SqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/TruncTest.h b/libc/test/src/math/TruncTest.h
index 57c953fad8742f..a3556968f2b9e2 100644
--- a/libc/test/src/math/TruncTest.h
+++ b/libc/test/src/math/TruncTest.h
@@ -10,6 +10,7 @@
#define LLVM_LIBC_TEST_SRC_MATH_TRUNCTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -17,7 +18,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class TruncTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class TruncTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp b/libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp
index c7aec5b7bc21b4..762a3376ffbb50 100644
--- a/libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp
+++ b/libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp
@@ -10,6 +10,7 @@
#include "src/__support/FPUtil/ManipulationFunctions.h" // ldexp
#include "src/__support/FPUtil/generic/FMod.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -18,7 +19,7 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
template <typename T, bool InverseMultiplication>
-class LlvmLibcFModTest : public LIBC_NAMESPACE::testing::Test {
+class LlvmLibcFModTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
using U = typename FPBits::StorageType;
diff --git a/libc/test/src/math/smoke/CanonicalizeTest.h b/libc/test/src/math/smoke/CanonicalizeTest.h
index ab45e0eb8e94d3..5e40ab6e4db4f0 100644
--- a/libc/test/src/math/smoke/CanonicalizeTest.h
+++ b/libc/test/src/math/smoke/CanonicalizeTest.h
@@ -12,6 +12,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/integer_literals.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
@@ -26,7 +27,7 @@
using LIBC_NAMESPACE::operator""_u128;
template <typename T>
-class CanonicalizeTest : public LIBC_NAMESPACE::testing::Test {
+class CanonicalizeTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/CeilTest.h b/libc/test/src/math/smoke/CeilTest.h
index 70e441a849cb4f..dbb99d670b463e 100644
--- a/libc/test/src/math/smoke/CeilTest.h
+++ b/libc/test/src/math/smoke/CeilTest.h
@@ -10,11 +10,12 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_CEILTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class CeilTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class CeilTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/CopySignTest.h b/libc/test/src/math/smoke/CopySignTest.h
index fa9da91920f8de..0099b88c36d2b2 100644
--- a/libc/test/src/math/smoke/CopySignTest.h
+++ b/libc/test/src/math/smoke/CopySignTest.h
@@ -10,12 +10,13 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_COPYSIGNTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
template <typename T>
-class CopySignTest : public LIBC_NAMESPACE::testing::Test {
+class CopySignTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FAbsTest.h b/libc/test/src/math/smoke/FAbsTest.h
index 0c8ca95ba0f7bc..9679d4b29890c2 100644
--- a/libc/test/src/math/smoke/FAbsTest.h
+++ b/libc/test/src/math/smoke/FAbsTest.h
@@ -10,11 +10,12 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FABSTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class FAbsTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FAbsTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FDimTest.h b/libc/test/src/math/smoke/FDimTest.h
index e557b40d90efa1..597c9f1be7938b 100644
--- a/libc/test/src/math/smoke/FDimTest.h
+++ b/libc/test/src/math/smoke/FDimTest.h
@@ -9,10 +9,11 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FDimTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class FDimTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
using FuncPtr = T (*)(T, T);
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
diff --git a/libc/test/src/math/smoke/FMaxTest.h b/libc/test/src/math/smoke/FMaxTest.h
index b8781a85d10f4f..439110b2beb29d 100644
--- a/libc/test/src/math/smoke/FMaxTest.h
+++ b/libc/test/src/math/smoke/FMaxTest.h
@@ -10,9 +10,10 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
-template <typename T> class FMaxTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FMaxTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMaximumMagNumTest.h b/libc/test/src/math/smoke/FMaximumMagNumTest.h
index 715dd4ed913f83..db537ad28931cc 100644
--- a/libc/test/src/math/smoke/FMaximumMagNumTest.h
+++ b/libc/test/src/math/smoke/FMaximumMagNumTest.h
@@ -12,10 +12,11 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FMaximumMagNumTest : public LIBC_NAMESPACE::testing::Test {
+class FMaximumMagNumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMaximumMagTest.h b/libc/test/src/math/smoke/FMaximumMagTest.h
index 38276e0fe2fdb0..044a12123f1425 100644
--- a/libc/test/src/math/smoke/FMaximumMagTest.h
+++ b/libc/test/src/math/smoke/FMaximumMagTest.h
@@ -11,10 +11,11 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FMaximumMagTest : public LIBC_NAMESPACE::testing::Test {
+class FMaximumMagTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMaximumNumTest.h b/libc/test/src/math/smoke/FMaximumNumTest.h
index 57096f6b614a2c..81afaff6694e22 100644
--- a/libc/test/src/math/smoke/FMaximumNumTest.h
+++ b/libc/test/src/math/smoke/FMaximumNumTest.h
@@ -11,10 +11,11 @@
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FMaximumNumTest : public LIBC_NAMESPACE::testing::Test {
+class FMaximumNumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMaximumTest.h b/libc/test/src/math/smoke/FMaximumTest.h
index 4db8bb93baaeef..31861f440d152c 100644
--- a/libc/test/src/math/smoke/FMaximumTest.h
+++ b/libc/test/src/math/smoke/FMaximumTest.h
@@ -10,10 +10,11 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXIMUMTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FMaximumTest : public LIBC_NAMESPACE::testing::Test {
+class FMaximumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMinTest.h b/libc/test/src/math/smoke/FMinTest.h
index b1ffe38829f438..5484807b217182 100644
--- a/libc/test/src/math/smoke/FMinTest.h
+++ b/libc/test/src/math/smoke/FMinTest.h
@@ -10,9 +10,10 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
-template <typename T> class FMinTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FMinTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMinimumMagNumTest.h b/libc/test/src/math/smoke/FMinimumMagNumTest.h
index dec8b70740ca59..f29811403031d3 100644
--- a/libc/test/src/math/smoke/FMinimumMagNumTest.h
+++ b/libc/test/src/math/smoke/FMinimumMagNumTest.h
@@ -12,10 +12,11 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FMinimumMagNumTest : public LIBC_NAMESPACE::testing::Test {
+class FMinimumMagNumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMinimumMagTest.h b/libc/test/src/math/smoke/FMinimumMagTest.h
index b11092e5379ba0..a2daf6ad8119cc 100644
--- a/libc/test/src/math/smoke/FMinimumMagTest.h
+++ b/libc/test/src/math/smoke/FMinimumMagTest.h
@@ -11,10 +11,11 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FMinimumMagTest : public LIBC_NAMESPACE::testing::Test {
+class FMinimumMagTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMinimumNumTest.h b/libc/test/src/math/smoke/FMinimumNumTest.h
index 7fcc291b4c00cd..8036282d368507 100644
--- a/libc/test/src/math/smoke/FMinimumNumTest.h
+++ b/libc/test/src/math/smoke/FMinimumNumTest.h
@@ -11,10 +11,11 @@
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FMinimumNumTest : public LIBC_NAMESPACE::testing::Test {
+class FMinimumNumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMinimumTest.h b/libc/test/src/math/smoke/FMinimumTest.h
index bc04a6d9935654..9d3dc40dfc2b74 100644
--- a/libc/test/src/math/smoke/FMinimumTest.h
+++ b/libc/test/src/math/smoke/FMinimumTest.h
@@ -10,10 +10,11 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINIMUMTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FMinimumTest : public LIBC_NAMESPACE::testing::Test {
+class FMinimumTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FModTest.h b/libc/test/src/math/smoke/FModTest.h
index bc909987a161b8..da5f502151cb34 100644
--- a/libc/test/src/math/smoke/FModTest.h
+++ b/libc/test/src/math/smoke/FModTest.h
@@ -12,6 +12,7 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
@@ -24,7 +25,7 @@
#define TEST_REGULAR(x, y, expected) TEST_SPECIAL(x, y, expected, false, 0)
-template <typename T> class FmodTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FloorTest.h b/libc/test/src/math/smoke/FloorTest.h
index 12944aa7756269..6f000d41395a0a 100644
--- a/libc/test/src/math/smoke/FloorTest.h
+++ b/libc/test/src/math/smoke/FloorTest.h
@@ -10,11 +10,12 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FLOORTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class FloorTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FloorTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FmaTest.h b/libc/test/src/math/smoke/FmaTest.h
index c66035927d9896..ac82a1218b99ca 100644
--- a/libc/test/src/math/smoke/FmaTest.h
+++ b/libc/test/src/math/smoke/FmaTest.h
@@ -11,10 +11,11 @@
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FmaTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class FmaTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
private:
using Func = T (*)(T, T, T);
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
diff --git a/libc/test/src/math/smoke/FrexpTest.h b/libc/test/src/math/smoke/FrexpTest.h
index bf99a9a559f053..cd70885deb332a 100644
--- a/libc/test/src/math/smoke/FrexpTest.h
+++ b/libc/test/src/math/smoke/FrexpTest.h
@@ -8,9 +8,10 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
-template <typename T> class FrexpTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class FrexpTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FromfpTest.h b/libc/test/src/math/smoke/FromfpTest.h
index d3a61baafda106..6c7c7ad2afcbd5 100644
--- a/libc/test/src/math/smoke/FromfpTest.h
+++ b/libc/test/src/math/smoke/FromfpTest.h
@@ -10,10 +10,11 @@
#define LIBC_TEST_SRC_MATH_SMOKE_FROMFPTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FromfpTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class FromfpTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FromfpxTest.h b/libc/test/src/math/smoke/FromfpxTest.h
index f3a1680b05aafc..344cb3345ef15f 100644
--- a/libc/test/src/math/smoke/FromfpxTest.h
+++ b/libc/test/src/math/smoke/FromfpxTest.h
@@ -10,10 +10,11 @@
#define LIBC_TEST_SRC_MATH_SMOKE_FROMFPXTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class FromfpxTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class FromfpxTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/HypotTest.h b/libc/test/src/math/smoke/HypotTest.h
index a1b8f8a7fafa55..6cf6ca13428a5d 100644
--- a/libc/test/src/math/smoke/HypotTest.h
+++ b/libc/test/src/math/smoke/HypotTest.h
@@ -11,12 +11,13 @@
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
template <typename T>
-class HypotTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class HypotTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
private:
using Func = T (*)(T, T);
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
diff --git a/libc/test/src/math/smoke/ILogbTest.h b/libc/test/src/math/smoke/ILogbTest.h
index bb5bc33b6b3a6d..05f906b69947b2 100644
--- a/libc/test/src/math/smoke/ILogbTest.h
+++ b/libc/test/src/math/smoke/ILogbTest.h
@@ -12,10 +12,11 @@
#include "src/__support/CPP/limits.h" // INT_MAX
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename OutType, typename InType>
-class LlvmLibcILogbTest : public LIBC_NAMESPACE::testing::Test {
+class LlvmLibcILogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
using FPBits = LIBC_NAMESPACE::fputil::FPBits<InType>;
using StorageType = typename FPBits::StorageType;
diff --git a/libc/test/src/math/smoke/LdExpTest.h b/libc/test/src/math/smoke/LdExpTest.h
index c3e852a2a473b1..9c201302280aaf 100644
--- a/libc/test/src/math/smoke/LdExpTest.h
+++ b/libc/test/src/math/smoke/LdExpTest.h
@@ -13,12 +13,13 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/NormalFloat.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include <stdint.h>
template <typename T>
-class LdExpTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class LdExpTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
using NormalFloat = LIBC_NAMESPACE::fputil::NormalFloat<T>;
using StorageType = typename FPBits::StorageType;
diff --git a/libc/test/src/math/smoke/LogbTest.h b/libc/test/src/math/smoke/LogbTest.h
index 01e1050b4c4f8c..901a8e5cfeb6e7 100644
--- a/libc/test/src/math/smoke/LogbTest.h
+++ b/libc/test/src/math/smoke/LogbTest.h
@@ -8,9 +8,10 @@
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
-template <typename T> class LogbTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class LogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/ModfTest.h b/libc/test/src/math/smoke/ModfTest.h
index 65d61855c9f22d..0e2ed38afc5c72 100644
--- a/libc/test/src/math/smoke/ModfTest.h
+++ b/libc/test/src/math/smoke/ModfTest.h
@@ -9,11 +9,12 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class ModfTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class ModfTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/NextAfterTest.h b/libc/test/src/math/smoke/NextAfterTest.h
index d9c50c8109d803..f7785b9bfeb58d 100644
--- a/libc/test/src/math/smoke/NextAfterTest.h
+++ b/libc/test/src/math/smoke/NextAfterTest.h
@@ -15,6 +15,7 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#define ASSERT_FP_EQ_WITH_EXCEPTION(result, expected, expected_exception) \
@@ -29,7 +30,7 @@
ASSERT_FP_EQ_WITH_EXCEPTION(result, expected, FE_INEXACT | FE_OVERFLOW)
template <typename T>
-class NextAfterTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class NextAfterTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
using StorageType = typename FPBits::StorageType;
diff --git a/libc/test/src/math/smoke/NextDownTest.h b/libc/test/src/math/smoke/NextDownTest.h
index c678ab1db1deff..e386370e733454 100644
--- a/libc/test/src/math/smoke/NextDownTest.h
+++ b/libc/test/src/math/smoke/NextDownTest.h
@@ -10,10 +10,11 @@
#define LLVM_LIBC_TEST_SRC_MATH_NEXTDOWNTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class NextDownTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class NextDownTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/NextTowardTest.h b/libc/test/src/math/smoke/NextTowardTest.h
index b6c1c8d1797da6..2c1855eaccee8d 100644
--- a/libc/test/src/math/smoke/NextTowardTest.h
+++ b/libc/test/src/math/smoke/NextTowardTest.h
@@ -16,6 +16,7 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#define ASSERT_FP_EQ_WITH_EXCEPTION(result, expected, expected_exception) \
@@ -30,7 +31,7 @@
ASSERT_FP_EQ_WITH_EXCEPTION(result, expected, FE_INEXACT | FE_OVERFLOW)
template <typename T>
-class NextTowardTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class NextTowardTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
using ToFPBits = LIBC_NAMESPACE::fputil::FPBits<long double>;
using StorageType = typename FPBits::StorageType;
diff --git a/libc/test/src/math/smoke/NextUpTest.h b/libc/test/src/math/smoke/NextUpTest.h
index ebbdb5c73def9e..504e6540496970 100644
--- a/libc/test/src/math/smoke/NextUpTest.h
+++ b/libc/test/src/math/smoke/NextUpTest.h
@@ -10,10 +10,11 @@
#define LLVM_LIBC_TEST_SRC_MATH_NEXTUPTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class NextUpTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class NextUpTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/RIntTest.h b/libc/test/src/math/smoke/RIntTest.h
index cbed9a3b10baab..6dffc6f4fe6329 100644
--- a/libc/test/src/math/smoke/RIntTest.h
+++ b/libc/test/src/math/smoke/RIntTest.h
@@ -12,6 +12,7 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/fenv_macros.h"
@@ -22,7 +23,7 @@ static constexpr int ROUNDING_MODES[4] = {FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO,
FE_TONEAREST};
template <typename T>
-class RIntTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class RIntTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
typedef T (*RIntFunc)(T);
diff --git a/libc/test/src/math/smoke/RemQuoTest.h b/libc/test/src/math/smoke/RemQuoTest.h
index 7df537d8b20631..114c494b8a6b3b 100644
--- a/libc/test/src/math/smoke/RemQuoTest.h
+++ b/libc/test/src/math/smoke/RemQuoTest.h
@@ -13,10 +13,11 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class RemQuoTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class RemQuoTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
using StorageType = typename FPBits::StorageType;
diff --git a/libc/test/src/math/smoke/RoundEvenTest.h b/libc/test/src/math/smoke/RoundEvenTest.h
index e168d57bdbf3c7..ee7f0cb532e3ae 100644
--- a/libc/test/src/math/smoke/RoundEvenTest.h
+++ b/libc/test/src/math/smoke/RoundEvenTest.h
@@ -10,12 +10,13 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_ROUNDEVENTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
template <typename T>
-class RoundEvenTest : public LIBC_NAMESPACE::testing::Test {
+class RoundEvenTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/RoundTest.h b/libc/test/src/math/smoke/RoundTest.h
index 49b2a1bf7dfba7..9ef455f093b45e 100644
--- a/libc/test/src/math/smoke/RoundTest.h
+++ b/libc/test/src/math/smoke/RoundTest.h
@@ -10,11 +10,12 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_ROUNDTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class RoundTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class RoundTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/RoundToIntegerTest.h b/libc/test/src/math/smoke/RoundToIntegerTest.h
index 863cf75f05ff6b..da5fe759270a0c 100644
--- a/libc/test/src/math/smoke/RoundToIntegerTest.h
+++ b/libc/test/src/math/smoke/RoundToIntegerTest.h
@@ -12,6 +12,7 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
@@ -21,7 +22,7 @@ static constexpr int ROUNDING_MODES[4] = {FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO,
FE_TONEAREST};
template <typename F, typename I, bool TestModes = false>
-class RoundToIntegerTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class RoundToIntegerTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
typedef I (*RoundToIntegerFunc)(F);
@@ -61,6 +62,8 @@ class RoundToIntegerTestTemplate : public LIBC_NAMESPACE::testing::Test {
public:
void SetUp() override {
+ LIBC_NAMESPACE::testing::FEnvSafeTest::SetUp();
+
if (math_errhandling & MATH_ERREXCEPT) {
// We will disable all exceptions so that the test will not
// crash with SIGFPE. We can still use fetestexcept to check
diff --git a/libc/test/src/math/smoke/SqrtTest.h b/libc/test/src/math/smoke/SqrtTest.h
index 46382ed58e1402..111468913a485a 100644
--- a/libc/test/src/math/smoke/SqrtTest.h
+++ b/libc/test/src/math/smoke/SqrtTest.h
@@ -8,11 +8,12 @@
#include "src/__support/CPP/bit.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class SqrtTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class SqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/TruncTest.h b/libc/test/src/math/smoke/TruncTest.h
index c0fc87f9313b2f..88c08f4ecf9dbb 100644
--- a/libc/test/src/math/smoke/TruncTest.h
+++ b/libc/test/src/math/smoke/TruncTest.h
@@ -10,11 +10,12 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_TRUNCTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class TruncTest : public LIBC_NAMESPACE::testing::Test {
+template <typename T> class TruncTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/UfromfpTest.h b/libc/test/src/math/smoke/UfromfpTest.h
index 9ad1e6dce94596..561b52943179a6 100644
--- a/libc/test/src/math/smoke/UfromfpTest.h
+++ b/libc/test/src/math/smoke/UfromfpTest.h
@@ -10,10 +10,11 @@
#define LIBC_TEST_SRC_MATH_SMOKE_UFROMFPTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class UfromfpTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class UfromfpTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/UfromfpxTest.h b/libc/test/src/math/smoke/UfromfpxTest.h
index 09163b8adfa5c0..1e829f87ca379d 100644
--- a/libc/test/src/math/smoke/UfromfpxTest.h
+++ b/libc/test/src/math/smoke/UfromfpxTest.h
@@ -10,10 +10,11 @@
#define LIBC_TEST_SRC_MATH_SMOKE_UFROMFPXTEST_H
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
template <typename T>
-class UfromfpxTestTemplate : public LIBC_NAMESPACE::testing::Test {
+class UfromfpxTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/nan_test.cpp b/libc/test/src/math/smoke/nan_test.cpp
index 56c1e9164df41a..41ca31daaaf725 100644
--- a/libc/test/src/math/smoke/nan_test.cpp
+++ b/libc/test/src/math/smoke/nan_test.cpp
@@ -9,10 +9,11 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/nan.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include <signal.h>
-class LlvmLibcNanTest : public LIBC_NAMESPACE::testing::Test {
+class LlvmLibcNanTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
using StorageType = LIBC_NAMESPACE::fputil::FPBits<double>::StorageType;
diff --git a/libc/test/src/math/smoke/nanf128_test.cpp b/libc/test/src/math/smoke/nanf128_test.cpp
index 652e35ccb53d7a..2119f9c0a8c2bf 100644
--- a/libc/test/src/math/smoke/nanf128_test.cpp
+++ b/libc/test/src/math/smoke/nanf128_test.cpp
@@ -10,9 +10,10 @@
#include "src/__support/uint128.h"
#include "src/math/nanf128.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
-class LlvmLibcNanf128Test : public LIBC_NAMESPACE::testing::Test {
+class LlvmLibcNanf128Test : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
using FPBits128 = LIBC_NAMESPACE::fputil::FPBits<float128>;
using StorageType = FPBits128::StorageType;
diff --git a/libc/test/src/math/smoke/nanf_test.cpp b/libc/test/src/math/smoke/nanf_test.cpp
index bce495f1a9738b..9a5d90a9748bde 100644
--- a/libc/test/src/math/smoke/nanf_test.cpp
+++ b/libc/test/src/math/smoke/nanf_test.cpp
@@ -9,10 +9,11 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/nanf.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include <signal.h>
-class LlvmLibcNanfTest : public LIBC_NAMESPACE::testing::Test {
+class LlvmLibcNanfTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
using StorageType = LIBC_NAMESPACE::fputil::FPBits<float>::StorageType;
diff --git a/libc/test/src/math/smoke/nanl_test.cpp b/libc/test/src/math/smoke/nanl_test.cpp
index 5ff70a94b54d31..0af724631f892c 100644
--- a/libc/test/src/math/smoke/nanl_test.cpp
+++ b/libc/test/src/math/smoke/nanl_test.cpp
@@ -9,6 +9,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/nanl.h"
#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FEnvSafeTest.h"
#include "test/UnitTest/Test.h"
#include <signal.h>
@@ -22,7 +23,7 @@
#error "Unknown long double type"
#endif
-class LlvmLibcNanlTest : public LIBC_NAMESPACE::testing::Test {
+class LlvmLibcNanlTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
using StorageType = LIBC_NAMESPACE::fputil::FPBits<long double>::StorageType;
>From 5a6eb248787c2b2b4da6f347f06f85d6641fd4d1 Mon Sep 17 00:00:00 2001
From: Roland McGrath <mcgrathr at google.com>
Date: Mon, 22 Apr 2024 12:55:41 -0700
Subject: [PATCH 2/3] git-clang-format
---
libc/test/UnitTest/FEnvSafeTest.h | 2 +-
libc/test/src/fenv/enabled_exceptions_test.cpp | 7 ++++---
libc/test/src/fenv/feholdexcept_test.cpp | 2 +-
libc/test/src/math/CeilTest.h | 5 +++--
libc/test/src/math/CopySignTest.h | 2 +-
libc/test/src/math/FAbsTest.h | 5 +++--
libc/test/src/math/FDimTest.h | 2 +-
libc/test/src/math/FMaxTest.h | 5 +++--
libc/test/src/math/FMinTest.h | 5 +++--
libc/test/src/math/FModTest.h | 5 +++--
libc/test/src/math/FloorTest.h | 5 +++--
libc/test/src/math/FmaTest.h | 2 +-
libc/test/src/math/FrexpTest.h | 5 +++--
libc/test/src/math/HypotTest.h | 2 +-
libc/test/src/math/LdExpTest.h | 2 +-
libc/test/src/math/LogbTest.h | 5 +++--
libc/test/src/math/ModfTest.h | 5 +++--
libc/test/src/math/NextAfterTest.h | 2 +-
libc/test/src/math/RIntTest.h | 2 +-
libc/test/src/math/RemQuoTest.h | 2 +-
libc/test/src/math/RoundEvenTest.h | 2 +-
libc/test/src/math/RoundTest.h | 5 +++--
libc/test/src/math/RoundToIntegerTest.h | 5 +++--
libc/test/src/math/SqrtTest.h | 5 +++--
libc/test/src/math/TruncTest.h | 5 +++--
libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp | 2 +-
libc/test/src/math/smoke/CanonicalizeTest.h | 2 +-
libc/test/src/math/smoke/CeilTest.h | 5 +++--
libc/test/src/math/smoke/CopySignTest.h | 2 +-
libc/test/src/math/smoke/FAbsTest.h | 5 +++--
libc/test/src/math/smoke/FDimTest.h | 2 +-
libc/test/src/math/smoke/FMaxTest.h | 5 +++--
libc/test/src/math/smoke/FMaximumMagNumTest.h | 2 +-
libc/test/src/math/smoke/FMaximumMagTest.h | 2 +-
libc/test/src/math/smoke/FMaximumNumTest.h | 2 +-
libc/test/src/math/smoke/FMaximumTest.h | 2 +-
libc/test/src/math/smoke/FMinTest.h | 5 +++--
libc/test/src/math/smoke/FMinimumMagNumTest.h | 2 +-
libc/test/src/math/smoke/FMinimumMagTest.h | 2 +-
libc/test/src/math/smoke/FMinimumNumTest.h | 2 +-
libc/test/src/math/smoke/FMinimumTest.h | 2 +-
libc/test/src/math/smoke/FModTest.h | 5 +++--
libc/test/src/math/smoke/FloorTest.h | 5 +++--
libc/test/src/math/smoke/FmaTest.h | 2 +-
libc/test/src/math/smoke/FrexpTest.h | 5 +++--
libc/test/src/math/smoke/FromfpTest.h | 2 +-
libc/test/src/math/smoke/FromfpxTest.h | 2 +-
libc/test/src/math/smoke/HypotTest.h | 2 +-
libc/test/src/math/smoke/LdExpTest.h | 2 +-
libc/test/src/math/smoke/LogbTest.h | 5 +++--
libc/test/src/math/smoke/ModfTest.h | 5 +++--
libc/test/src/math/smoke/NextAfterTest.h | 2 +-
libc/test/src/math/smoke/NextDownTest.h | 2 +-
libc/test/src/math/smoke/NextTowardTest.h | 2 +-
libc/test/src/math/smoke/NextUpTest.h | 2 +-
libc/test/src/math/smoke/RIntTest.h | 2 +-
libc/test/src/math/smoke/RemQuoTest.h | 2 +-
libc/test/src/math/smoke/RoundEvenTest.h | 2 +-
libc/test/src/math/smoke/RoundTest.h | 5 +++--
libc/test/src/math/smoke/RoundToIntegerTest.h | 5 +++--
libc/test/src/math/smoke/SqrtTest.h | 5 +++--
libc/test/src/math/smoke/TruncTest.h | 5 +++--
libc/test/src/math/smoke/UfromfpTest.h | 2 +-
libc/test/src/math/smoke/UfromfpxTest.h | 2 +-
libc/test/src/math/smoke/nan_test.cpp | 2 +-
libc/test/src/math/smoke/nanf128_test.cpp | 2 +-
libc/test/src/math/smoke/nanf_test.cpp | 2 +-
libc/test/src/math/smoke/nanl_test.cpp | 2 +-
68 files changed, 123 insertions(+), 96 deletions(-)
diff --git a/libc/test/UnitTest/FEnvSafeTest.h b/libc/test/UnitTest/FEnvSafeTest.h
index a7565456c68a62..d5a8bb7ee667ce 100644
--- a/libc/test/UnitTest/FEnvSafeTest.h
+++ b/libc/test/UnitTest/FEnvSafeTest.h
@@ -29,7 +29,7 @@ class FEnvSafeTest : public Test {
fenv_t before;
FEnvSafeTest &test;
- public:
+ public:
explicit PreserveFEnv(FEnvSafeTest *self) : test{*self} {
test.get_fenv(before);
}
diff --git a/libc/test/src/fenv/enabled_exceptions_test.cpp b/libc/test/src/fenv/enabled_exceptions_test.cpp
index 0b0c2b369d476e..7d26eab5695bce 100644
--- a/libc/test/src/fenv/enabled_exceptions_test.cpp
+++ b/libc/test/src/fenv/enabled_exceptions_test.cpp
@@ -12,8 +12,8 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/macros/properties/architectures.h"
-#include "test/UnitTest/FPExceptMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPExceptMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/fenv_macros.h"
@@ -26,7 +26,8 @@ using LlvmLibcExceptionStatusTest = LIBC_NAMESPACE::testing::FEnvSafeTest;
// This test enables an exception and verifies that raising that exception
// triggers SIGFPE.
TEST_F(LlvmLibcExceptionStatusTest, RaiseAndCrash) {
-#if defined(LIBC_TARGET_ARCH_IS_ANY_ARM) || defined(LIBC_TARGET_ARCH_IS_ANY_RISCV)
+#if defined(LIBC_TARGET_ARCH_IS_ANY_ARM) || \
+ defined(LIBC_TARGET_ARCH_IS_ANY_RISCV)
// Few Arm HW implementations do not trap exceptions. We skip this test
// completely on such HW.
//
@@ -38,7 +39,7 @@ TEST_F(LlvmLibcExceptionStatusTest, RaiseAndCrash) {
LIBC_NAMESPACE::fputil::enable_except(FE_DIVBYZERO);
if (LIBC_NAMESPACE::fputil::get_except() == 0)
return;
-#endif // Architectures where exception trapping is not supported
+#endif // Architectures where exception trapping is not supported
// TODO: Install a floating point exception handler and verify that the
// the expected exception was raised. One will have to longjmp back from
diff --git a/libc/test/src/fenv/feholdexcept_test.cpp b/libc/test/src/fenv/feholdexcept_test.cpp
index b4e8201d6afb39..f3e05d4a5b6c0d 100644
--- a/libc/test/src/fenv/feholdexcept_test.cpp
+++ b/libc/test/src/fenv/feholdexcept_test.cpp
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/macros/properties/architectures.h"
-#include "test/UnitTest/FPExceptMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPExceptMatcher.h"
#include "test/UnitTest/Test.h"
#include "excepts.h"
diff --git a/libc/test/src/math/CeilTest.h b/libc/test/src/math/CeilTest.h
index 5cb7c078fa0a8f..b4c3752cc5c4ba 100644
--- a/libc/test/src/math/CeilTest.h
+++ b/libc/test/src/math/CeilTest.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -15,7 +15,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class CeilTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class CeilTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/CopySignTest.h b/libc/test/src/math/CopySignTest.h
index 9e885d2db94930..c66f91477480b8 100644
--- a/libc/test/src/math/CopySignTest.h
+++ b/libc/test/src/math/CopySignTest.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/FAbsTest.h b/libc/test/src/math/FAbsTest.h
index 7cfcac100cd1ef..92b589beeb675f 100644
--- a/libc/test/src/math/FAbsTest.h
+++ b/libc/test/src/math/FAbsTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_FABSTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_FABSTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -18,7 +18,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class FAbsTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FAbsTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FDimTest.h b/libc/test/src/math/FDimTest.h
index e006bfcad6faa5..fefcefe5052a92 100644
--- a/libc/test/src/math/FDimTest.h
+++ b/libc/test/src/math/FDimTest.h
@@ -9,8 +9,8 @@
#include "hdr/math_macros.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/FMaxTest.h b/libc/test/src/math/FMaxTest.h
index c4f42e3b965fbf..405642c6b96841 100644
--- a/libc/test/src/math/FMaxTest.h
+++ b/libc/test/src/math/FMaxTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_FMAXTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_FMAXTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -18,7 +18,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class FMaxTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FMaxTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FMinTest.h b/libc/test/src/math/FMinTest.h
index a05f1b6cad1c52..eae0008ddfe392 100644
--- a/libc/test/src/math/FMinTest.h
+++ b/libc/test/src/math/FMinTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_FMINTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_FMINTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -18,7 +18,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class FMinTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FMinTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FModTest.h b/libc/test/src/math/FModTest.h
index da5f502151cb34..f1015d6497fcd6 100644
--- a/libc/test/src/math/FModTest.h
+++ b/libc/test/src/math/FModTest.h
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
@@ -25,7 +25,8 @@
#define TEST_REGULAR(x, y, expected) TEST_SPECIAL(x, y, expected, false, 0)
-template <typename T> class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FloorTest.h b/libc/test/src/math/FloorTest.h
index 892c819cb8861a..9103a5b05eb5ad 100644
--- a/libc/test/src/math/FloorTest.h
+++ b/libc/test/src/math/FloorTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_FLOORTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_FLOORTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -18,7 +18,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class FloorTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FloorTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/FmaTest.h b/libc/test/src/math/FmaTest.h
index 5f315c53c2624a..5a40f694ebd107 100644
--- a/libc/test/src/math/FmaTest.h
+++ b/libc/test/src/math/FmaTest.h
@@ -12,8 +12,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/stdlib/rand.h"
#include "src/stdlib/srand.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/FrexpTest.h b/libc/test/src/math/FrexpTest.h
index 2bd8bd17e9a11c..3ba64afa3c6205 100644
--- a/libc/test/src/math/FrexpTest.h
+++ b/libc/test/src/math/FrexpTest.h
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/BasicOperations.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -16,7 +16,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class FrexpTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FrexpTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/HypotTest.h b/libc/test/src/math/HypotTest.h
index c86f1ffda577a9..58b53383182459 100644
--- a/libc/test/src/math/HypotTest.h
+++ b/libc/test/src/math/HypotTest.h
@@ -10,8 +10,8 @@
#define LLVM_LIBC_TEST_SRC_MATH_HYPOTTEST_H
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/LdExpTest.h b/libc/test/src/math/LdExpTest.h
index 68515e683f0878..34466a526d60fb 100644
--- a/libc/test/src/math/LdExpTest.h
+++ b/libc/test/src/math/LdExpTest.h
@@ -12,8 +12,8 @@
#include "src/__support/CPP/limits.h" // INT_MAX
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/NormalFloat.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
diff --git a/libc/test/src/math/LogbTest.h b/libc/test/src/math/LogbTest.h
index cdcbeb084d1cd9..d6042e3c200c76 100644
--- a/libc/test/src/math/LogbTest.h
+++ b/libc/test/src/math/LogbTest.h
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/ManipulationFunctions.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -16,7 +16,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class LogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class LogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/ModfTest.h b/libc/test/src/math/ModfTest.h
index 1d5228f8326589..d6c6f27a5edf66 100644
--- a/libc/test/src/math/ModfTest.h
+++ b/libc/test/src/math/ModfTest.h
@@ -8,8 +8,8 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -17,7 +17,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class ModfTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class ModfTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/NextAfterTest.h b/libc/test/src/math/NextAfterTest.h
index 2aac69d3f70246..b3b03f763992a0 100644
--- a/libc/test/src/math/NextAfterTest.h
+++ b/libc/test/src/math/NextAfterTest.h
@@ -14,8 +14,8 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/RIntTest.h b/libc/test/src/math/RIntTest.h
index 4431f0da6ad6b5..007b50427ba34a 100644
--- a/libc/test/src/math/RIntTest.h
+++ b/libc/test/src/math/RIntTest.h
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/RemQuoTest.h b/libc/test/src/math/RemQuoTest.h
index 339faf50798e3d..c39f2394555eac 100644
--- a/libc/test/src/math/RemQuoTest.h
+++ b/libc/test/src/math/RemQuoTest.h
@@ -12,8 +12,8 @@
#include "hdr/math_macros.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/RoundEvenTest.h b/libc/test/src/math/RoundEvenTest.h
index 560c4b27a5e196..d70555d3476591 100644
--- a/libc/test/src/math/RoundEvenTest.h
+++ b/libc/test/src/math/RoundEvenTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_ROUNDEVENTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_ROUNDEVENTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/RoundTest.h b/libc/test/src/math/RoundTest.h
index 0a7f57b8be85ec..2a31df305ac384 100644
--- a/libc/test/src/math/RoundTest.h
+++ b/libc/test/src/math/RoundTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_ROUNDTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_ROUNDTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -18,7 +18,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class RoundTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class RoundTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/RoundToIntegerTest.h b/libc/test/src/math/RoundToIntegerTest.h
index 3444d2039c31f1..0f052ba42a46d7 100644
--- a/libc/test/src/math/RoundToIntegerTest.h
+++ b/libc/test/src/math/RoundToIntegerTest.h
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -25,7 +25,8 @@ static constexpr int ROUNDING_MODES[4] = {FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO,
FE_TONEAREST};
template <typename F, typename I, bool TestModes = false>
-class RoundToIntegerTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+class RoundToIntegerTestTemplate
+ : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
typedef I (*RoundToIntegerFunc)(F);
diff --git a/libc/test/src/math/SqrtTest.h b/libc/test/src/math/SqrtTest.h
index 9f9dd0899be838..1c422e201bb234 100644
--- a/libc/test/src/math/SqrtTest.h
+++ b/libc/test/src/math/SqrtTest.h
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/bit.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -16,7 +16,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class SqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class SqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/TruncTest.h b/libc/test/src/math/TruncTest.h
index a3556968f2b9e2..bc5b76131291bb 100644
--- a/libc/test/src/math/TruncTest.h
+++ b/libc/test/src/math/TruncTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_TRUNCTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_TRUNCTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
@@ -18,7 +18,8 @@
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
-template <typename T> class TruncTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class TruncTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp b/libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp
index 762a3376ffbb50..b064b7e37f428d 100644
--- a/libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp
+++ b/libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp
@@ -9,8 +9,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h" // ldexp
#include "src/__support/FPUtil/generic/FMod.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
diff --git a/libc/test/src/math/smoke/CanonicalizeTest.h b/libc/test/src/math/smoke/CanonicalizeTest.h
index 5e40ab6e4db4f0..7e2456f84705c9 100644
--- a/libc/test/src/math/smoke/CanonicalizeTest.h
+++ b/libc/test/src/math/smoke/CanonicalizeTest.h
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/integer_literals.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
diff --git a/libc/test/src/math/smoke/CeilTest.h b/libc/test/src/math/smoke/CeilTest.h
index dbb99d670b463e..5e108c0e0feea1 100644
--- a/libc/test/src/math/smoke/CeilTest.h
+++ b/libc/test/src/math/smoke/CeilTest.h
@@ -9,13 +9,14 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_CEILTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_CEILTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class CeilTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class CeilTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/CopySignTest.h b/libc/test/src/math/smoke/CopySignTest.h
index 0099b88c36d2b2..1810560bf1bb8f 100644
--- a/libc/test/src/math/smoke/CopySignTest.h
+++ b/libc/test/src/math/smoke/CopySignTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_COPYSIGNTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_COPYSIGNTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
diff --git a/libc/test/src/math/smoke/FAbsTest.h b/libc/test/src/math/smoke/FAbsTest.h
index 9679d4b29890c2..048023b414299f 100644
--- a/libc/test/src/math/smoke/FAbsTest.h
+++ b/libc/test/src/math/smoke/FAbsTest.h
@@ -9,13 +9,14 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_FABSTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FABSTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class FAbsTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FAbsTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FDimTest.h b/libc/test/src/math/smoke/FDimTest.h
index 597c9f1be7938b..cff88f29a8efa8 100644
--- a/libc/test/src/math/smoke/FDimTest.h
+++ b/libc/test/src/math/smoke/FDimTest.h
@@ -8,8 +8,8 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FMaxTest.h b/libc/test/src/math/smoke/FMaxTest.h
index 439110b2beb29d..df8e35e0bd1620 100644
--- a/libc/test/src/math/smoke/FMaxTest.h
+++ b/libc/test/src/math/smoke/FMaxTest.h
@@ -9,11 +9,12 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-template <typename T> class FMaxTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FMaxTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMaximumMagNumTest.h b/libc/test/src/math/smoke/FMaximumMagNumTest.h
index db537ad28931cc..aafb6d2b0d5eac 100644
--- a/libc/test/src/math/smoke/FMaximumMagNumTest.h
+++ b/libc/test/src/math/smoke/FMaximumMagNumTest.h
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FMaximumMagTest.h b/libc/test/src/math/smoke/FMaximumMagTest.h
index 044a12123f1425..7bb79a69be580f 100644
--- a/libc/test/src/math/smoke/FMaximumMagTest.h
+++ b/libc/test/src/math/smoke/FMaximumMagTest.h
@@ -10,8 +10,8 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXIMUM_MAGTEST_H
#include "src/__support/FPUtil/BasicOperations.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FMaximumNumTest.h b/libc/test/src/math/smoke/FMaximumNumTest.h
index 81afaff6694e22..da0ea2c247a9ee 100644
--- a/libc/test/src/math/smoke/FMaximumNumTest.h
+++ b/libc/test/src/math/smoke/FMaximumNumTest.h
@@ -10,8 +10,8 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXIMUMNUMTEST_H
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FMaximumTest.h b/libc/test/src/math/smoke/FMaximumTest.h
index 31861f440d152c..1bd15163ed7529 100644
--- a/libc/test/src/math/smoke/FMaximumTest.h
+++ b/libc/test/src/math/smoke/FMaximumTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXIMUMTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMAXIMUMTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FMinTest.h b/libc/test/src/math/smoke/FMinTest.h
index 5484807b217182..f71b558cd3da20 100644
--- a/libc/test/src/math/smoke/FMinTest.h
+++ b/libc/test/src/math/smoke/FMinTest.h
@@ -9,11 +9,12 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-template <typename T> class FMinTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FMinTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FMinimumMagNumTest.h b/libc/test/src/math/smoke/FMinimumMagNumTest.h
index f29811403031d3..e4b8fd9e335311 100644
--- a/libc/test/src/math/smoke/FMinimumMagNumTest.h
+++ b/libc/test/src/math/smoke/FMinimumMagNumTest.h
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FMinimumMagTest.h b/libc/test/src/math/smoke/FMinimumMagTest.h
index a2daf6ad8119cc..3e16622fe3fa41 100644
--- a/libc/test/src/math/smoke/FMinimumMagTest.h
+++ b/libc/test/src/math/smoke/FMinimumMagTest.h
@@ -10,8 +10,8 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINIMUM_MAGTEST_H
#include "src/__support/FPUtil/BasicOperations.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FMinimumNumTest.h b/libc/test/src/math/smoke/FMinimumNumTest.h
index 8036282d368507..6186ea0df17cce 100644
--- a/libc/test/src/math/smoke/FMinimumNumTest.h
+++ b/libc/test/src/math/smoke/FMinimumNumTest.h
@@ -10,8 +10,8 @@
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINIMUMNUMTEST_H
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FMinimumTest.h b/libc/test/src/math/smoke/FMinimumTest.h
index 9d3dc40dfc2b74..a267f6c7832145 100644
--- a/libc/test/src/math/smoke/FMinimumTest.h
+++ b/libc/test/src/math/smoke/FMinimumTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINIMUMTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FMINIMUMTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FModTest.h b/libc/test/src/math/smoke/FModTest.h
index da5f502151cb34..f1015d6497fcd6 100644
--- a/libc/test/src/math/smoke/FModTest.h
+++ b/libc/test/src/math/smoke/FModTest.h
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
@@ -25,7 +25,8 @@
#define TEST_REGULAR(x, y, expected) TEST_SPECIAL(x, y, expected, false, 0)
-template <typename T> class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FloorTest.h b/libc/test/src/math/smoke/FloorTest.h
index 6f000d41395a0a..b2102459bc3de6 100644
--- a/libc/test/src/math/smoke/FloorTest.h
+++ b/libc/test/src/math/smoke/FloorTest.h
@@ -9,13 +9,14 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_FLOORTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_FLOORTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class FloorTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FloorTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FmaTest.h b/libc/test/src/math/smoke/FmaTest.h
index ac82a1218b99ca..7063ecf199837b 100644
--- a/libc/test/src/math/smoke/FmaTest.h
+++ b/libc/test/src/math/smoke/FmaTest.h
@@ -10,8 +10,8 @@
#define LLVM_LIBC_TEST_SRC_MATH_FMATEST_H
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FrexpTest.h b/libc/test/src/math/smoke/FrexpTest.h
index cd70885deb332a..e9e496422f7326 100644
--- a/libc/test/src/math/smoke/FrexpTest.h
+++ b/libc/test/src/math/smoke/FrexpTest.h
@@ -7,11 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/BasicOperations.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-template <typename T> class FrexpTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class FrexpTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/FromfpTest.h b/libc/test/src/math/smoke/FromfpTest.h
index 6c7c7ad2afcbd5..f19f21ce47e7f9 100644
--- a/libc/test/src/math/smoke/FromfpTest.h
+++ b/libc/test/src/math/smoke/FromfpTest.h
@@ -9,8 +9,8 @@
#ifndef LIBC_TEST_SRC_MATH_SMOKE_FROMFPTEST_H
#define LIBC_TEST_SRC_MATH_SMOKE_FROMFPTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/FromfpxTest.h b/libc/test/src/math/smoke/FromfpxTest.h
index 344cb3345ef15f..4aa47a68bb1783 100644
--- a/libc/test/src/math/smoke/FromfpxTest.h
+++ b/libc/test/src/math/smoke/FromfpxTest.h
@@ -9,8 +9,8 @@
#ifndef LIBC_TEST_SRC_MATH_SMOKE_FROMFPXTEST_H
#define LIBC_TEST_SRC_MATH_SMOKE_FROMFPXTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/HypotTest.h b/libc/test/src/math/smoke/HypotTest.h
index 6cf6ca13428a5d..80e9bb7366dfea 100644
--- a/libc/test/src/math/smoke/HypotTest.h
+++ b/libc/test/src/math/smoke/HypotTest.h
@@ -10,8 +10,8 @@
#define LLVM_LIBC_TEST_SRC_MATH_HYPOTTEST_H
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
diff --git a/libc/test/src/math/smoke/LdExpTest.h b/libc/test/src/math/smoke/LdExpTest.h
index 9c201302280aaf..713d305c47494a 100644
--- a/libc/test/src/math/smoke/LdExpTest.h
+++ b/libc/test/src/math/smoke/LdExpTest.h
@@ -12,8 +12,8 @@
#include "src/__support/CPP/limits.h" // INT_MAX
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/NormalFloat.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include <stdint.h>
diff --git a/libc/test/src/math/smoke/LogbTest.h b/libc/test/src/math/smoke/LogbTest.h
index 901a8e5cfeb6e7..4938fcf8f6f16e 100644
--- a/libc/test/src/math/smoke/LogbTest.h
+++ b/libc/test/src/math/smoke/LogbTest.h
@@ -7,11 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/ManipulationFunctions.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-template <typename T> class LogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class LogbTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/ModfTest.h b/libc/test/src/math/smoke/ModfTest.h
index 0e2ed38afc5c72..85db2d6d967b20 100644
--- a/libc/test/src/math/smoke/ModfTest.h
+++ b/libc/test/src/math/smoke/ModfTest.h
@@ -8,13 +8,14 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class ModfTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class ModfTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/NextAfterTest.h b/libc/test/src/math/smoke/NextAfterTest.h
index f7785b9bfeb58d..65dba9338285b6 100644
--- a/libc/test/src/math/smoke/NextAfterTest.h
+++ b/libc/test/src/math/smoke/NextAfterTest.h
@@ -14,8 +14,8 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#define ASSERT_FP_EQ_WITH_EXCEPTION(result, expected, expected_exception) \
diff --git a/libc/test/src/math/smoke/NextDownTest.h b/libc/test/src/math/smoke/NextDownTest.h
index e386370e733454..b54c6d5763222f 100644
--- a/libc/test/src/math/smoke/NextDownTest.h
+++ b/libc/test/src/math/smoke/NextDownTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_NEXTDOWNTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_NEXTDOWNTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/NextTowardTest.h b/libc/test/src/math/smoke/NextTowardTest.h
index 2c1855eaccee8d..1894d324b08546 100644
--- a/libc/test/src/math/smoke/NextTowardTest.h
+++ b/libc/test/src/math/smoke/NextTowardTest.h
@@ -15,8 +15,8 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#define ASSERT_FP_EQ_WITH_EXCEPTION(result, expected, expected_exception) \
diff --git a/libc/test/src/math/smoke/NextUpTest.h b/libc/test/src/math/smoke/NextUpTest.h
index 504e6540496970..7f66c115dfc2dc 100644
--- a/libc/test/src/math/smoke/NextUpTest.h
+++ b/libc/test/src/math/smoke/NextUpTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_NEXTUPTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_NEXTUPTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/RIntTest.h b/libc/test/src/math/smoke/RIntTest.h
index 6dffc6f4fe6329..1412c3f27a2d5f 100644
--- a/libc/test/src/math/smoke/RIntTest.h
+++ b/libc/test/src/math/smoke/RIntTest.h
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/fenv_macros.h"
diff --git a/libc/test/src/math/smoke/RemQuoTest.h b/libc/test/src/math/smoke/RemQuoTest.h
index 114c494b8a6b3b..43eee3d38e4495 100644
--- a/libc/test/src/math/smoke/RemQuoTest.h
+++ b/libc/test/src/math/smoke/RemQuoTest.h
@@ -12,8 +12,8 @@
#include "hdr/math_macros.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/RoundEvenTest.h b/libc/test/src/math/smoke/RoundEvenTest.h
index ee7f0cb532e3ae..479b70912fedc9 100644
--- a/libc/test/src/math/smoke/RoundEvenTest.h
+++ b/libc/test/src/math/smoke/RoundEvenTest.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_ROUNDEVENTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_ROUNDEVENTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
diff --git a/libc/test/src/math/smoke/RoundTest.h b/libc/test/src/math/smoke/RoundTest.h
index 9ef455f093b45e..36994f27eb4c05 100644
--- a/libc/test/src/math/smoke/RoundTest.h
+++ b/libc/test/src/math/smoke/RoundTest.h
@@ -9,13 +9,14 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_ROUNDTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_ROUNDTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class RoundTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class RoundTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/RoundToIntegerTest.h b/libc/test/src/math/smoke/RoundToIntegerTest.h
index da5fe759270a0c..50bcd4a6a76c0d 100644
--- a/libc/test/src/math/smoke/RoundToIntegerTest.h
+++ b/libc/test/src/math/smoke/RoundToIntegerTest.h
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
@@ -22,7 +22,8 @@ static constexpr int ROUNDING_MODES[4] = {FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO,
FE_TONEAREST};
template <typename F, typename I, bool TestModes = false>
-class RoundToIntegerTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+class RoundToIntegerTestTemplate
+ : public LIBC_NAMESPACE::testing::FEnvSafeTest {
public:
typedef I (*RoundToIntegerFunc)(F);
diff --git a/libc/test/src/math/smoke/SqrtTest.h b/libc/test/src/math/smoke/SqrtTest.h
index 111468913a485a..8afacaf01ae428 100644
--- a/libc/test/src/math/smoke/SqrtTest.h
+++ b/libc/test/src/math/smoke/SqrtTest.h
@@ -7,13 +7,14 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/bit.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class SqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class SqrtTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/TruncTest.h b/libc/test/src/math/smoke/TruncTest.h
index 88c08f4ecf9dbb..1d9c44dfb37488 100644
--- a/libc/test/src/math/smoke/TruncTest.h
+++ b/libc/test/src/math/smoke/TruncTest.h
@@ -9,13 +9,14 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SMOKE_TRUNCTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_SMOKE_TRUNCTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-template <typename T> class TruncTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
+template <typename T>
+class TruncTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
DECLARE_SPECIAL_CONSTANTS(T)
diff --git a/libc/test/src/math/smoke/UfromfpTest.h b/libc/test/src/math/smoke/UfromfpTest.h
index 561b52943179a6..1c04049ebb4fa4 100644
--- a/libc/test/src/math/smoke/UfromfpTest.h
+++ b/libc/test/src/math/smoke/UfromfpTest.h
@@ -9,8 +9,8 @@
#ifndef LIBC_TEST_SRC_MATH_SMOKE_UFROMFPTEST_H
#define LIBC_TEST_SRC_MATH_SMOKE_UFROMFPTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/UfromfpxTest.h b/libc/test/src/math/smoke/UfromfpxTest.h
index 1e829f87ca379d..973bc8a4d1be7b 100644
--- a/libc/test/src/math/smoke/UfromfpxTest.h
+++ b/libc/test/src/math/smoke/UfromfpxTest.h
@@ -9,8 +9,8 @@
#ifndef LIBC_TEST_SRC_MATH_SMOKE_UFROMFPXTEST_H
#define LIBC_TEST_SRC_MATH_SMOKE_UFROMFPXTEST_H
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
template <typename T>
diff --git a/libc/test/src/math/smoke/nan_test.cpp b/libc/test/src/math/smoke/nan_test.cpp
index 41ca31daaaf725..2ddef58325671f 100644
--- a/libc/test/src/math/smoke/nan_test.cpp
+++ b/libc/test/src/math/smoke/nan_test.cpp
@@ -8,8 +8,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/nan.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include <signal.h>
diff --git a/libc/test/src/math/smoke/nanf128_test.cpp b/libc/test/src/math/smoke/nanf128_test.cpp
index 2119f9c0a8c2bf..8c15c532ebcf4c 100644
--- a/libc/test/src/math/smoke/nanf128_test.cpp
+++ b/libc/test/src/math/smoke/nanf128_test.cpp
@@ -9,8 +9,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/uint128.h"
#include "src/math/nanf128.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
class LlvmLibcNanf128Test : public LIBC_NAMESPACE::testing::FEnvSafeTest {
diff --git a/libc/test/src/math/smoke/nanf_test.cpp b/libc/test/src/math/smoke/nanf_test.cpp
index 9a5d90a9748bde..71f888c610aafc 100644
--- a/libc/test/src/math/smoke/nanf_test.cpp
+++ b/libc/test/src/math/smoke/nanf_test.cpp
@@ -8,8 +8,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/nanf.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include <signal.h>
diff --git a/libc/test/src/math/smoke/nanl_test.cpp b/libc/test/src/math/smoke/nanl_test.cpp
index 0af724631f892c..7fff20b1e7be3c 100644
--- a/libc/test/src/math/smoke/nanl_test.cpp
+++ b/libc/test/src/math/smoke/nanl_test.cpp
@@ -8,8 +8,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/nanl.h"
-#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/FEnvSafeTest.h"
+#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
#include <signal.h>
>From 0000a8d97d97fd5a80e67e37bcbf42dc1ab611b1 Mon Sep 17 00:00:00 2001
From: Roland McGrath <mcgrathr at google.com>
Date: Tue, 23 Apr 2024 13:19:44 -0700
Subject: [PATCH 3/3] Update BUILD.bazel by blind guessing
---
.../llvm-project-overlay/libc/test/UnitTest/BUILD.bazel | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
index b1140a5a160903..87cdcb923ef318 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
@@ -65,10 +65,12 @@ libc_support_library(
libc_support_library(
name = "fp_test_helpers",
srcs = [
+ "FEnvSafeTest.cpp",
"FPExceptMatcher.cpp",
"RoundingModeUtils.cpp",
],
hdrs = [
+ "FEnvSafeTest.h",
"FPExceptMatcher.h",
"FPMatcher.h",
"RoundingModeUtils.h",
@@ -86,8 +88,8 @@ libc_support_library(
"//libc:__support_fputil_fpbits_str",
"//libc:__support_fputil_rounding_mode",
"//libc:hdr_math_macros",
- "//libc:hdr_fenv_macros",
- "//libc:types_fenv_t",
+ "//libc:hdr_fenv_macros",
+ "//libc:types_fenv_t",
],
)
More information about the llvm-commits
mailing list