commit 2ea61a50902ff27ba7df75c0b4acd49b353b4ed4
author Joseph Huber <jhuber6@vols.utk.edu> Thu May 25 19:15:02 2023 -0500
committer Copybara-Service <copybara-worker@google.com> Thu May 25 17:20:44 2023 -0700
tree 144515073fe479f359a3d17961910a3c84076b34
parent 9a29034b544daeded68fe55d2c3305f654dc239c

Revert "[libc] Enable hermetic floating point tests"

This passed locally but unfortauntely it seems some tests are not ready
to be made hermetic. Revert for now until we can investigate
specifically which tests are failing and mark those as `UNIT_TEST_ONLY`.

This reverts commit 417ea79e792a87d53f5ac4f5388af4b25aa04d7d.

GitOrigin-RevId: 4311246a3a31687f94b519de322c63998bcff3be

test/UnitTest/RoundingModeUtils.cpp

diff --git a/test/UnitTest/RoundingModeUtils.cpp b/test/UnitTest/RoundingModeUtils.cpp
index c55e0d7..8cc6834 100644
--- a/test/UnitTest/RoundingModeUtils.cpp
+++ b/test/UnitTest/RoundingModeUtils.cpp
@@ -8,7 +8,7 @@
 
 #include "RoundingModeUtils.h"
 
-#include "src/__support/FPUtil/FEnvImpl.h"
+#include <fenv.h>
 
 namespace __llvm_libc {
 namespace fputil {
@@ -34,15 +34,15 @@
 }
 
 ForceRoundingMode::ForceRoundingMode(RoundingMode mode) {
-  old_rounding_mode = get_round();
+  old_rounding_mode = fegetround();
   rounding_mode = get_fe_rounding(mode);
   if (old_rounding_mode != rounding_mode)
-    set_round(rounding_mode);
+    fesetround(rounding_mode);
 }
 
 ForceRoundingMode::~ForceRoundingMode() {
   if (old_rounding_mode != rounding_mode)
-    set_round(old_rounding_mode);
+    fesetround(old_rounding_mode);
 }
 
 } // namespace testing

test/src/CMakeLists.txt

diff --git a/test/src/CMakeLists.txt b/test/src/CMakeLists.txt
index 52452cd..9e6c02c 100644
--- a/test/src/CMakeLists.txt
+++ b/test/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 function(add_fp_unittest name)
   cmake_parse_arguments(
     "MATH_UNITTEST"
-    "NEED_MPFR;UNIT_TEST_ONLY;HERMETIC_TEST_ONLY" # Optional arguments
+    "NEED_MPFR;HERMETIC_TEST_ONLY" # Optional arguments
     "" # Single value arguments
     "LINK_LIBRARIES" # Multi-value arguments
     ${ARGN}
@@ -16,8 +16,6 @@
 
   if(MATH_UNITTEST_HERMETIC_TEST_ONLY)
     set(test_type HERMETIC_TEST_ONLY)
-  elseif(MATH_UNITTEST_UNIT_TEST_ONLY)
-    set(test_type UNIT_TEST_ONLY)
   endif()
   if(MATH_UNITTEST_NEED_MPFR)
     if(MATH_UNITTEST_HERMETIC_TEST_ONLY)
@@ -28,7 +26,7 @@
   endif()
   list(APPEND MATH_UNITTEST_LINK_LIBRARIES LibcFPTestHelpers)
 
-  add_libc_test(
+  add_libc_unittest(
     ${name}
     ${test_type}
     LINK_LIBRARIES "${MATH_UNITTEST_LINK_LIBRARIES}"

test/src/fenv/CMakeLists.txt

diff --git a/test/src/fenv/CMakeLists.txt b/test/src/fenv/CMakeLists.txt
index 6334d36..11179cc 100644
--- a/test/src/fenv/CMakeLists.txt
+++ b/test/src/fenv/CMakeLists.txt
@@ -106,7 +106,6 @@
       libc.src.__support.FPUtil.fenv_impl
     LINK_LIBRARIES
       LibcFPExceptionHelpers
-    UNIT_TEST_ONLY
   )
 
   add_fp_unittest(
@@ -121,6 +120,5 @@
       libc.src.__support.FPUtil.fenv_impl
     LINK_LIBRARIES
       LibcFPExceptionHelpers
-    UNIT_TEST_ONLY
   )
 endif()