diff --git a/libc/src/__support/FPUtil/CMakeLists.txt b/libc/src/__support/FPUtil/CMakeLists.txt --- a/libc/src/__support/FPUtil/CMakeLists.txt +++ b/libc/src/__support/FPUtil/CMakeLists.txt @@ -35,19 +35,3 @@ libc.src.__support.common libc.src.__support.CPP.standalone_cpp ) - -add_library( - LibcFPTestHelpers - FPExceptMatcher.cpp - FPExceptMatcher.h - TestHelpers.cpp - TestHelpers.h -) -target_include_directories(LibcFPTestHelpers PUBLIC ${LIBC_SOURCE_DIR}) -target_link_libraries(LibcFPTestHelpers LibcUnitTest) -add_dependencies( - LibcFPTestHelpers - LibcUnitTest - libc.src.__support.CPP.standalone_cpp - libc.src.__support.FPUtil.fputil -) diff --git a/libc/test/src/fenv/enabled_exceptions_test.cpp b/libc/test/src/fenv/enabled_exceptions_test.cpp --- a/libc/test/src/fenv/enabled_exceptions_test.cpp +++ b/libc/test/src/fenv/enabled_exceptions_test.cpp @@ -11,7 +11,7 @@ #include "src/fenv/fetestexcept.h" #include "src/__support/FPUtil/FEnvUtils.h" -#include "src/__support/FPUtil/FPExceptMatcher.h" +#include "utils/UnitTest/FPExceptMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/fenv/feholdexcept_test.cpp b/libc/test/src/fenv/feholdexcept_test.cpp --- a/libc/test/src/fenv/feholdexcept_test.cpp +++ b/libc/test/src/fenv/feholdexcept_test.cpp @@ -9,7 +9,7 @@ #include "src/fenv/feholdexcept.h" #include "src/__support/FPUtil/FEnvUtils.h" -#include "src/__support/FPUtil/FPExceptMatcher.h" +#include "utils/UnitTest/FPExceptMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/CeilTest.h b/libc/test/src/math/CeilTest.h --- a/libc/test/src/math/CeilTest.h +++ b/libc/test/src/math/CeilTest.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/CopySignTest.h b/libc/test/src/math/CopySignTest.h --- a/libc/test/src/math/CopySignTest.h +++ b/libc/test/src/math/CopySignTest.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/FAbsTest.h b/libc/test/src/math/FAbsTest.h --- a/libc/test/src/math/FAbsTest.h +++ b/libc/test/src/math/FAbsTest.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/FDimTest.h b/libc/test/src/math/FDimTest.h --- a/libc/test/src/math/FDimTest.h +++ b/libc/test/src/math/FDimTest.h @@ -8,7 +8,7 @@ #include "src/__support/FPUtil/BasicOperations.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/FMaxTest.h b/libc/test/src/math/FMaxTest.h --- a/libc/test/src/math/FMaxTest.h +++ b/libc/test/src/math/FMaxTest.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/FMinTest.h b/libc/test/src/math/FMinTest.h --- a/libc/test/src/math/FMinTest.h +++ b/libc/test/src/math/FMinTest.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/FloorTest.h b/libc/test/src/math/FloorTest.h --- a/libc/test/src/math/FloorTest.h +++ b/libc/test/src/math/FloorTest.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/FmaTest.h b/libc/test/src/math/FmaTest.h --- a/libc/test/src/math/FmaTest.h +++ b/libc/test/src/math/FmaTest.h @@ -10,8 +10,8 @@ #define LLVM_LIBC_TEST_SRC_MATH_FMATEST_H #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include "utils/testutils/RandUtils.h" diff --git a/libc/test/src/math/FrexpTest.h b/libc/test/src/math/FrexpTest.h --- 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 "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/HypotTest.h b/libc/test/src/math/HypotTest.h --- a/libc/test/src/math/HypotTest.h +++ b/libc/test/src/math/HypotTest.h @@ -11,8 +11,8 @@ #include "src/__support/FPUtil/FPBits.h" #include "src/__support/FPUtil/Hypot.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/LdExpTest.h b/libc/test/src/math/LdExpTest.h --- a/libc/test/src/math/LdExpTest.h +++ b/libc/test/src/math/LdExpTest.h @@ -11,7 +11,7 @@ #include "src/__support/FPUtil/FPBits.h" #include "src/__support/FPUtil/NormalFloat.h" -#include "src/__support/FPUtil/TestHelpers.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/LogbTest.h b/libc/test/src/math/LogbTest.h --- 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 "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/ModfTest.h b/libc/test/src/math/ModfTest.h --- 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 "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/NextAfterTest.h b/libc/test/src/math/NextAfterTest.h --- a/libc/test/src/math/NextAfterTest.h +++ b/libc/test/src/math/NextAfterTest.h @@ -12,7 +12,7 @@ #include "src/__support/CPP/TypeTraits.h" #include "src/__support/FPUtil/BasicOperations.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/RIntTest.h b/libc/test/src/math/RIntTest.h --- a/libc/test/src/math/RIntTest.h +++ b/libc/test/src/math/RIntTest.h @@ -11,8 +11,8 @@ #include "src/__support/FPUtil/FEnvUtils.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/RemQuoTest.h b/libc/test/src/math/RemQuoTest.h --- a/libc/test/src/math/RemQuoTest.h +++ b/libc/test/src/math/RemQuoTest.h @@ -11,8 +11,8 @@ #include "src/__support/FPUtil/BasicOperations.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/RoundTest.h b/libc/test/src/math/RoundTest.h --- a/libc/test/src/math/RoundTest.h +++ b/libc/test/src/math/RoundTest.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/SqrtTest.h b/libc/test/src/math/SqrtTest.h --- a/libc/test/src/math/SqrtTest.h +++ b/libc/test/src/math/SqrtTest.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/TruncTest.h b/libc/test/src/math/TruncTest.h --- a/libc/test/src/math/TruncTest.h +++ b/libc/test/src/math/TruncTest.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/cos_test.cpp b/libc/test/src/math/cos_test.cpp --- a/libc/test/src/math/cos_test.cpp +++ b/libc/test/src/math/cos_test.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/cos.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/cosf_test.cpp b/libc/test/src/math/cosf_test.cpp --- a/libc/test/src/math/cosf_test.cpp +++ b/libc/test/src/math/cosf_test.cpp @@ -8,10 +8,10 @@ #include "src/__support/CPP/Array.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/cosf.h" #include "test/src/math/sdcomp26094.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/exp2f_test.cpp b/libc/test/src/math/exp2f_test.cpp --- a/libc/test/src/math/exp2f_test.cpp +++ b/libc/test/src/math/exp2f_test.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/exp2f.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/expf_test.cpp b/libc/test/src/math/expf_test.cpp --- a/libc/test/src/math/expf_test.cpp +++ b/libc/test/src/math/expf_test.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/expf.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/expm1f_test.cpp b/libc/test/src/math/expm1f_test.cpp --- a/libc/test/src/math/expm1f_test.cpp +++ b/libc/test/src/math/expm1f_test.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/expm1f.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/fdim_test.cpp b/libc/test/src/math/fdim_test.cpp --- a/libc/test/src/math/fdim_test.cpp +++ b/libc/test/src/math/fdim_test.cpp @@ -9,8 +9,8 @@ #include "FDimTest.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/fdim.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/fdimf_test.cpp b/libc/test/src/math/fdimf_test.cpp --- a/libc/test/src/math/fdimf_test.cpp +++ b/libc/test/src/math/fdimf_test.cpp @@ -9,8 +9,8 @@ #include "FDimTest.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/fdimf.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/fdiml_test.cpp b/libc/test/src/math/fdiml_test.cpp --- a/libc/test/src/math/fdiml_test.cpp +++ b/libc/test/src/math/fdiml_test.cpp @@ -9,8 +9,8 @@ #include "FDimTest.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/fdiml.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/ilogb_test.cpp b/libc/test/src/math/ilogb_test.cpp --- a/libc/test/src/math/ilogb_test.cpp +++ b/libc/test/src/math/ilogb_test.cpp @@ -10,8 +10,8 @@ #include "src/__support/FPUtil/FPBits.h" #include "src/__support/FPUtil/ManipulationFunctions.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/ilogb.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/ilogbf_test.cpp b/libc/test/src/math/ilogbf_test.cpp --- a/libc/test/src/math/ilogbf_test.cpp +++ b/libc/test/src/math/ilogbf_test.cpp @@ -10,8 +10,8 @@ #include "src/__support/FPUtil/FPBits.h" #include "src/__support/FPUtil/ManipulationFunctions.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/ilogbf.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/ilogbl_test.cpp b/libc/test/src/math/ilogbl_test.cpp --- a/libc/test/src/math/ilogbl_test.cpp +++ b/libc/test/src/math/ilogbl_test.cpp @@ -10,8 +10,8 @@ #include "src/__support/FPUtil/FPBits.h" #include "src/__support/FPUtil/ManipulationFunctions.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/ilogbl.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/mod_k_pi_test.cpp b/libc/test/src/math/mod_k_pi_test.cpp --- a/libc/test/src/math/mod_k_pi_test.cpp +++ b/libc/test/src/math/mod_k_pi_test.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/generic/dp_trig.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/sin_test.cpp b/libc/test/src/math/sin_test.cpp --- a/libc/test/src/math/sin_test.cpp +++ b/libc/test/src/math/sin_test.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/sin.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/sincosf_test.cpp b/libc/test/src/math/sincosf_test.cpp --- a/libc/test/src/math/sincosf_test.cpp +++ b/libc/test/src/math/sincosf_test.cpp @@ -8,10 +8,10 @@ #include "src/__support/CPP/Array.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/sincosf.h" #include "test/src/math/sdcomp26094.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/sinf_test.cpp b/libc/test/src/math/sinf_test.cpp --- a/libc/test/src/math/sinf_test.cpp +++ b/libc/test/src/math/sinf_test.cpp @@ -8,10 +8,10 @@ #include "src/__support/CPP/Array.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/sinf.h" #include "test/src/math/sdcomp26094.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/tan_test.cpp b/libc/test/src/math/tan_test.cpp --- a/libc/test/src/math/tan_test.cpp +++ b/libc/test/src/math/tan_test.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/FPUtil/TestHelpers.h" #include "src/math/tan.h" #include "utils/MPFRWrapper/MPFRUtils.h" +#include "utils/UnitTest/FPMatcher.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/utils/MPFRWrapper/MPFRUtils.cpp b/libc/utils/MPFRWrapper/MPFRUtils.cpp --- a/libc/utils/MPFRWrapper/MPFRUtils.cpp +++ b/libc/utils/MPFRWrapper/MPFRUtils.cpp @@ -10,7 +10,7 @@ #include "src/__support/CPP/StringView.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/FPUtil/TestHelpers.h" +#include "utils/UnitTest/FPMatcher.h" #include #include diff --git a/libc/utils/UnitTest/CMakeLists.txt b/libc/utils/UnitTest/CMakeLists.txt --- a/libc/utils/UnitTest/CMakeLists.txt +++ b/libc/utils/UnitTest/CMakeLists.txt @@ -17,3 +17,18 @@ add_dependencies(LibcUnitTestMain LibcUnitTest libc.src.__support.CPP.standalone_cpp) target_link_libraries(LibcUnitTestMain PUBLIC LibcUnitTest libc_test_utils) +add_library( + LibcFPTestHelpers + FPExceptMatcher.cpp + FPExceptMatcher.h + FPMatcher.cpp + FPMatcher.h +) +target_include_directories(LibcFPTestHelpers PUBLIC ${LIBC_SOURCE_DIR}) +target_link_libraries(LibcFPTestHelpers LibcUnitTest) +add_dependencies( + LibcFPTestHelpers + LibcUnitTest + libc.src.__support.CPP.standalone_cpp + libc.src.__support.FPUtil.fputil +) diff --git a/libc/src/__support/FPUtil/FPExceptMatcher.h b/libc/utils/UnitTest/FPExceptMatcher.h rename from libc/src/__support/FPUtil/FPExceptMatcher.h rename to libc/utils/UnitTest/FPExceptMatcher.h --- a/libc/src/__support/FPUtil/FPExceptMatcher.h +++ b/libc/utils/UnitTest/FPExceptMatcher.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_LIBC_SRC_SUPPORT_FPUTIL_FP_EXCEPT_MATCHER_H -#define LLVM_LIBC_SRC_SUPPORT_FPUTIL_FP_EXCEPT_MATCHER_H +#ifndef LLVM_LIBC_UTILS_UNITTEST_FPEXCEPTMATCHER_H +#define LLVM_LIBC_UTILS_UNITTEST_FPEXCEPTMATCHER_H #ifndef LLVM_LIBC_TEST_USE_FUCHSIA @@ -64,4 +64,4 @@ #define ASSERT_RAISES_FP_EXCEPT(func) ASSERT_DEATH(func, WITH_SIGNAL(SIGFPE)) #endif // LLVM_LIBC_TEST_USE_FUCHSIA -#endif // LLVM_LIBC_SRC_SUPPORT_FPUTIL_FP_EXCEPT_MATCHER_H +#endif // LLVM_LIBC_UTILS_UNITTEST_FPEXCEPTMATCHER_H diff --git a/libc/src/__support/FPUtil/FPExceptMatcher.cpp b/libc/utils/UnitTest/FPExceptMatcher.cpp rename from libc/src/__support/FPUtil/FPExceptMatcher.cpp rename to libc/utils/UnitTest/FPExceptMatcher.cpp diff --git a/libc/src/__support/FPUtil/TestHelpers.h b/libc/utils/UnitTest/FPMatcher.h rename from libc/src/__support/FPUtil/TestHelpers.h rename to libc/utils/UnitTest/FPMatcher.h --- a/libc/src/__support/FPUtil/TestHelpers.h +++ b/libc/utils/UnitTest/FPMatcher.h @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_LIBC_SRC_SUPPORT_FPUTIL_TEST_HELPERS_H -#define LLVM_LIBC_SRC_SUPPORT_FPUTIL_TEST_HELPERS_H +#ifndef LLVM_LIBC_UTILS_UNITTEST_FPMATCHER_H +#define LLVM_LIBC_UTILS_UNITTEST_FPMATCHER_H -#include "FPBits.h" +#include "src/__support/FPUtil/FPBits.h" #include "utils/UnitTest/Test.h" @@ -98,4 +98,4 @@ __llvm_libc::fputil::testing::getMatcher<__llvm_libc::testing::Cond_NE>( \ expected)) -#endif // LLVM_LIBC_SRC_SUPPORT_FPUTIL_TEST_HELPERS_H +#endif // LLVM_LIBC_UTILS_UNITTEST_FPMATCHER_H diff --git a/libc/src/__support/FPUtil/TestHelpers.cpp b/libc/utils/UnitTest/FPMatcher.cpp rename from libc/src/__support/FPUtil/TestHelpers.cpp rename to libc/utils/UnitTest/FPMatcher.cpp --- a/libc/src/__support/FPUtil/TestHelpers.cpp +++ b/libc/utils/UnitTest/FPMatcher.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include "TestHelpers.h" +#include "FPMatcher.h" -#include "FPBits.h" +#include "src/__support/FPUtil/FPBits.h" #include