diff --git a/libc/test/src/CMakeLists.txt b/libc/test/src/CMakeLists.txt --- a/libc/test/src/CMakeLists.txt +++ b/libc/test/src/CMakeLists.txt @@ -15,7 +15,7 @@ endif() if(MATH_UNITTEST_NEED_MPFR) - list(APPEND MATH_UNITTEST_LINK_LIBRARIES libcMPFRWrapper -lmpfr -lgmp) + list(APPEND MATH_UNITTEST_LINK_LIBRARIES libcMPFRWrapper libc_math_test_utils -lmpfr -lgmp) endif() list(APPEND MATH_UNITTEST_LINK_LIBRARIES LibcFPTestHelpers) diff --git a/libc/test/src/math/CMakeLists.txt b/libc/test/src/math/CMakeLists.txt --- a/libc/test/src/math/CMakeLists.txt +++ b/libc/test/src/math/CMakeLists.txt @@ -1,5 +1,11 @@ add_libc_testsuite(libc_math_unittests) +add_library( + libc_math_test_utils + RandUtils.cpp + RandUtils.h +) + add_fp_unittest( cosf_test NEED_MPFR 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 @@ -12,8 +12,8 @@ #include "src/__support/FPUtil/FPBits.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" +#include "test/src/math/RandUtils.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include "utils/testutils/RandUtils.h" namespace mpfr = __llvm_libc::testing::mpfr; diff --git a/libc/utils/testutils/RandUtils.h b/libc/test/src/math/RandUtils.h rename from libc/utils/testutils/RandUtils.h rename to libc/test/src/math/RandUtils.h diff --git a/libc/utils/testutils/RandUtils.cpp b/libc/test/src/math/RandUtils.cpp rename from libc/utils/testutils/RandUtils.cpp rename to libc/test/src/math/RandUtils.cpp diff --git a/libc/utils/testutils/CMakeLists.txt b/libc/utils/testutils/CMakeLists.txt --- a/libc/utils/testutils/CMakeLists.txt +++ b/libc/utils/testutils/CMakeLists.txt @@ -5,8 +5,6 @@ add_library( libc_test_utils - RandUtils.cpp - RandUtils.h StreamWrapper.cpp StreamWrapper.h ${EFFile}