[libc-commits] [libc] af1315c - [libc][NFC] Move UnitTest and IntegrationTest to the 'test' directory.
Siva Chandra Reddy via libc-commits
libc-commits at lists.llvm.org
Tue Feb 7 11:46:41 PST 2023
Author: Siva Chandra Reddy
Date: 2023-02-07T19:45:51Z
New Revision: af1315c28f9bab76d3c2e1492a3d41e7c48215f8
URL: https://github.com/llvm/llvm-project/commit/af1315c28f9bab76d3c2e1492a3d41e7c48215f8
DIFF: https://github.com/llvm/llvm-project/commit/af1315c28f9bab76d3c2e1492a3d41e7c48215f8.diff
LOG: [libc][NFC] Move UnitTest and IntegrationTest to the 'test' directory.
This part of the effort to make all test related pieces into the `test`
directory. This helps is excluding test related pieces in a straight
forward manner if LLVM_INCLUDE_TESTS is OFF. Future patches will also move
the MPFR wrapper and testutils into the 'test' directory.
Added:
libc/test/IntegrationTest/CMakeLists.txt
libc/test/IntegrationTest/test.cpp
libc/test/IntegrationTest/test.h
libc/test/UnitTest/CMakeLists.txt
libc/test/UnitTest/FPExceptMatcher.cpp
libc/test/UnitTest/FPExceptMatcher.h
libc/test/UnitTest/FPMatcher.cpp
libc/test/UnitTest/FPMatcher.h
libc/test/UnitTest/FuchsiaTest.h
libc/test/UnitTest/LibcTest.cpp
libc/test/UnitTest/LibcTest.h
libc/test/UnitTest/LibcTestMain.cpp
libc/test/UnitTest/MemoryMatcher.cpp
libc/test/UnitTest/MemoryMatcher.h
libc/test/UnitTest/PlatformDefs.h
libc/test/UnitTest/PrintfMatcher.cpp
libc/test/UnitTest/PrintfMatcher.h
libc/test/UnitTest/README.md
libc/test/UnitTest/ScanfMatcher.cpp
libc/test/UnitTest/ScanfMatcher.h
libc/test/UnitTest/StringUtils.h
libc/test/UnitTest/Test.h
utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
Modified:
libc/cmake/modules/LLVMLibCTestRules.cmake
libc/test/CMakeLists.txt
libc/test/ErrnoSetterMatcher.h
libc/test/integration/src/__support/threads/thread_detach_test.cpp
libc/test/integration/src/__support/threads/thread_tls_test.cpp
libc/test/integration/src/pthread/pthread_equal_test.cpp
libc/test/integration/src/pthread/pthread_exit_test.cpp
libc/test/integration/src/pthread/pthread_mutex_test.cpp
libc/test/integration/src/pthread/pthread_name_test.cpp
libc/test/integration/src/pthread/pthread_once_test.cpp
libc/test/integration/src/pthread/pthread_test.cpp
libc/test/integration/src/pthread/pthread_tss_test.cpp
libc/test/integration/src/spawn/posix_spawn_test.cpp
libc/test/integration/src/stdio/sprintf_size_test.cpp
libc/test/integration/src/stdlib/getenv_test.cpp
libc/test/integration/src/threads/call_once_test.cpp
libc/test/integration/src/threads/cnd_test.cpp
libc/test/integration/src/threads/mtx_test.cpp
libc/test/integration/src/threads/thrd_equal_test.cpp
libc/test/integration/src/threads/thrd_exit_test.cpp
libc/test/integration/src/threads/thrd_test.cpp
libc/test/integration/src/threads/tss_test.cpp
libc/test/integration/src/unistd/execv_test.cpp
libc/test/integration/src/unistd/execve_test.cpp
libc/test/integration/src/unistd/fork_test.cpp
libc/test/integration/src/unistd/getcwd_test.cpp
libc/test/integration/startup/linux/args_test.cpp
libc/test/integration/startup/linux/init_fini_array_test.cpp
libc/test/integration/startup/linux/main_without_args.cpp
libc/test/integration/startup/linux/main_without_envp.cpp
libc/test/integration/startup/linux/tls_test.cpp
libc/test/src/__support/CPP/atomic_test.cpp
libc/test/src/__support/CPP/bitset_test.cpp
libc/test/src/__support/CPP/cstddef_test.cpp
libc/test/src/__support/CPP/integer_sequence_test.cpp
libc/test/src/__support/CPP/limits_test.cpp
libc/test/src/__support/CPP/optional_test.cpp
libc/test/src/__support/CPP/span_test.cpp
libc/test/src/__support/CPP/stringstream_test.cpp
libc/test/src/__support/CPP/stringview_test.cpp
libc/test/src/__support/FPUtil/dyadic_float_test.cpp
libc/test/src/__support/File/file_test.cpp
libc/test/src/__support/File/platform_file_test.cpp
libc/test/src/__support/OSUtil/linux/x86_64/syscall_test.cpp
libc/test/src/__support/arg_list_test.cpp
libc/test/src/__support/blockstore_test.cpp
libc/test/src/__support/char_vector_test.cpp
libc/test/src/__support/endian_test.cpp
libc/test/src/__support/fixedvector_test.cpp
libc/test/src/__support/high_precision_decimal_test.cpp
libc/test/src/__support/integer_to_string_test.cpp
libc/test/src/__support/str_to_float_test.cpp
libc/test/src/__support/uint_test.cpp
libc/test/src/assert/assert_test.cpp
libc/test/src/ctype/isalnum_test.cpp
libc/test/src/ctype/isalpha_test.cpp
libc/test/src/ctype/isascii_test.cpp
libc/test/src/ctype/isblank_test.cpp
libc/test/src/ctype/iscntrl_test.cpp
libc/test/src/ctype/isdigit_test.cpp
libc/test/src/ctype/isgraph_test.cpp
libc/test/src/ctype/islower_test.cpp
libc/test/src/ctype/isprint_test.cpp
libc/test/src/ctype/ispunct_test.cpp
libc/test/src/ctype/isspace_test.cpp
libc/test/src/ctype/isupper_test.cpp
libc/test/src/ctype/isxdigit_test.cpp
libc/test/src/ctype/toascii_test.cpp
libc/test/src/ctype/tolower_test.cpp
libc/test/src/ctype/toupper_test.cpp
libc/test/src/dirent/dirent_test.cpp
libc/test/src/errno/errno_test.cpp
libc/test/src/fcntl/creat_test.cpp
libc/test/src/fcntl/openat_test.cpp
libc/test/src/fenv/enabled_exceptions_test.cpp
libc/test/src/fenv/exception_flags_test.cpp
libc/test/src/fenv/exception_status_test.cpp
libc/test/src/fenv/feclearexcept_test.cpp
libc/test/src/fenv/feenableexcept_test.cpp
libc/test/src/fenv/feholdexcept_test.cpp
libc/test/src/fenv/feupdateenv_test.cpp
libc/test/src/fenv/getenv_and_setenv_test.cpp
libc/test/src/fenv/rounding_mode_test.cpp
libc/test/src/inttypes/imaxabs_test.cpp
libc/test/src/inttypes/strtoimax_test.cpp
libc/test/src/inttypes/strtoumax_test.cpp
libc/test/src/math/CeilTest.h
libc/test/src/math/CopySignTest.h
libc/test/src/math/FAbsTest.h
libc/test/src/math/FDimTest.h
libc/test/src/math/FMaxTest.h
libc/test/src/math/FMinTest.h
libc/test/src/math/FModTest.h
libc/test/src/math/FloorTest.h
libc/test/src/math/FmaTest.h
libc/test/src/math/FrexpTest.h
libc/test/src/math/HypotTest.h
libc/test/src/math/ILogbTest.h
libc/test/src/math/LdExpTest.h
libc/test/src/math/LogbTest.h
libc/test/src/math/ModfTest.h
libc/test/src/math/NextAfterTest.h
libc/test/src/math/RIntTest.h
libc/test/src/math/RemQuoTest.h
libc/test/src/math/RoundTest.h
libc/test/src/math/RoundToIntegerTest.h
libc/test/src/math/SqrtTest.h
libc/test/src/math/TruncTest.h
libc/test/src/math/acosf_test.cpp
libc/test/src/math/acoshf_test.cpp
libc/test/src/math/asin_test.cpp
libc/test/src/math/asinf_test.cpp
libc/test/src/math/asinhf_test.cpp
libc/test/src/math/atanf_test.cpp
libc/test/src/math/atanhf_test.cpp
libc/test/src/math/cos_test.cpp
libc/test/src/math/cosf_test.cpp
libc/test/src/math/coshf_test.cpp
libc/test/src/math/exhaustive/cosf_test.cpp
libc/test/src/math/exhaustive/coshf_test.cpp
libc/test/src/math/exhaustive/exhaustive_test.h
libc/test/src/math/exhaustive/exp10f_test.cpp
libc/test/src/math/exhaustive/exp2f_test.cpp
libc/test/src/math/exhaustive/expf_test.cpp
libc/test/src/math/exhaustive/expm1f_test.cpp
libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp
libc/test/src/math/exhaustive/hypotf_test.cpp
libc/test/src/math/exhaustive/log10f_test.cpp
libc/test/src/math/exhaustive/log1pf_test.cpp
libc/test/src/math/exhaustive/log2f_test.cpp
libc/test/src/math/exhaustive/logf_test.cpp
libc/test/src/math/exhaustive/sincosf_test.cpp
libc/test/src/math/exhaustive/sinf_test.cpp
libc/test/src/math/exhaustive/sinhf_test.cpp
libc/test/src/math/exhaustive/tanf_test.cpp
libc/test/src/math/exp10f_test.cpp
libc/test/src/math/exp2f_test.cpp
libc/test/src/math/expf_test.cpp
libc/test/src/math/explogxf_test.cpp
libc/test/src/math/expm1f_test.cpp
libc/test/src/math/fdim_test.cpp
libc/test/src/math/fdimf_test.cpp
libc/test/src/math/fdiml_test.cpp
libc/test/src/math/ilogb_test.cpp
libc/test/src/math/ilogbf_test.cpp
libc/test/src/math/ilogbl_test.cpp
libc/test/src/math/inv_trigf_utils_test.cpp
libc/test/src/math/log10_test.cpp
libc/test/src/math/log10f_test.cpp
libc/test/src/math/log1pf_test.cpp
libc/test/src/math/log2f_test.cpp
libc/test/src/math/logf_test.cpp
libc/test/src/math/mod_k_pi_test.cpp
libc/test/src/math/pow_test.cpp
libc/test/src/math/sin_test.cpp
libc/test/src/math/sincosf_test.cpp
libc/test/src/math/sinf_test.cpp
libc/test/src/math/sinhf_test.cpp
libc/test/src/math/tan_test.cpp
libc/test/src/math/tanf_test.cpp
libc/test/src/math/tanhf_test.cpp
libc/test/src/pthread/pthread_attr_test.cpp
libc/test/src/pthread/pthread_mutexattr_test.cpp
libc/test/src/setjmp/setjmp_test.cpp
libc/test/src/signal/kill_test.cpp
libc/test/src/signal/raise_test.cpp
libc/test/src/signal/sigaction_test.cpp
libc/test/src/signal/sigaddset_test.cpp
libc/test/src/signal/sigaltstack_test.cpp
libc/test/src/signal/sigdelset_test.cpp
libc/test/src/signal/sigfillset_test.cpp
libc/test/src/signal/signal_test.cpp
libc/test/src/signal/sigprocmask_test.cpp
libc/test/src/spawn/posix_spawn_file_actions_test.cpp
libc/test/src/stdio/fgetc_test.cpp
libc/test/src/stdio/fgetc_unlocked_test.cpp
libc/test/src/stdio/fgets_test.cpp
libc/test/src/stdio/fileop_test.cpp
libc/test/src/stdio/fopencookie_test.cpp
libc/test/src/stdio/fprintf_test.cpp
libc/test/src/stdio/fscanf_test.cpp
libc/test/src/stdio/ftell_test.cpp
libc/test/src/stdio/printf_core/converter_test.cpp
libc/test/src/stdio/printf_core/parser_test.cpp
libc/test/src/stdio/printf_core/string_writer_test.cpp
libc/test/src/stdio/printf_test.cpp
libc/test/src/stdio/putc_test.cpp
libc/test/src/stdio/puts_test.cpp
libc/test/src/stdio/remove_test.cpp
libc/test/src/stdio/scanf_core/converter_test.cpp
libc/test/src/stdio/scanf_core/parser_test.cpp
libc/test/src/stdio/scanf_core/string_reader_test.cpp
libc/test/src/stdio/setbuf_test.cpp
libc/test/src/stdio/setvbuf_test.cpp
libc/test/src/stdio/snprintf_test.cpp
libc/test/src/stdio/sprintf_test.cpp
libc/test/src/stdio/sscanf_test.cpp
libc/test/src/stdio/ungetc_test.cpp
libc/test/src/stdio/unlocked_fileop_test.cpp
libc/test/src/stdlib/AtoiTest.h
libc/test/src/stdlib/DivTest.h
libc/test/src/stdlib/StrtolTest.h
libc/test/src/stdlib/_Exit_test.cpp
libc/test/src/stdlib/abort_test.cpp
libc/test/src/stdlib/abs_test.cpp
libc/test/src/stdlib/atexit_test.cpp
libc/test/src/stdlib/atof_test.cpp
libc/test/src/stdlib/atoi_test.cpp
libc/test/src/stdlib/atol_test.cpp
libc/test/src/stdlib/atoll_test.cpp
libc/test/src/stdlib/bsearch_test.cpp
libc/test/src/stdlib/labs_test.cpp
libc/test/src/stdlib/llabs_test.cpp
libc/test/src/stdlib/qsort_test.cpp
libc/test/src/stdlib/rand_test.cpp
libc/test/src/stdlib/strtod_test.cpp
libc/test/src/stdlib/strtof_test.cpp
libc/test/src/stdlib/strtol_test.cpp
libc/test/src/stdlib/strtold_test.cpp
libc/test/src/stdlib/strtoll_test.cpp
libc/test/src/stdlib/strtoul_test.cpp
libc/test/src/stdlib/strtoull_test.cpp
libc/test/src/string/bcmp_test.cpp
libc/test/src/string/bcopy_test.cpp
libc/test/src/string/bzero_test.cpp
libc/test/src/string/memccpy_test.cpp
libc/test/src/string/memchr_test.cpp
libc/test/src/string/memcmp_test.cpp
libc/test/src/string/memcpy_test.cpp
libc/test/src/string/memmove_test.cpp
libc/test/src/string/memory_utils/op_tests.cpp
libc/test/src/string/memory_utils/utils_test.cpp
libc/test/src/string/mempcpy_test.cpp
libc/test/src/string/memrchr_test.cpp
libc/test/src/string/memset_test.cpp
libc/test/src/string/stpcpy_test.cpp
libc/test/src/string/stpncpy_test.cpp
libc/test/src/string/strcasecmp_test.cpp
libc/test/src/string/strcasestr_test.cpp
libc/test/src/string/strcat_test.cpp
libc/test/src/string/strchr_test.cpp
libc/test/src/string/strcmp_test.cpp
libc/test/src/string/strcoll_test.cpp
libc/test/src/string/strcpy_test.cpp
libc/test/src/string/strcspn_test.cpp
libc/test/src/string/strdup_test.cpp
libc/test/src/string/strerror_r_test.cpp
libc/test/src/string/strerror_test.cpp
libc/test/src/string/strlcat_test.cpp
libc/test/src/string/strlcpy_test.cpp
libc/test/src/string/strlen_test.cpp
libc/test/src/string/strncasecmp_test.cpp
libc/test/src/string/strncat_test.cpp
libc/test/src/string/strncmp_test.cpp
libc/test/src/string/strncpy_test.cpp
libc/test/src/string/strndup_test.cpp
libc/test/src/string/strnlen_test.cpp
libc/test/src/string/strpbrk_test.cpp
libc/test/src/string/strrchr_test.cpp
libc/test/src/string/strsignal_test.cpp
libc/test/src/string/strspn_test.cpp
libc/test/src/string/strstr_test.cpp
libc/test/src/string/strtok_r_test.cpp
libc/test/src/string/strtok_test.cpp
libc/test/src/sys/mman/linux/madvise_test.cpp
libc/test/src/sys/mman/linux/mmap_test.cpp
libc/test/src/sys/mman/linux/mprotect_test.cpp
libc/test/src/sys/mman/linux/posix_madvise_test.cpp
libc/test/src/sys/random/linux/getrandom_test.cpp
libc/test/src/sys/resource/getrlimit_setrlimit_test.cpp
libc/test/src/sys/select/select_failure_test.cpp
libc/test/src/sys/select/select_ui_test.cpp
libc/test/src/sys/sendfile/sendfile_test.cpp
libc/test/src/sys/stat/chmod_test.cpp
libc/test/src/sys/stat/fchmod_test.cpp
libc/test/src/sys/stat/fchmodat_test.cpp
libc/test/src/sys/stat/fstat_test.cpp
libc/test/src/sys/stat/lstat_test.cpp
libc/test/src/sys/stat/mkdirat_test.cpp
libc/test/src/sys/stat/stat_test.cpp
libc/test/src/sys/utsname/uname_test.cpp
libc/test/src/sys/wait/wait4_test.cpp
libc/test/src/sys/wait/waitpid_test.cpp
libc/test/src/termios/termios_test.cpp
libc/test/src/time/TmMatcher.h
libc/test/src/time/asctime_r_test.cpp
libc/test/src/time/asctime_test.cpp
libc/test/src/time/clock_gettime_test.cpp
libc/test/src/time/clock_test.cpp
libc/test/src/time/difftime_test.cpp
libc/test/src/time/gettimeofday_test.cpp
libc/test/src/time/gmtime_r_test.cpp
libc/test/src/time/gmtime_test.cpp
libc/test/src/time/mktime_test.cpp
libc/test/src/time/nanosleep_test.cpp
libc/test/src/time/time_test.cpp
libc/test/src/unistd/access_test.cpp
libc/test/src/unistd/chdir_test.cpp
libc/test/src/unistd/dup2_test.cpp
libc/test/src/unistd/dup3_test.cpp
libc/test/src/unistd/dup_test.cpp
libc/test/src/unistd/fchdir_test.cpp
libc/test/src/unistd/ftruncate_test.cpp
libc/test/src/unistd/geteuid_test.cpp
libc/test/src/unistd/getopt_test.cpp
libc/test/src/unistd/getpid_test.cpp
libc/test/src/unistd/getppid_test.cpp
libc/test/src/unistd/getuid_test.cpp
libc/test/src/unistd/isatty_test.cpp
libc/test/src/unistd/link_test.cpp
libc/test/src/unistd/linkat_test.cpp
libc/test/src/unistd/lseek_test.cpp
libc/test/src/unistd/pread_pwrite_test.cpp
libc/test/src/unistd/read_write_test.cpp
libc/test/src/unistd/readlink_test.cpp
libc/test/src/unistd/readlinkat_test.cpp
libc/test/src/unistd/rmdir_test.cpp
libc/test/src/unistd/symlink_test.cpp
libc/test/src/unistd/symlinkat_test.cpp
libc/test/src/unistd/syscall_test.cpp
libc/test/src/unistd/sysconf_test.cpp
libc/test/src/unistd/truncate_test.cpp
libc/test/src/unistd/unlink_test.cpp
libc/test/src/unistd/unlinkat_test.cpp
libc/test/utils/FPUtil/x86_long_double_test.cpp
libc/test/utils/UnitTest/testfilter_test.cpp
libc/utils/CMakeLists.txt
libc/utils/MPFRWrapper/MPFRUtils.cpp
libc/utils/MPFRWrapper/MPFRUtils.h
utils/bazel/llvm-project-overlay/libc/test/libc_test_rules.bzl
utils/bazel/llvm-project-overlay/libc/test/src/fenv/BUILD.bazel
utils/bazel/llvm-project-overlay/libc/test/src/math/BUILD.bazel
utils/bazel/llvm-project-overlay/libc/test/src/math/libc_math_test_rules.bzl
utils/bazel/llvm-project-overlay/libc/test/src/string/BUILD.bazel
utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel
Removed:
libc/utils/IntegrationTest/CMakeLists.txt
libc/utils/IntegrationTest/test.cpp
libc/utils/IntegrationTest/test.h
libc/utils/UnitTest/CMakeLists.txt
libc/utils/UnitTest/FPExceptMatcher.cpp
libc/utils/UnitTest/FPExceptMatcher.h
libc/utils/UnitTest/FPMatcher.cpp
libc/utils/UnitTest/FPMatcher.h
libc/utils/UnitTest/FuchsiaTest.h
libc/utils/UnitTest/LibcTest.cpp
libc/utils/UnitTest/LibcTest.h
libc/utils/UnitTest/LibcTestMain.cpp
libc/utils/UnitTest/MemoryMatcher.cpp
libc/utils/UnitTest/MemoryMatcher.h
libc/utils/UnitTest/PlatformDefs.h
libc/utils/UnitTest/PrintfMatcher.cpp
libc/utils/UnitTest/PrintfMatcher.h
libc/utils/UnitTest/README.md
libc/utils/UnitTest/ScanfMatcher.cpp
libc/utils/UnitTest/ScanfMatcher.h
libc/utils/UnitTest/StringUtils.h
libc/utils/UnitTest/Test.h
utils/bazel/llvm-project-overlay/libc/utils/UnitTest/BUILD.bazel
################################################################################
diff --git a/libc/cmake/modules/LLVMLibCTestRules.cmake b/libc/cmake/modules/LLVMLibCTestRules.cmake
index 459eb57dd8623..99d6e2a787238 100644
--- a/libc/cmake/modules/LLVMLibCTestRules.cmake
+++ b/libc/cmake/modules/LLVMLibCTestRules.cmake
@@ -443,7 +443,7 @@ function(add_integration_test test_name)
libc.src.stdlib.atexit
libc.src.stdlib.exit
libc.src.unistd.environ
- libc.utils.IntegrationTest.test)
+ libc.test.IntegrationTest.test)
list(REMOVE_DUPLICATES fq_deps_list)
# TODO: Instead of gathering internal object files from entrypoints,
@@ -526,7 +526,7 @@ function(add_integration_test test_name)
add_dependencies(${fq_target_name}
${fq_target_name}.__copy_startup__
${fq_libc_target_name}
- libc.utils.IntegrationTest.test
+ libc.test.IntegrationTest.test
${INTEGRATION_TEST_DEPENDS})
add_custom_command(
diff --git a/libc/test/CMakeLists.txt b/libc/test/CMakeLists.txt
index 85f89024d0f63..717b9330339aa 100644
--- a/libc/test/CMakeLists.txt
+++ b/libc/test/CMakeLists.txt
@@ -1,3 +1,10 @@
+add_subdirectory(UnitTest)
+
+if(LLVM_LIBC_FULL_BUILD AND NOT
+ (LIBC_TARGET_ARCHITECTURE_IS_GPU OR LIBC_TARGET_OS_IS_BAREMETAL))
+ add_subdirectory(IntegrationTest)
+endif()
+
add_header_library(
errno_setter_matcher
HDRS
diff --git a/libc/test/ErrnoSetterMatcher.h b/libc/test/ErrnoSetterMatcher.h
index 3d8c914b0491c..c78d0cdb6f487 100644
--- a/libc/test/ErrnoSetterMatcher.h
+++ b/libc/test/ErrnoSetterMatcher.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TEST_ERRNOSETTERMATCHER_H
#define LLVM_LIBC_TEST_ERRNOSETTERMATCHER_H
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/utils/IntegrationTest/CMakeLists.txt b/libc/test/IntegrationTest/CMakeLists.txt
similarity index 100%
rename from libc/utils/IntegrationTest/CMakeLists.txt
rename to libc/test/IntegrationTest/CMakeLists.txt
diff --git a/libc/utils/IntegrationTest/test.cpp b/libc/test/IntegrationTest/test.cpp
similarity index 100%
rename from libc/utils/IntegrationTest/test.cpp
rename to libc/test/IntegrationTest/test.cpp
diff --git a/libc/utils/IntegrationTest/test.h b/libc/test/IntegrationTest/test.h
similarity index 100%
rename from libc/utils/IntegrationTest/test.h
rename to libc/test/IntegrationTest/test.h
diff --git a/libc/utils/UnitTest/CMakeLists.txt b/libc/test/UnitTest/CMakeLists.txt
similarity index 94%
rename from libc/utils/UnitTest/CMakeLists.txt
rename to libc/test/UnitTest/CMakeLists.txt
index 43039304907ed..c3eabeda076af 100644
--- a/libc/utils/UnitTest/CMakeLists.txt
+++ b/libc/test/UnitTest/CMakeLists.txt
@@ -37,7 +37,7 @@ target_link_libraries(LibcFPTestHelpers LibcUnitTest libc_test_utils)
add_dependencies(
LibcFPTestHelpers
LibcUnitTest
- libc.utils.UnitTest.string_utils
+ libc.test.UnitTest.string_utils
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.fenv_impl
)
@@ -67,7 +67,7 @@ add_dependencies(
LibcUnitTest
libc.src.__support.FPUtil.fp_bits
libc.src.stdio.printf_core.core_structs
- libc.utils.UnitTest.string_utils
+ libc.test.UnitTest.string_utils
)
add_library(
@@ -82,5 +82,5 @@ add_dependencies(
LibcUnitTest
libc.src.__support.FPUtil.fp_bits
libc.src.stdio.scanf_core.core_structs
- libc.utils.UnitTest.string_utils
+ libc.test.UnitTest.string_utils
)
diff --git a/libc/utils/UnitTest/FPExceptMatcher.cpp b/libc/test/UnitTest/FPExceptMatcher.cpp
similarity index 100%
rename from libc/utils/UnitTest/FPExceptMatcher.cpp
rename to libc/test/UnitTest/FPExceptMatcher.cpp
diff --git a/libc/utils/UnitTest/FPExceptMatcher.h b/libc/test/UnitTest/FPExceptMatcher.h
similarity index 98%
rename from libc/utils/UnitTest/FPExceptMatcher.h
rename to libc/test/UnitTest/FPExceptMatcher.h
index 23fd945019c08..70cd8da63fa92 100644
--- a/libc/utils/UnitTest/FPExceptMatcher.h
+++ b/libc/test/UnitTest/FPExceptMatcher.h
@@ -11,7 +11,7 @@
#ifndef LLVM_LIBC_TEST_USE_FUCHSIA
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
namespace fputil {
diff --git a/libc/utils/UnitTest/FPMatcher.cpp b/libc/test/UnitTest/FPMatcher.cpp
similarity index 98%
rename from libc/utils/UnitTest/FPMatcher.cpp
rename to libc/test/UnitTest/FPMatcher.cpp
index d6ce67e96cd47..e8827ce9fd587 100644
--- a/libc/utils/UnitTest/FPMatcher.cpp
+++ b/libc/test/UnitTest/FPMatcher.cpp
@@ -10,7 +10,7 @@
#include "src/__support/FPUtil/FPBits.h"
-#include "utils/UnitTest/StringUtils.h"
+#include "test/UnitTest/StringUtils.h"
#include <sstream>
#include <string>
diff --git a/libc/utils/UnitTest/FPMatcher.h b/libc/test/UnitTest/FPMatcher.h
similarity index 99%
rename from libc/utils/UnitTest/FPMatcher.h
rename to libc/test/UnitTest/FPMatcher.h
index a7c0971839a3c..fd2ef320239d7 100644
--- a/libc/utils/UnitTest/FPMatcher.h
+++ b/libc/test/UnitTest/FPMatcher.h
@@ -11,7 +11,7 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/RoundingModeUtils.h"
#include <errno.h>
diff --git a/libc/utils/UnitTest/FuchsiaTest.h b/libc/test/UnitTest/FuchsiaTest.h
similarity index 100%
rename from libc/utils/UnitTest/FuchsiaTest.h
rename to libc/test/UnitTest/FuchsiaTest.h
diff --git a/libc/utils/UnitTest/LibcTest.cpp b/libc/test/UnitTest/LibcTest.cpp
similarity index 100%
rename from libc/utils/UnitTest/LibcTest.cpp
rename to libc/test/UnitTest/LibcTest.cpp
diff --git a/libc/utils/UnitTest/LibcTest.h b/libc/test/UnitTest/LibcTest.h
similarity index 99%
rename from libc/utils/UnitTest/LibcTest.h
rename to libc/test/UnitTest/LibcTest.h
index 9356bf92f375f..8241fe90187d2 100644
--- a/libc/utils/UnitTest/LibcTest.h
+++ b/libc/test/UnitTest/LibcTest.h
@@ -57,7 +57,9 @@ struct MatcherBase {
virtual bool is_silent() const { return false; }
};
-template <typename T> struct Matcher : public MatcherBase { bool match(T &t); };
+template <typename T> struct Matcher : public MatcherBase {
+ bool match(T &t);
+};
// NOTE: One should not create instances and call methods on them directly. One
// should use the macros TEST or TEST_F to write test cases.
diff --git a/libc/utils/UnitTest/LibcTestMain.cpp b/libc/test/UnitTest/LibcTestMain.cpp
similarity index 100%
rename from libc/utils/UnitTest/LibcTestMain.cpp
rename to libc/test/UnitTest/LibcTestMain.cpp
diff --git a/libc/utils/UnitTest/MemoryMatcher.cpp b/libc/test/UnitTest/MemoryMatcher.cpp
similarity index 100%
rename from libc/utils/UnitTest/MemoryMatcher.cpp
rename to libc/test/UnitTest/MemoryMatcher.cpp
diff --git a/libc/utils/UnitTest/MemoryMatcher.h b/libc/test/UnitTest/MemoryMatcher.h
similarity index 97%
rename from libc/utils/UnitTest/MemoryMatcher.h
rename to libc/test/UnitTest/MemoryMatcher.h
index 0bd44071d7446..e08b452cf9a84 100644
--- a/libc/utils/UnitTest/MemoryMatcher.h
+++ b/libc/test/UnitTest/MemoryMatcher.h
@@ -11,7 +11,7 @@
#include "src/__support/CPP/span.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
namespace memory {
diff --git a/libc/utils/UnitTest/PlatformDefs.h b/libc/test/UnitTest/PlatformDefs.h
similarity index 100%
rename from libc/utils/UnitTest/PlatformDefs.h
rename to libc/test/UnitTest/PlatformDefs.h
diff --git a/libc/utils/UnitTest/PrintfMatcher.cpp b/libc/test/UnitTest/PrintfMatcher.cpp
similarity index 98%
rename from libc/utils/UnitTest/PrintfMatcher.cpp
rename to libc/test/UnitTest/PrintfMatcher.cpp
index 85bbd2d92a3db..0de966d369d3b 100644
--- a/libc/utils/UnitTest/PrintfMatcher.cpp
+++ b/libc/test/UnitTest/PrintfMatcher.cpp
@@ -11,7 +11,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/stdio/printf_core/core_structs.h"
-#include "utils/UnitTest/StringUtils.h"
+#include "test/UnitTest/StringUtils.h"
#include <stdint.h>
diff --git a/libc/utils/UnitTest/PrintfMatcher.h b/libc/test/UnitTest/PrintfMatcher.h
similarity index 97%
rename from libc/utils/UnitTest/PrintfMatcher.h
rename to libc/test/UnitTest/PrintfMatcher.h
index 81523c0751ef6..4bebab0a7b8db 100644
--- a/libc/utils/UnitTest/PrintfMatcher.h
+++ b/libc/test/UnitTest/PrintfMatcher.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_UTILS_UNITTEST_PRINTF_MATCHER_H
#include "src/stdio/printf_core/core_structs.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/utils/UnitTest/README.md b/libc/test/UnitTest/README.md
similarity index 100%
rename from libc/utils/UnitTest/README.md
rename to libc/test/UnitTest/README.md
diff --git a/libc/utils/UnitTest/ScanfMatcher.cpp b/libc/test/UnitTest/ScanfMatcher.cpp
similarity index 98%
rename from libc/utils/UnitTest/ScanfMatcher.cpp
rename to libc/test/UnitTest/ScanfMatcher.cpp
index bd9e6ac7907d4..961c4b786b521 100644
--- a/libc/utils/UnitTest/ScanfMatcher.cpp
+++ b/libc/test/UnitTest/ScanfMatcher.cpp
@@ -11,7 +11,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/stdio/scanf_core/core_structs.h"
-#include "utils/UnitTest/StringUtils.h"
+#include "test/UnitTest/StringUtils.h"
#include <stdint.h>
diff --git a/libc/utils/UnitTest/ScanfMatcher.h b/libc/test/UnitTest/ScanfMatcher.h
similarity index 97%
rename from libc/utils/UnitTest/ScanfMatcher.h
rename to libc/test/UnitTest/ScanfMatcher.h
index b5079fe6b230e..611f045c28a8a 100644
--- a/libc/utils/UnitTest/ScanfMatcher.h
+++ b/libc/test/UnitTest/ScanfMatcher.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_UTILS_UNITTEST_SCANF_MATCHER_H
#include "src/stdio/scanf_core/core_structs.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/utils/UnitTest/StringUtils.h b/libc/test/UnitTest/StringUtils.h
similarity index 100%
rename from libc/utils/UnitTest/StringUtils.h
rename to libc/test/UnitTest/StringUtils.h
diff --git a/libc/utils/UnitTest/Test.h b/libc/test/UnitTest/Test.h
similarity index 100%
rename from libc/utils/UnitTest/Test.h
rename to libc/test/UnitTest/Test.h
diff --git a/libc/test/integration/src/__support/threads/thread_detach_test.cpp b/libc/test/integration/src/__support/threads/thread_detach_test.cpp
index 6257335a38d8d..3d36e4e5d2404 100644
--- a/libc/test/integration/src/__support/threads/thread_detach_test.cpp
+++ b/libc/test/integration/src/__support/threads/thread_detach_test.cpp
@@ -8,7 +8,7 @@
#include "src/__support/threads/mutex.h"
#include "src/__support/threads/thread.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
__llvm_libc::Mutex mutex(false, false, false);
diff --git a/libc/test/integration/src/__support/threads/thread_tls_test.cpp b/libc/test/integration/src/__support/threads/thread_tls_test.cpp
index 93f8d4df00cd7..2574f1f8b2500 100644
--- a/libc/test/integration/src/__support/threads/thread_tls_test.cpp
+++ b/libc/test/integration/src/__support/threads/thread_tls_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/threads/thread.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
static constexpr int INIT_VAL = 100;
static constexpr int UPDATE_VAL = 123;
diff --git a/libc/test/integration/src/pthread/pthread_equal_test.cpp b/libc/test/integration/src/pthread/pthread_equal_test.cpp
index 3e50e37846e10..37fb4536ea08c 100644
--- a/libc/test/integration/src/pthread/pthread_equal_test.cpp
+++ b/libc/test/integration/src/pthread/pthread_equal_test.cpp
@@ -15,7 +15,7 @@
#include "src/pthread/pthread_mutex_unlock.h"
#include "src/pthread/pthread_self.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <pthread.h>
diff --git a/libc/test/integration/src/pthread/pthread_exit_test.cpp b/libc/test/integration/src/pthread/pthread_exit_test.cpp
index 655bfcd9aba96..e60fe67d2a2a0 100644
--- a/libc/test/integration/src/pthread/pthread_exit_test.cpp
+++ b/libc/test/integration/src/pthread/pthread_exit_test.cpp
@@ -9,7 +9,7 @@
#include "src/pthread/pthread_create.h"
#include "src/pthread/pthread_exit.h"
#include "src/pthread/pthread_join.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <pthread.h>
diff --git a/libc/test/integration/src/pthread/pthread_mutex_test.cpp b/libc/test/integration/src/pthread/pthread_mutex_test.cpp
index d7c26c53c2fbe..c00211a94b356 100644
--- a/libc/test/integration/src/pthread/pthread_mutex_test.cpp
+++ b/libc/test/integration/src/pthread/pthread_mutex_test.cpp
@@ -14,7 +14,7 @@
#include "src/pthread/pthread_create.h"
#include "src/pthread/pthread_join.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <pthread.h>
diff --git a/libc/test/integration/src/pthread/pthread_name_test.cpp b/libc/test/integration/src/pthread/pthread_name_test.cpp
index 5fe67ebbbdc04..b5b4dd8f83420 100644
--- a/libc/test/integration/src/pthread/pthread_name_test.cpp
+++ b/libc/test/integration/src/pthread/pthread_name_test.cpp
@@ -17,7 +17,7 @@
#include "src/pthread/pthread_self.h"
#include "src/pthread/pthread_setname_np.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <errno.h>
#include <pthread.h>
diff --git a/libc/test/integration/src/pthread/pthread_once_test.cpp b/libc/test/integration/src/pthread/pthread_once_test.cpp
index 86ad6496ad5b0..d3415a6954053 100644
--- a/libc/test/integration/src/pthread/pthread_once_test.cpp
+++ b/libc/test/integration/src/pthread/pthread_once_test.cpp
@@ -15,7 +15,7 @@
#include "src/pthread/pthread_mutex_unlock.h"
#include "src/pthread/pthread_once.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <pthread.h>
diff --git a/libc/test/integration/src/pthread/pthread_test.cpp b/libc/test/integration/src/pthread/pthread_test.cpp
index e9ac5ad777060..e7aff2f778a54 100644
--- a/libc/test/integration/src/pthread/pthread_test.cpp
+++ b/libc/test/integration/src/pthread/pthread_test.cpp
@@ -8,7 +8,7 @@
#include "src/pthread/pthread_create.h"
#include "src/pthread/pthread_join.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <pthread.h>
diff --git a/libc/test/integration/src/pthread/pthread_tss_test.cpp b/libc/test/integration/src/pthread/pthread_tss_test.cpp
index 4c03872f9af2f..5d649026db0e6 100644
--- a/libc/test/integration/src/pthread/pthread_tss_test.cpp
+++ b/libc/test/integration/src/pthread/pthread_tss_test.cpp
@@ -13,7 +13,7 @@
#include "src/pthread/pthread_key_create.h"
#include "src/pthread/pthread_key_delete.h"
#include "src/pthread/pthread_setspecific.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <pthread.h>
diff --git a/libc/test/integration/src/spawn/posix_spawn_test.cpp b/libc/test/integration/src/spawn/posix_spawn_test.cpp
index 74fb7d339a2f4..69b60a4138762 100644
--- a/libc/test/integration/src/spawn/posix_spawn_test.cpp
+++ b/libc/test/integration/src/spawn/posix_spawn_test.cpp
@@ -13,7 +13,7 @@
#include "src/spawn/posix_spawn_file_actions_destroy.h"
#include "src/spawn/posix_spawn_file_actions_init.h"
#include "src/sys/wait/waitpid.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <fcntl.h>
#include <spawn.h>
diff --git a/libc/test/integration/src/stdio/sprintf_size_test.cpp b/libc/test/integration/src/stdio/sprintf_size_test.cpp
index 46d5db21fbe90..117a059ecfe09 100644
--- a/libc/test/integration/src/stdio/sprintf_size_test.cpp
+++ b/libc/test/integration/src/stdio/sprintf_size_test.cpp
@@ -12,7 +12,7 @@
#include "src/stdio/sprintf.h"
#endif
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
static bool my_streq(const char *lhs, const char *rhs) {
if (lhs == rhs)
diff --git a/libc/test/integration/src/stdlib/getenv_test.cpp b/libc/test/integration/src/stdlib/getenv_test.cpp
index 879d2f13cecf9..9c292bfaebf1f 100644
--- a/libc/test/integration/src/stdlib/getenv_test.cpp
+++ b/libc/test/integration/src/stdlib/getenv_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdlib/getenv.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
static bool my_streq(const char *lhs, const char *rhs) {
if (lhs == rhs)
diff --git a/libc/test/integration/src/threads/call_once_test.cpp b/libc/test/integration/src/threads/call_once_test.cpp
index dcb3f2507ca16..a84eca2e5b0bb 100644
--- a/libc/test/integration/src/threads/call_once_test.cpp
+++ b/libc/test/integration/src/threads/call_once_test.cpp
@@ -15,7 +15,7 @@
#include "src/threads/thrd_create.h"
#include "src/threads/thrd_join.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <threads.h>
diff --git a/libc/test/integration/src/threads/cnd_test.cpp b/libc/test/integration/src/threads/cnd_test.cpp
index c833fcb1775c1..5869df985ff66 100644
--- a/libc/test/integration/src/threads/cnd_test.cpp
+++ b/libc/test/integration/src/threads/cnd_test.cpp
@@ -19,7 +19,7 @@
#include "src/threads/thrd_create.h"
#include "src/threads/thrd_join.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <threads.h>
diff --git a/libc/test/integration/src/threads/mtx_test.cpp b/libc/test/integration/src/threads/mtx_test.cpp
index cb955c97008e7..5887e1132f56b 100644
--- a/libc/test/integration/src/threads/mtx_test.cpp
+++ b/libc/test/integration/src/threads/mtx_test.cpp
@@ -13,7 +13,7 @@
#include "src/threads/thrd_create.h"
#include "src/threads/thrd_join.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <threads.h>
diff --git a/libc/test/integration/src/threads/thrd_equal_test.cpp b/libc/test/integration/src/threads/thrd_equal_test.cpp
index 24c5240718be9..8b4a00dff3231 100644
--- a/libc/test/integration/src/threads/thrd_equal_test.cpp
+++ b/libc/test/integration/src/threads/thrd_equal_test.cpp
@@ -15,7 +15,7 @@
#include "src/threads/thrd_equal.h"
#include "src/threads/thrd_join.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <threads.h>
diff --git a/libc/test/integration/src/threads/thrd_exit_test.cpp b/libc/test/integration/src/threads/thrd_exit_test.cpp
index b331717849693..6e7baa9d0da67 100644
--- a/libc/test/integration/src/threads/thrd_exit_test.cpp
+++ b/libc/test/integration/src/threads/thrd_exit_test.cpp
@@ -9,7 +9,7 @@
#include "src/threads/thrd_create.h"
#include "src/threads/thrd_exit.h"
#include "src/threads/thrd_join.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <threads.h>
diff --git a/libc/test/integration/src/threads/thrd_test.cpp b/libc/test/integration/src/threads/thrd_test.cpp
index d71d61ce44cec..33d230c1ec028 100644
--- a/libc/test/integration/src/threads/thrd_test.cpp
+++ b/libc/test/integration/src/threads/thrd_test.cpp
@@ -9,7 +9,7 @@
#include "src/threads/thrd_create.h"
#include "src/threads/thrd_join.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <threads.h>
diff --git a/libc/test/integration/src/threads/tss_test.cpp b/libc/test/integration/src/threads/tss_test.cpp
index 065d4f5483c81..df0954d5e2e46 100644
--- a/libc/test/integration/src/threads/tss_test.cpp
+++ b/libc/test/integration/src/threads/tss_test.cpp
@@ -13,7 +13,7 @@
#include "src/threads/tss_delete.h"
#include "src/threads/tss_get.h"
#include "src/threads/tss_set.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <threads.h>
diff --git a/libc/test/integration/src/unistd/execv_test.cpp b/libc/test/integration/src/unistd/execv_test.cpp
index 8df5752bc14d0..4a3969058485d 100644
--- a/libc/test/integration/src/unistd/execv_test.cpp
+++ b/libc/test/integration/src/unistd/execv_test.cpp
@@ -10,7 +10,7 @@
#include "src/unistd/execv.h"
#include "src/unistd/fork.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <signal.h>
#include <sys/wait.h>
diff --git a/libc/test/integration/src/unistd/execve_test.cpp b/libc/test/integration/src/unistd/execve_test.cpp
index 2b3a846b9bd2c..409fec74f4d8d 100644
--- a/libc/test/integration/src/unistd/execve_test.cpp
+++ b/libc/test/integration/src/unistd/execve_test.cpp
@@ -10,7 +10,7 @@
#include "src/unistd/execve.h"
#include "src/unistd/fork.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <signal.h>
#include <sys/wait.h>
diff --git a/libc/test/integration/src/unistd/fork_test.cpp b/libc/test/integration/src/unistd/fork_test.cpp
index 13c50dd928f5b..16798627ad9ab 100644
--- a/libc/test/integration/src/unistd/fork_test.cpp
+++ b/libc/test/integration/src/unistd/fork_test.cpp
@@ -13,7 +13,7 @@
#include "src/sys/wait/waitpid.h"
#include "src/unistd/fork.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <errno.h>
#include <signal.h>
diff --git a/libc/test/integration/src/unistd/getcwd_test.cpp b/libc/test/integration/src/unistd/getcwd_test.cpp
index 5e52155609b6b..96af6dc2e3a7c 100644
--- a/libc/test/integration/src/unistd/getcwd_test.cpp
+++ b/libc/test/integration/src/unistd/getcwd_test.cpp
@@ -10,7 +10,7 @@
#include "src/stdlib/getenv.h"
#include "src/unistd/getcwd.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <errno.h>
#include <stdlib.h> // For malloc and free
diff --git a/libc/test/integration/startup/linux/args_test.cpp b/libc/test/integration/startup/linux/args_test.cpp
index 6b99521ba1e86..1cc5a0e769279 100644
--- a/libc/test/integration/startup/linux/args_test.cpp
+++ b/libc/test/integration/startup/linux/args_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
static bool my_streq(const char *lhs, const char *rhs) {
const char *l, *r;
diff --git a/libc/test/integration/startup/linux/init_fini_array_test.cpp b/libc/test/integration/startup/linux/init_fini_array_test.cpp
index b560fded4deec..ed14e03a60c05 100644
--- a/libc/test/integration/startup/linux/init_fini_array_test.cpp
+++ b/libc/test/integration/startup/linux/init_fini_array_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
#include <stddef.h>
diff --git a/libc/test/integration/startup/linux/main_without_args.cpp b/libc/test/integration/startup/linux/main_without_args.cpp
index 8c70c3d7f46ea..9bc3546aeb123 100644
--- a/libc/test/integration/startup/linux/main_without_args.cpp
+++ b/libc/test/integration/startup/linux/main_without_args.cpp
@@ -6,6 +6,6 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
TEST_MAIN() { return 0; }
diff --git a/libc/test/integration/startup/linux/main_without_envp.cpp b/libc/test/integration/startup/linux/main_without_envp.cpp
index 4127990fdc012..d2c24f4bd9f14 100644
--- a/libc/test/integration/startup/linux/main_without_envp.cpp
+++ b/libc/test/integration/startup/linux/main_without_envp.cpp
@@ -6,6 +6,6 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
TEST_MAIN(int argc, char **argv) { return 0; }
diff --git a/libc/test/integration/startup/linux/tls_test.cpp b/libc/test/integration/startup/linux/tls_test.cpp
index 82141ce1d46ba..76b8af0bb8d7f 100644
--- a/libc/test/integration/startup/linux/tls_test.cpp
+++ b/libc/test/integration/startup/linux/tls_test.cpp
@@ -11,7 +11,7 @@
#include "src/errno/llvmlibc_errno.h"
#include "src/sys/mman/mmap.h"
-#include "utils/IntegrationTest/test.h"
+#include "test/IntegrationTest/test.h"
constexpr int threadLocalDataSize = 101;
_Thread_local int a[threadLocalDataSize] = {123};
diff --git a/libc/test/src/__support/CPP/atomic_test.cpp b/libc/test/src/__support/CPP/atomic_test.cpp
index 548470f347999..3bd1d752ae9eb 100644
--- a/libc/test/src/__support/CPP/atomic_test.cpp
+++ b/libc/test/src/__support/CPP/atomic_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/atomic.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
// Tests in this file do not test atomicity as it would require using
// threads, at which point it becomes a chicken and egg problem.
diff --git a/libc/test/src/__support/CPP/bitset_test.cpp b/libc/test/src/__support/CPP/bitset_test.cpp
index 478ed95844906..9983cfc8bbbd4 100644
--- a/libc/test/src/__support/CPP/bitset_test.cpp
+++ b/libc/test/src/__support/CPP/bitset_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/bitset.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcBitsetTest, SetBitForSizeEqualToOne) {
__llvm_libc::cpp::bitset<1> bitset;
diff --git a/libc/test/src/__support/CPP/cstddef_test.cpp b/libc/test/src/__support/CPP/cstddef_test.cpp
index 35d6657c2b962..ffae423f4fd00 100644
--- a/libc/test/src/__support/CPP/cstddef_test.cpp
+++ b/libc/test/src/__support/CPP/cstddef_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/cstddef.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc::cpp {
diff --git a/libc/test/src/__support/CPP/integer_sequence_test.cpp b/libc/test/src/__support/CPP/integer_sequence_test.cpp
index e84f390e20523..1d040e6bc3e3c 100644
--- a/libc/test/src/__support/CPP/integer_sequence_test.cpp
+++ b/libc/test/src/__support/CPP/integer_sequence_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/utility.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
using namespace __llvm_libc::cpp;
diff --git a/libc/test/src/__support/CPP/limits_test.cpp b/libc/test/src/__support/CPP/limits_test.cpp
index 72aa6b1891425..fea428e66eff8 100644
--- a/libc/test/src/__support/CPP/limits_test.cpp
+++ b/libc/test/src/__support/CPP/limits_test.cpp
@@ -8,7 +8,7 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/UInt.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/src/__support/CPP/optional_test.cpp b/libc/test/src/__support/CPP/optional_test.cpp
index 24d383e5bd0f6..c59175d59a2c4 100644
--- a/libc/test/src/__support/CPP/optional_test.cpp
+++ b/libc/test/src/__support/CPP/optional_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/optional.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::cpp::nullopt;
using __llvm_libc::cpp::optional;
diff --git a/libc/test/src/__support/CPP/span_test.cpp b/libc/test/src/__support/CPP/span_test.cpp
index c0da1cf1ce784..4476f4e98b94e 100644
--- a/libc/test/src/__support/CPP/span_test.cpp
+++ b/libc/test/src/__support/CPP/span_test.cpp
@@ -8,7 +8,7 @@
#include "src/__support/CPP/array.h"
#include "src/__support/CPP/span.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::cpp::array;
using __llvm_libc::cpp::span;
diff --git a/libc/test/src/__support/CPP/stringstream_test.cpp b/libc/test/src/__support/CPP/stringstream_test.cpp
index 33b8b392782e6..c6bfd775e3460 100644
--- a/libc/test/src/__support/CPP/stringstream_test.cpp
+++ b/libc/test/src/__support/CPP/stringstream_test.cpp
@@ -8,7 +8,7 @@
#include "src/__support/CPP/span.h"
#include "src/__support/CPP/stringstream.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::cpp::span;
using __llvm_libc::cpp::StringStream;
diff --git a/libc/test/src/__support/CPP/stringview_test.cpp b/libc/test/src/__support/CPP/stringview_test.cpp
index 240b590e69976..59a0d396095d0 100644
--- a/libc/test/src/__support/CPP/stringview_test.cpp
+++ b/libc/test/src/__support/CPP/stringview_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/string_view.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::cpp::string_view;
diff --git a/libc/test/src/__support/FPUtil/dyadic_float_test.cpp b/libc/test/src/__support/FPUtil/dyadic_float_test.cpp
index 530b1b160a0fd..b1ef7111867fc 100644
--- a/libc/test/src/__support/FPUtil/dyadic_float_test.cpp
+++ b/libc/test/src/__support/FPUtil/dyadic_float_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/dyadic_float.h"
#include "src/__support/UInt.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
using Float128 = __llvm_libc::fputil::DyadicFloat<128>;
using Float192 = __llvm_libc::fputil::DyadicFloat<192>;
diff --git a/libc/test/src/__support/File/file_test.cpp b/libc/test/src/__support/File/file_test.cpp
index 6dbf2c0278fce..8287f38d3ac69 100644
--- a/libc/test/src/__support/File/file_test.cpp
+++ b/libc/test/src/__support/File/file_test.cpp
@@ -9,8 +9,8 @@
#include "src/__support/CPP/new.h"
#include "src/__support/File/file.h"
#include "src/__support/error_or.h"
-#include "utils/UnitTest/MemoryMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/MemoryMatcher.h"
+#include "test/UnitTest/Test.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/libc/test/src/__support/File/platform_file_test.cpp b/libc/test/src/__support/File/platform_file_test.cpp
index abbd8113846ac..98fae412000cb 100644
--- a/libc/test/src/__support/File/platform_file_test.cpp
+++ b/libc/test/src/__support/File/platform_file_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/File/file.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stdio.h> // For SEEK_* macros
diff --git a/libc/test/src/__support/OSUtil/linux/x86_64/syscall_test.cpp b/libc/test/src/__support/OSUtil/linux/x86_64/syscall_test.cpp
index 18f9908738517..020a156065af2 100644
--- a/libc/test/src/__support/OSUtil/linux/x86_64/syscall_test.cpp
+++ b/libc/test/src/__support/OSUtil/linux/x86_64/syscall_test.cpp
@@ -8,7 +8,7 @@
#include "src/__support/CPP/functional.h"
#include "src/__support/OSUtil/syscall.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcX86_64_SyscallTest, APITest) {
// We only do a signature test here. Actual functionality tests are
diff --git a/libc/test/src/__support/arg_list_test.cpp b/libc/test/src/__support/arg_list_test.cpp
index 70d4835bd32ff..b8cbcbeb64070 100644
--- a/libc/test/src/__support/arg_list_test.cpp
+++ b/libc/test/src/__support/arg_list_test.cpp
@@ -8,7 +8,7 @@
#include "src/__support/arg_list.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
int get_nth_int(int n, ...) {
va_list vlist;
diff --git a/libc/test/src/__support/blockstore_test.cpp b/libc/test/src/__support/blockstore_test.cpp
index f844999b06e99..d372a62a9c8e9 100644
--- a/libc/test/src/__support/blockstore_test.cpp
+++ b/libc/test/src/__support/blockstore_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/blockstore.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
struct Element {
int a;
diff --git a/libc/test/src/__support/char_vector_test.cpp b/libc/test/src/__support/char_vector_test.cpp
index 15e269bed1857..70f73729cc517 100644
--- a/libc/test/src/__support/char_vector_test.cpp
+++ b/libc/test/src/__support/char_vector_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/char_vector.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::CharVector;
diff --git a/libc/test/src/__support/endian_test.cpp b/libc/test/src/__support/endian_test.cpp
index 6b90beb9f5bdd..42296a6824020 100644
--- a/libc/test/src/__support/endian_test.cpp
+++ b/libc/test/src/__support/endian_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/endian.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/src/__support/fixedvector_test.cpp b/libc/test/src/__support/fixedvector_test.cpp
index 5b11bd65947be..bc1ee3819c479 100644
--- a/libc/test/src/__support/fixedvector_test.cpp
+++ b/libc/test/src/__support/fixedvector_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/fixedvector.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcFixedVectorTest, PushAndPop) {
__llvm_libc::FixedVector<int, 20> fixed_vector;
diff --git a/libc/test/src/__support/high_precision_decimal_test.cpp b/libc/test/src/__support/high_precision_decimal_test.cpp
index fcfbf3c23fcfa..004bc1c82f861 100644
--- a/libc/test/src/__support/high_precision_decimal_test.cpp
+++ b/libc/test/src/__support/high_precision_decimal_test.cpp
@@ -9,7 +9,7 @@
#include "src/__support/UInt128.h"
#include "src/__support/high_precision_decimal.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcHighPrecisionDecimalTest, BasicInit) {
__llvm_libc::internal::HighPrecisionDecimal hpd =
diff --git a/libc/test/src/__support/integer_to_string_test.cpp b/libc/test/src/__support/integer_to_string_test.cpp
index ab1c174ccf00a..26d9f6b1afcb0 100644
--- a/libc/test/src/__support/integer_to_string_test.cpp
+++ b/libc/test/src/__support/integer_to_string_test.cpp
@@ -9,7 +9,7 @@
#include "src/__support/CPP/string_view.h"
#include "src/__support/integer_to_string.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "limits.h"
diff --git a/libc/test/src/__support/str_to_float_test.cpp b/libc/test/src/__support/str_to_float_test.cpp
index 5555b13d1695c..0a1c304b3af23 100644
--- a/libc/test/src/__support/str_to_float_test.cpp
+++ b/libc/test/src/__support/str_to_float_test.cpp
@@ -10,7 +10,7 @@
#include "src/__support/UInt128.h"
#include "src/__support/str_to_float.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
class LlvmLibcStrToFloatTest : public __llvm_libc::testing::Test {
public:
diff --git a/libc/test/src/__support/uint_test.cpp b/libc/test/src/__support/uint_test.cpp
index 80b4e09b12e64..54b65f4421919 100644
--- a/libc/test/src/__support/uint_test.cpp
+++ b/libc/test/src/__support/uint_test.cpp
@@ -9,7 +9,7 @@
#include "src/__support/CPP/optional.h"
#include "src/__support/UInt.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
// We want to test __llvm_libc::cpp::UInt<128> explicitly. So, for convenience,
// we use a sugar which does not conflict with the UInt128 type which can
diff --git a/libc/test/src/assert/assert_test.cpp b/libc/test/src/assert/assert_test.cpp
index 77604768d4760..8a896494e29f7 100644
--- a/libc/test/src/assert/assert_test.cpp
+++ b/libc/test/src/assert/assert_test.cpp
@@ -8,7 +8,7 @@
#undef NDEBUG
#include "src/assert/assert.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
extern "C" int close(int);
diff --git a/libc/test/src/ctype/isalnum_test.cpp b/libc/test/src/ctype/isalnum_test.cpp
index 5ee0bbd07b07f..1cf5e6fbb2ff2 100644
--- a/libc/test/src/ctype/isalnum_test.cpp
+++ b/libc/test/src/ctype/isalnum_test.cpp
@@ -8,7 +8,7 @@
#include "src/ctype/isalnum.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsAlNum, DefaultLocale) {
// Loops through all characters, verifying that numbers and letters
diff --git a/libc/test/src/ctype/isalpha_test.cpp b/libc/test/src/ctype/isalpha_test.cpp
index e709981d49041..3fccaf650cdf9 100644
--- a/libc/test/src/ctype/isalpha_test.cpp
+++ b/libc/test/src/ctype/isalpha_test.cpp
@@ -8,7 +8,7 @@
#include "src/ctype/isalpha.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsAlpha, DefaultLocale) {
// Loops through all characters, verifying that letters return a
diff --git a/libc/test/src/ctype/isascii_test.cpp b/libc/test/src/ctype/isascii_test.cpp
index ec69cd974be84..ba450501ba0bc 100644
--- a/libc/test/src/ctype/isascii_test.cpp
+++ b/libc/test/src/ctype/isascii_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "src/ctype/isascii.h"
diff --git a/libc/test/src/ctype/isblank_test.cpp b/libc/test/src/ctype/isblank_test.cpp
index 1cb5c501727f0..85ea0384a19eb 100644
--- a/libc/test/src/ctype/isblank_test.cpp
+++ b/libc/test/src/ctype/isblank_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/isblank.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsBlank, DefaultLocale) {
// Loops through all characters, verifying that space and horizontal tab
diff --git a/libc/test/src/ctype/iscntrl_test.cpp b/libc/test/src/ctype/iscntrl_test.cpp
index 59903b3e36b92..9398ad003f7ad 100644
--- a/libc/test/src/ctype/iscntrl_test.cpp
+++ b/libc/test/src/ctype/iscntrl_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/iscntrl.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsCntrl, DefaultLocale) {
// Loops through all characters, verifying that control characters
diff --git a/libc/test/src/ctype/isdigit_test.cpp b/libc/test/src/ctype/isdigit_test.cpp
index 4ae08f81d8963..ae734189eeb8c 100644
--- a/libc/test/src/ctype/isdigit_test.cpp
+++ b/libc/test/src/ctype/isdigit_test.cpp
@@ -8,7 +8,7 @@
#include "src/ctype/isdigit.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsDigit, DefaultLocale) {
// Loops through all characters, verifying that numbers return a
diff --git a/libc/test/src/ctype/isgraph_test.cpp b/libc/test/src/ctype/isgraph_test.cpp
index 2ec8c8c0b847a..51e376c5d5dd7 100644
--- a/libc/test/src/ctype/isgraph_test.cpp
+++ b/libc/test/src/ctype/isgraph_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/isgraph.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsGraph, DefaultLocale) {
// Loops through all characters, verifying that graphical characters
diff --git a/libc/test/src/ctype/islower_test.cpp b/libc/test/src/ctype/islower_test.cpp
index 44051ea8f08b5..81d213e90d168 100644
--- a/libc/test/src/ctype/islower_test.cpp
+++ b/libc/test/src/ctype/islower_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/islower.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsLower, DefaultLocale) {
// Loops through all characters, verifying that lowercase letters
diff --git a/libc/test/src/ctype/isprint_test.cpp b/libc/test/src/ctype/isprint_test.cpp
index 7ada137d4921a..4fed40b1442d9 100644
--- a/libc/test/src/ctype/isprint_test.cpp
+++ b/libc/test/src/ctype/isprint_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/isprint.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsPrint, DefaultLocale) {
for (int ch = 0; ch < 255; ++ch) {
diff --git a/libc/test/src/ctype/ispunct_test.cpp b/libc/test/src/ctype/ispunct_test.cpp
index 322f050f86af2..dddba4702ae2d 100644
--- a/libc/test/src/ctype/ispunct_test.cpp
+++ b/libc/test/src/ctype/ispunct_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/ispunct.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
// Helper function to mark the sections of the ASCII table that are
// punctuation characters. These are listed below:
diff --git a/libc/test/src/ctype/isspace_test.cpp b/libc/test/src/ctype/isspace_test.cpp
index 8cf66c4f65c4e..9bfac1c564747 100644
--- a/libc/test/src/ctype/isspace_test.cpp
+++ b/libc/test/src/ctype/isspace_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/isspace.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsSpace, DefaultLocale) {
// Loops through all characters, verifying that space characters
diff --git a/libc/test/src/ctype/isupper_test.cpp b/libc/test/src/ctype/isupper_test.cpp
index fad91e3629d91..0d0ff1e4746da 100644
--- a/libc/test/src/ctype/isupper_test.cpp
+++ b/libc/test/src/ctype/isupper_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/isupper.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsUpper, DefaultLocale) {
// Loops through all characters, verifying that uppercase letters
diff --git a/libc/test/src/ctype/isxdigit_test.cpp b/libc/test/src/ctype/isxdigit_test.cpp
index e52fad9a1334a..64a0e05a9ab63 100644
--- a/libc/test/src/ctype/isxdigit_test.cpp
+++ b/libc/test/src/ctype/isxdigit_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/isxdigit.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcIsXDigit, DefaultLocale) {
for (int ch = 0; ch < 255; ++ch) {
diff --git a/libc/test/src/ctype/toascii_test.cpp b/libc/test/src/ctype/toascii_test.cpp
index 7680475ba7020..88f862a6836ee 100644
--- a/libc/test/src/ctype/toascii_test.cpp
+++ b/libc/test/src/ctype/toascii_test.cpp
@@ -8,7 +8,7 @@
#include "src/ctype/toascii.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcToAscii, DefaultLocale) {
// Loops through all characters, verifying that ascii characters
diff --git a/libc/test/src/ctype/tolower_test.cpp b/libc/test/src/ctype/tolower_test.cpp
index dd4ebacfd4e7d..dc184c85ee982 100644
--- a/libc/test/src/ctype/tolower_test.cpp
+++ b/libc/test/src/ctype/tolower_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/tolower.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcToLower, DefaultLocale) {
for (int ch = 0; ch < 255; ++ch) {
diff --git a/libc/test/src/ctype/toupper_test.cpp b/libc/test/src/ctype/toupper_test.cpp
index e25c57f29d288..402c742a99ad0 100644
--- a/libc/test/src/ctype/toupper_test.cpp
+++ b/libc/test/src/ctype/toupper_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/ctype/toupper.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcToUpper, DefaultLocale) {
for (int ch = 0; ch < 255; ++ch) {
diff --git a/libc/test/src/dirent/dirent_test.cpp b/libc/test/src/dirent/dirent_test.cpp
index 82fb09acedd56..7c168e78a63a1 100644
--- a/libc/test/src/dirent/dirent_test.cpp
+++ b/libc/test/src/dirent/dirent_test.cpp
@@ -12,7 +12,7 @@
#include "src/dirent/opendir.h"
#include "src/dirent/readdir.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <dirent.h>
#include <errno.h>
diff --git a/libc/test/src/errno/errno_test.cpp b/libc/test/src/errno/errno_test.cpp
index a310dc88e03d2..86a9a88e86685 100644
--- a/libc/test/src/errno/errno_test.cpp
+++ b/libc/test/src/errno/errno_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/errno/llvmlibc_errno.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcErrnoTest, Basic) {
int test_val = 123;
diff --git a/libc/test/src/fcntl/creat_test.cpp b/libc/test/src/fcntl/creat_test.cpp
index 22cbd1bb996d9..dfe5600f0f811 100644
--- a/libc/test/src/fcntl/creat_test.cpp
+++ b/libc/test/src/fcntl/creat_test.cpp
@@ -10,7 +10,7 @@
#include "src/fcntl/open.h"
#include "src/unistd/close.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/fcntl/openat_test.cpp b/libc/test/src/fcntl/openat_test.cpp
index 9a86728b17268..9716b1f71182d 100644
--- a/libc/test/src/fcntl/openat_test.cpp
+++ b/libc/test/src/fcntl/openat_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/close.h"
#include "src/unistd/read.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/fenv/enabled_exceptions_test.cpp b/libc/test/src/fenv/enabled_exceptions_test.cpp
index c51a00c9b2d74..904b406177f40 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/architectures.h"
-#include "utils/UnitTest/FPExceptMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPExceptMatcher.h"
+#include "test/UnitTest/Test.h"
#include <fenv.h>
#include <signal.h>
diff --git a/libc/test/src/fenv/exception_flags_test.cpp b/libc/test/src/fenv/exception_flags_test.cpp
index 1e8486ff9bde4..9d26fe7b93ba6 100644
--- a/libc/test/src/fenv/exception_flags_test.cpp
+++ b/libc/test/src/fenv/exception_flags_test.cpp
@@ -10,7 +10,7 @@
#include "src/fenv/fesetexceptflag.h"
#include "src/__support/FPUtil/FEnvImpl.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <fenv.h>
diff --git a/libc/test/src/fenv/exception_status_test.cpp b/libc/test/src/fenv/exception_status_test.cpp
index 53043ec48e064..3563187c917e0 100644
--- a/libc/test/src/fenv/exception_status_test.cpp
+++ b/libc/test/src/fenv/exception_status_test.cpp
@@ -11,7 +11,7 @@
#include "src/fenv/fetestexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <fenv.h>
diff --git a/libc/test/src/fenv/feclearexcept_test.cpp b/libc/test/src/fenv/feclearexcept_test.cpp
index 156b22e561739..80414b2d2cd85 100644
--- a/libc/test/src/fenv/feclearexcept_test.cpp
+++ b/libc/test/src/fenv/feclearexcept_test.cpp
@@ -9,7 +9,7 @@
#include "src/fenv/feclearexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <fenv.h>
#include <stdint.h>
diff --git a/libc/test/src/fenv/feenableexcept_test.cpp b/libc/test/src/fenv/feenableexcept_test.cpp
index 910702f2b36f6..cc4285ed7dc91 100644
--- a/libc/test/src/fenv/feenableexcept_test.cpp
+++ b/libc/test/src/fenv/feenableexcept_test.cpp
@@ -11,7 +11,7 @@
#include "src/fenv/feenableexcept.h"
#include "src/fenv/fegetexcept.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <fenv.h>
diff --git a/libc/test/src/fenv/feholdexcept_test.cpp b/libc/test/src/fenv/feholdexcept_test.cpp
index f3c4e12ac9447..d0bb4db557e21 100644
--- a/libc/test/src/fenv/feholdexcept_test.cpp
+++ b/libc/test/src/fenv/feholdexcept_test.cpp
@@ -10,8 +10,8 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/macros/architectures.h"
-#include "utils/UnitTest/FPExceptMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPExceptMatcher.h"
+#include "test/UnitTest/Test.h"
#include <fenv.h>
diff --git a/libc/test/src/fenv/feupdateenv_test.cpp b/libc/test/src/fenv/feupdateenv_test.cpp
index 9806bb36b3728..1b3884a7337fe 100644
--- a/libc/test/src/fenv/feupdateenv_test.cpp
+++ b/libc/test/src/fenv/feupdateenv_test.cpp
@@ -9,7 +9,7 @@
#include "src/fenv/feupdateenv.h"
#include "src/__support/FPUtil/FEnvImpl.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <fenv.h>
#include <signal.h>
diff --git a/libc/test/src/fenv/getenv_and_setenv_test.cpp b/libc/test/src/fenv/getenv_and_setenv_test.cpp
index ffd731e1abd71..5fe21325e1e79 100644
--- a/libc/test/src/fenv/getenv_and_setenv_test.cpp
+++ b/libc/test/src/fenv/getenv_and_setenv_test.cpp
@@ -12,7 +12,7 @@
#include "src/fenv/fesetround.h"
#include "src/__support/FPUtil/FEnvImpl.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <fenv.h>
diff --git a/libc/test/src/fenv/rounding_mode_test.cpp b/libc/test/src/fenv/rounding_mode_test.cpp
index add006a2c1cdb..0f03b5f50cf91 100644
--- a/libc/test/src/fenv/rounding_mode_test.cpp
+++ b/libc/test/src/fenv/rounding_mode_test.cpp
@@ -9,7 +9,7 @@
#include "src/fenv/fegetround.h"
#include "src/fenv/fesetround.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <fenv.h>
diff --git a/libc/test/src/inttypes/imaxabs_test.cpp b/libc/test/src/inttypes/imaxabs_test.cpp
index ddd855c423d73..7c9870495c35a 100644
--- a/libc/test/src/inttypes/imaxabs_test.cpp
+++ b/libc/test/src/inttypes/imaxabs_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/inttypes/imaxabs.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcImaxAbsTest, Zero) {
EXPECT_EQ(__llvm_libc::imaxabs(0), intmax_t(0));
diff --git a/libc/test/src/inttypes/strtoimax_test.cpp b/libc/test/src/inttypes/strtoimax_test.cpp
index 9c062b9600eaa..3947e684fbbca 100644
--- a/libc/test/src/inttypes/strtoimax_test.cpp
+++ b/libc/test/src/inttypes/strtoimax_test.cpp
@@ -8,7 +8,7 @@
#include "src/inttypes/strtoimax.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "test/src/stdlib/StrtolTest.h"
diff --git a/libc/test/src/inttypes/strtoumax_test.cpp b/libc/test/src/inttypes/strtoumax_test.cpp
index b44dc706a7573..77c6dedf6b98d 100644
--- a/libc/test/src/inttypes/strtoumax_test.cpp
+++ b/libc/test/src/inttypes/strtoumax_test.cpp
@@ -8,7 +8,7 @@
#include "src/inttypes/strtoumax.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "test/src/stdlib/StrtolTest.h"
diff --git a/libc/test/src/math/CeilTest.h b/libc/test/src/math/CeilTest.h
index 64be0a316ef30..ca71518ae0c5f 100644
--- a/libc/test/src/math/CeilTest.h
+++ b/libc/test/src/math/CeilTest.h
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/CopySignTest.h b/libc/test/src/math/CopySignTest.h
index 20f400197ceb5..477c1b9bf1f59 100644
--- a/libc/test/src/math/CopySignTest.h
+++ b/libc/test/src/math/CopySignTest.h
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/FAbsTest.h b/libc/test/src/math/FAbsTest.h
index fe163f6ff672e..a46ca4bf8d1a6 100644
--- a/libc/test/src/math/FAbsTest.h
+++ b/libc/test/src/math/FAbsTest.h
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/FDimTest.h b/libc/test/src/math/FDimTest.h
index 5763e04f95f38..0bf15038e1836 100644
--- a/libc/test/src/math/FDimTest.h
+++ b/libc/test/src/math/FDimTest.h
@@ -8,8 +8,8 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include <math.h>
template <typename T>
diff --git a/libc/test/src/math/FMaxTest.h b/libc/test/src/math/FMaxTest.h
index 4a0b2151a9cc3..4e23144345710 100644
--- a/libc/test/src/math/FMaxTest.h
+++ b/libc/test/src/math/FMaxTest.h
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/FMinTest.h b/libc/test/src/math/FMinTest.h
index a5d62622b2053..e02a5ae939af8 100644
--- a/libc/test/src/math/FMinTest.h
+++ b/libc/test/src/math/FMinTest.h
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/FModTest.h b/libc/test/src/math/FModTest.h
index 4962194d939f4..6bff888294d2b 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 "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include <limits>
#include <math.h>
diff --git a/libc/test/src/math/FloorTest.h b/libc/test/src/math/FloorTest.h
index 0a3d5a3994aa0..c830c04d087ca 100644
--- a/libc/test/src/math/FloorTest.h
+++ b/libc/test/src/math/FloorTest.h
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/FmaTest.h b/libc/test/src/math/FmaTest.h
index 4726267cea405..0daa4631080bf 100644
--- a/libc/test/src/math/FmaTest.h
+++ b/libc/test/src/math/FmaTest.h
@@ -10,9 +10,9 @@
#define LLVM_LIBC_TEST_SRC_MATH_FMATEST_H
#include "src/__support/FPUtil/FPBits.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include "utils/testutils/RandUtils.h"
namespace mpfr = __llvm_libc::testing::mpfr;
diff --git a/libc/test/src/math/FrexpTest.h b/libc/test/src/math/FrexpTest.h
index 06789f4ebcc2f..1a9d7de596c29 100644
--- a/libc/test/src/math/FrexpTest.h
+++ b/libc/test/src/math/FrexpTest.h
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/BasicOperations.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/HypotTest.h b/libc/test/src/math/HypotTest.h
index b110bcee3311e..e8b4cf06ad973 100644
--- a/libc/test/src/math/HypotTest.h
+++ b/libc/test/src/math/HypotTest.h
@@ -10,9 +10,9 @@
#define LLVM_LIBC_TEST_SRC_MATH_HYPOTTEST_H
#include "src/__support/FPUtil/FPBits.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/ILogbTest.h b/libc/test/src/math/ILogbTest.h
index b026b0557f9cf..ae26c4e5a0388 100644
--- a/libc/test/src/math/ILogbTest.h
+++ b/libc/test/src/math/ILogbTest.h
@@ -11,7 +11,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <math.h>
#include <limits.h>
diff --git a/libc/test/src/math/LdExpTest.h b/libc/test/src/math/LdExpTest.h
index 5830fc37a6f50..18755aa2d8455 100644
--- a/libc/test/src/math/LdExpTest.h
+++ b/libc/test/src/math/LdExpTest.h
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/NormalFloat.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include <limits.h>
#include <math.h>
diff --git a/libc/test/src/math/LogbTest.h b/libc/test/src/math/LogbTest.h
index 49ccf3a1a832e..d2428ae85a0d4 100644
--- a/libc/test/src/math/LogbTest.h
+++ b/libc/test/src/math/LogbTest.h
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/ManipulationFunctions.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/ModfTest.h b/libc/test/src/math/ModfTest.h
index 4e88c6ae36545..f6073257ee5f8 100644
--- a/libc/test/src/math/ModfTest.h
+++ b/libc/test/src/math/ModfTest.h
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/NextAfterTest.h b/libc/test/src/math/NextAfterTest.h
index 12c9bb988ab7c..e6de9419d9904 100644
--- a/libc/test/src/math/NextAfterTest.h
+++ b/libc/test/src/math/NextAfterTest.h
@@ -13,8 +13,8 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include <math.h>
template <typename T>
diff --git a/libc/test/src/math/RIntTest.h b/libc/test/src/math/RIntTest.h
index de5652b03272e..5fc130f23e1a8 100644
--- a/libc/test/src/math/RIntTest.h
+++ b/libc/test/src/math/RIntTest.h
@@ -11,9 +11,9 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <fenv.h>
#include <math.h>
diff --git a/libc/test/src/math/RemQuoTest.h b/libc/test/src/math/RemQuoTest.h
index 3428f8d6758e4..c6e96577eb0be 100644
--- a/libc/test/src/math/RemQuoTest.h
+++ b/libc/test/src/math/RemQuoTest.h
@@ -11,9 +11,9 @@
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
namespace mpfr = __llvm_libc::testing::mpfr;
diff --git a/libc/test/src/math/RoundTest.h b/libc/test/src/math/RoundTest.h
index 4720f385edabd..f4f40ff34b27f 100644
--- a/libc/test/src/math/RoundTest.h
+++ b/libc/test/src/math/RoundTest.h
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/RoundToIntegerTest.h b/libc/test/src/math/RoundToIntegerTest.h
index a7627b2f50cd8..2c0617f3583f3 100644
--- a/libc/test/src/math/RoundToIntegerTest.h
+++ b/libc/test/src/math/RoundToIntegerTest.h
@@ -11,9 +11,9 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <errno.h>
#include <math.h>
diff --git a/libc/test/src/math/SqrtTest.h b/libc/test/src/math/SqrtTest.h
index 08c0adc9bea42..840076c1cc06e 100644
--- a/libc/test/src/math/SqrtTest.h
+++ b/libc/test/src/math/SqrtTest.h
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/bit.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/TruncTest.h b/libc/test/src/math/TruncTest.h
index f939de40e24dd..9fe3c27900de7 100644
--- a/libc/test/src/math/TruncTest.h
+++ b/libc/test/src/math/TruncTest.h
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/acosf_test.cpp b/libc/test/src/math/acosf_test.cpp
index fa9653739b09e..ea79aff37304e 100644
--- a/libc/test/src/math/acosf_test.cpp
+++ b/libc/test/src/math/acosf_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/acosf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/acoshf_test.cpp b/libc/test/src/math/acoshf_test.cpp
index 96871b1984443..4ac01b7fcb94c 100644
--- a/libc/test/src/math/acoshf_test.cpp
+++ b/libc/test/src/math/acoshf_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/acoshf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/asin_test.cpp b/libc/test/src/math/asin_test.cpp
index ade6da014461c..d1b8483b8824e 100644
--- a/libc/test/src/math/asin_test.cpp
+++ b/libc/test/src/math/asin_test.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/math/asin.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/asinf_test.cpp b/libc/test/src/math/asinf_test.cpp
index 93443fc517bce..890f21f51612e 100644
--- a/libc/test/src/math/asinf_test.cpp
+++ b/libc/test/src/math/asinf_test.cpp
@@ -9,9 +9,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/asinf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/asinhf_test.cpp b/libc/test/src/math/asinhf_test.cpp
index 30f82c5f0c859..d2c6584454abe 100644
--- a/libc/test/src/math/asinhf_test.cpp
+++ b/libc/test/src/math/asinhf_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/asinhf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/atanf_test.cpp b/libc/test/src/math/atanf_test.cpp
index 28c5fcd300575..7601ffb00dd5e 100644
--- a/libc/test/src/math/atanf_test.cpp
+++ b/libc/test/src/math/atanf_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/atanf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/atanhf_test.cpp b/libc/test/src/math/atanhf_test.cpp
index ad6d56d10eada..d4b884894a9e4 100644
--- a/libc/test/src/math/atanhf_test.cpp
+++ b/libc/test/src/math/atanhf_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/atanhf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/cos_test.cpp b/libc/test/src/math/cos_test.cpp
index 0feef88ca17f1..6695272f52bf2 100644
--- a/libc/test/src/math/cos_test.cpp
+++ b/libc/test/src/math/cos_test.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/math/cos.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/cosf_test.cpp b/libc/test/src/math/cosf_test.cpp
index 48b58b92340df..dae3c9336cfe9 100644
--- a/libc/test/src/math/cosf_test.cpp
+++ b/libc/test/src/math/cosf_test.cpp
@@ -8,10 +8,10 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/cosf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "test/src/math/sdcomp26094.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/coshf_test.cpp b/libc/test/src/math/coshf_test.cpp
index 0d859ebbd4c99..f91d09fd5d86f 100644
--- a/libc/test/src/math/coshf_test.cpp
+++ b/libc/test/src/math/coshf_test.cpp
@@ -9,9 +9,9 @@
#include "src/__support/CPP/array.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/coshf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/exhaustive/cosf_test.cpp b/libc/test/src/math/exhaustive/cosf_test.cpp
index e33d8fe3c96e8..55fe889d1494f 100644
--- a/libc/test/src/math/exhaustive/cosf_test.cpp
+++ b/libc/test/src/math/exhaustive/cosf_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/cosf.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
#include <thread>
diff --git a/libc/test/src/math/exhaustive/coshf_test.cpp b/libc/test/src/math/exhaustive/coshf_test.cpp
index 9bb211238b6ea..d5abf2fd975dc 100644
--- a/libc/test/src/math/exhaustive/coshf_test.cpp
+++ b/libc/test/src/math/exhaustive/coshf_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/coshf.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
#include <thread>
diff --git a/libc/test/src/math/exhaustive/exhaustive_test.h b/libc/test/src/math/exhaustive/exhaustive_test.h
index 7e371e87db184..9f9b6bfc1cf5c 100644
--- a/libc/test/src/math/exhaustive/exhaustive_test.h
+++ b/libc/test/src/math/exhaustive/exhaustive_test.h
@@ -8,8 +8,8 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/FPBits.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/Test.h"
// To test exhaustively for inputs in the range [start, stop) in parallel:
// 1. Inherit from LlvmLibcExhaustiveTest class
diff --git a/libc/test/src/math/exhaustive/exp10f_test.cpp b/libc/test/src/math/exhaustive/exp10f_test.cpp
index 8e37f0483d2ba..695f99eef8c95 100644
--- a/libc/test/src/math/exhaustive/exp10f_test.cpp
+++ b/libc/test/src/math/exhaustive/exp10f_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/exp10f.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
#include <thread>
diff --git a/libc/test/src/math/exhaustive/exp2f_test.cpp b/libc/test/src/math/exhaustive/exp2f_test.cpp
index da4a2dfa085b3..e122de8c0ceb3 100644
--- a/libc/test/src/math/exhaustive/exp2f_test.cpp
+++ b/libc/test/src/math/exhaustive/exp2f_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/exp2f.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
using FPBits = __llvm_libc::fputil::FPBits<float>;
diff --git a/libc/test/src/math/exhaustive/expf_test.cpp b/libc/test/src/math/exhaustive/expf_test.cpp
index f15b2ea689ec2..626829fe79f6a 100644
--- a/libc/test/src/math/exhaustive/expf_test.cpp
+++ b/libc/test/src/math/exhaustive/expf_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/expf.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
#include <thread>
diff --git a/libc/test/src/math/exhaustive/expm1f_test.cpp b/libc/test/src/math/exhaustive/expm1f_test.cpp
index c346e577bfeda..4be07795f0783 100644
--- a/libc/test/src/math/exhaustive/expm1f_test.cpp
+++ b/libc/test/src/math/exhaustive/expm1f_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/expm1f.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
#include <thread>
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 f990d64a69ac1..1273cf0b588bd 100644
--- a/libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp
+++ b/libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/generic/FMod.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <array>
#include <limits>
diff --git a/libc/test/src/math/exhaustive/hypotf_test.cpp b/libc/test/src/math/exhaustive/hypotf_test.cpp
index 04b5148426cce..e968b45525688 100644
--- a/libc/test/src/math/exhaustive/hypotf_test.cpp
+++ b/libc/test/src/math/exhaustive/hypotf_test.cpp
@@ -10,8 +10,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/Hypot.h"
#include "src/math/hypotf.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
using FPBits = __llvm_libc::fputil::FPBits<float>;
diff --git a/libc/test/src/math/exhaustive/log10f_test.cpp b/libc/test/src/math/exhaustive/log10f_test.cpp
index 325b1535c5928..dcf345e2cd8a4 100644
--- a/libc/test/src/math/exhaustive/log10f_test.cpp
+++ b/libc/test/src/math/exhaustive/log10f_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/log10f.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
using FPBits = __llvm_libc::fputil::FPBits<float>;
diff --git a/libc/test/src/math/exhaustive/log1pf_test.cpp b/libc/test/src/math/exhaustive/log1pf_test.cpp
index ee1f9e1057f5b..7071eec008339 100644
--- a/libc/test/src/math/exhaustive/log1pf_test.cpp
+++ b/libc/test/src/math/exhaustive/log1pf_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/log1pf.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
using FPBits = __llvm_libc::fputil::FPBits<float>;
diff --git a/libc/test/src/math/exhaustive/log2f_test.cpp b/libc/test/src/math/exhaustive/log2f_test.cpp
index 2836dbbd8f385..e379733125a43 100644
--- a/libc/test/src/math/exhaustive/log2f_test.cpp
+++ b/libc/test/src/math/exhaustive/log2f_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/log2f.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
using FPBits = __llvm_libc::fputil::FPBits<float>;
diff --git a/libc/test/src/math/exhaustive/logf_test.cpp b/libc/test/src/math/exhaustive/logf_test.cpp
index 94abd0090c8b7..e1b13ce9a673b 100644
--- a/libc/test/src/math/exhaustive/logf_test.cpp
+++ b/libc/test/src/math/exhaustive/logf_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/logf.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
using FPBits = __llvm_libc::fputil::FPBits<float>;
diff --git a/libc/test/src/math/exhaustive/sincosf_test.cpp b/libc/test/src/math/exhaustive/sincosf_test.cpp
index bbd14e669fe89..2072fa90c3b1d 100644
--- a/libc/test/src/math/exhaustive/sincosf_test.cpp
+++ b/libc/test/src/math/exhaustive/sincosf_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/sincosf.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
#include <thread>
diff --git a/libc/test/src/math/exhaustive/sinf_test.cpp b/libc/test/src/math/exhaustive/sinf_test.cpp
index de1630a0826bd..4a5f051ead203 100644
--- a/libc/test/src/math/exhaustive/sinf_test.cpp
+++ b/libc/test/src/math/exhaustive/sinf_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/sinf.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
#include <thread>
diff --git a/libc/test/src/math/exhaustive/sinhf_test.cpp b/libc/test/src/math/exhaustive/sinhf_test.cpp
index 958ee7b3f6b52..46e692ddd6ae0 100644
--- a/libc/test/src/math/exhaustive/sinhf_test.cpp
+++ b/libc/test/src/math/exhaustive/sinhf_test.cpp
@@ -9,8 +9,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/sinhf.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
#include <thread>
diff --git a/libc/test/src/math/exhaustive/tanf_test.cpp b/libc/test/src/math/exhaustive/tanf_test.cpp
index c1c53eed698f9..2bf95a9b3682a 100644
--- a/libc/test/src/math/exhaustive/tanf_test.cpp
+++ b/libc/test/src/math/exhaustive/tanf_test.cpp
@@ -10,8 +10,8 @@
#include "exhaustive_test.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/tanf.h"
+#include "test/UnitTest/FPMatcher.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
#include <thread>
diff --git a/libc/test/src/math/exp10f_test.cpp b/libc/test/src/math/exp10f_test.cpp
index eb17e1d3c35b7..d7100fae29470 100644
--- a/libc/test/src/math/exp10f_test.cpp
+++ b/libc/test/src/math/exp10f_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/exp10f.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/exp2f_test.cpp b/libc/test/src/math/exp2f_test.cpp
index 07faeb55de307..87da023801bf3 100644
--- a/libc/test/src/math/exp2f_test.cpp
+++ b/libc/test/src/math/exp2f_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/exp2f.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/expf_test.cpp b/libc/test/src/math/expf_test.cpp
index 05f267e6c19b2..64ca974b902d0 100644
--- a/libc/test/src/math/expf_test.cpp
+++ b/libc/test/src/math/expf_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/expf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/explogxf_test.cpp b/libc/test/src/math/explogxf_test.cpp
index a9d7cc32b6a92..d6d646db9c89b 100644
--- a/libc/test/src/math/explogxf_test.cpp
+++ b/libc/test/src/math/explogxf_test.cpp
@@ -9,9 +9,9 @@
#include "in_float_range_test_helper.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/generic/explogxf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
namespace mpfr = __llvm_libc::testing::mpfr;
diff --git a/libc/test/src/math/expm1f_test.cpp b/libc/test/src/math/expm1f_test.cpp
index 032badbb5c2be..7dc7456089a5b 100644
--- a/libc/test/src/math/expm1f_test.cpp
+++ b/libc/test/src/math/expm1f_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/expm1f.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/fdim_test.cpp b/libc/test/src/math/fdim_test.cpp
index 06b61c2124d22..80174b79b95b8 100644
--- a/libc/test/src/math/fdim_test.cpp
+++ b/libc/test/src/math/fdim_test.cpp
@@ -10,8 +10,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/fdim.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include <math.h>
using LlvmLibcFDimTest = FDimTestTemplate<double>;
diff --git a/libc/test/src/math/fdimf_test.cpp b/libc/test/src/math/fdimf_test.cpp
index c85b755738f31..531b89b81ffc9 100644
--- a/libc/test/src/math/fdimf_test.cpp
+++ b/libc/test/src/math/fdimf_test.cpp
@@ -10,8 +10,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/fdimf.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include <math.h>
using LlvmLibcFDimTest = FDimTestTemplate<float>;
diff --git a/libc/test/src/math/fdiml_test.cpp b/libc/test/src/math/fdiml_test.cpp
index 79427d6a33d26..bb6c54d567a0b 100644
--- a/libc/test/src/math/fdiml_test.cpp
+++ b/libc/test/src/math/fdiml_test.cpp
@@ -10,8 +10,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/fdiml.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include <math.h>
using LlvmLibcFDimTest = FDimTestTemplate<long double>;
diff --git a/libc/test/src/math/ilogb_test.cpp b/libc/test/src/math/ilogb_test.cpp
index b049247815d2c..a77adec4adba4 100644
--- a/libc/test/src/math/ilogb_test.cpp
+++ b/libc/test/src/math/ilogb_test.cpp
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/math/ilogb.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include <math.h>
TEST_F(LlvmLibcILogbTest, SpecialNumbers_ilogb) {
diff --git a/libc/test/src/math/ilogbf_test.cpp b/libc/test/src/math/ilogbf_test.cpp
index 4b330a8fbbd21..20904a13c98a8 100644
--- a/libc/test/src/math/ilogbf_test.cpp
+++ b/libc/test/src/math/ilogbf_test.cpp
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/math/ilogbf.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include <math.h>
TEST_F(LlvmLibcILogbTest, SpecialNumbers_ilogbf) {
diff --git a/libc/test/src/math/ilogbl_test.cpp b/libc/test/src/math/ilogbl_test.cpp
index 5979c96517abe..d7a8cc2013c13 100644
--- a/libc/test/src/math/ilogbl_test.cpp
+++ b/libc/test/src/math/ilogbl_test.cpp
@@ -11,8 +11,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/math/ilogbl.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include <math.h>
using RunContext = __llvm_libc::testing::RunContext;
diff --git a/libc/test/src/math/inv_trigf_utils_test.cpp b/libc/test/src/math/inv_trigf_utils_test.cpp
index 719882386a077..ffcca5cce4203 100644
--- a/libc/test/src/math/inv_trigf_utils_test.cpp
+++ b/libc/test/src/math/inv_trigf_utils_test.cpp
@@ -9,9 +9,9 @@
#include "in_float_range_test_helper.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/generic/inv_trigf_utils.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
namespace mpfr = __llvm_libc::testing::mpfr;
diff --git a/libc/test/src/math/log10_test.cpp b/libc/test/src/math/log10_test.cpp
index c80dab3652d77..edefa4cf02a5d 100644
--- a/libc/test/src/math/log10_test.cpp
+++ b/libc/test/src/math/log10_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/log10.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include "utils/testutils/StreamWrapper.h"
#include <math.h>
diff --git a/libc/test/src/math/log10f_test.cpp b/libc/test/src/math/log10f_test.cpp
index a43290b858894..3e3ef395233d3 100644
--- a/libc/test/src/math/log10f_test.cpp
+++ b/libc/test/src/math/log10f_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/log10f.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/log1pf_test.cpp b/libc/test/src/math/log1pf_test.cpp
index 785d77f317df6..87776634a18e8 100644
--- a/libc/test/src/math/log1pf_test.cpp
+++ b/libc/test/src/math/log1pf_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/log1pf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/log2f_test.cpp b/libc/test/src/math/log2f_test.cpp
index ecedfb68cc7a7..4f56a214afb8a 100644
--- a/libc/test/src/math/log2f_test.cpp
+++ b/libc/test/src/math/log2f_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/log2f.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/logf_test.cpp b/libc/test/src/math/logf_test.cpp
index 1f2834d3cf31b..cd4935b52ed24 100644
--- a/libc/test/src/math/logf_test.cpp
+++ b/libc/test/src/math/logf_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/logf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/mod_k_pi_test.cpp b/libc/test/src/math/mod_k_pi_test.cpp
index 12d915b3612f3..ef34027f83b80 100644
--- a/libc/test/src/math/mod_k_pi_test.cpp
+++ b/libc/test/src/math/mod_k_pi_test.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/math/generic/dp_trig.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/pow_test.cpp b/libc/test/src/math/pow_test.cpp
index effade0bc3888..2be8b87500a4b 100644
--- a/libc/test/src/math/pow_test.cpp
+++ b/libc/test/src/math/pow_test.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/math/pow.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/sin_test.cpp b/libc/test/src/math/sin_test.cpp
index e449074889140..3b31689ba0bce 100644
--- a/libc/test/src/math/sin_test.cpp
+++ b/libc/test/src/math/sin_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/sin.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/sincosf_test.cpp b/libc/test/src/math/sincosf_test.cpp
index 559dec09e2b17..1fd89190c34d2 100644
--- a/libc/test/src/math/sincosf_test.cpp
+++ b/libc/test/src/math/sincosf_test.cpp
@@ -8,10 +8,10 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/sincosf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "test/src/math/sdcomp26094.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/sinf_test.cpp b/libc/test/src/math/sinf_test.cpp
index 7defafa893a4e..3559515c80a55 100644
--- a/libc/test/src/math/sinf_test.cpp
+++ b/libc/test/src/math/sinf_test.cpp
@@ -8,10 +8,10 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/sinf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "test/src/math/sdcomp26094.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/sinhf_test.cpp b/libc/test/src/math/sinhf_test.cpp
index 42afdecce4153..b94c5041d10da 100644
--- a/libc/test/src/math/sinhf_test.cpp
+++ b/libc/test/src/math/sinhf_test.cpp
@@ -9,9 +9,9 @@
#include "src/__support/CPP/array.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/sinhf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/tan_test.cpp b/libc/test/src/math/tan_test.cpp
index 750463148bc05..aabf9cc0eb663 100644
--- a/libc/test/src/math/tan_test.cpp
+++ b/libc/test/src/math/tan_test.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/math/tan.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/tanf_test.cpp b/libc/test/src/math/tanf_test.cpp
index be76d061a577c..cfe1762ecb58d 100644
--- a/libc/test/src/math/tanf_test.cpp
+++ b/libc/test/src/math/tanf_test.cpp
@@ -8,10 +8,10 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/tanf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "test/src/math/sdcomp26094.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/math/tanhf_test.cpp b/libc/test/src/math/tanhf_test.cpp
index 92d8522e0b018..dc8af63f2b9e8 100644
--- a/libc/test/src/math/tanhf_test.cpp
+++ b/libc/test/src/math/tanhf_test.cpp
@@ -8,9 +8,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/tanhf.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <math.h>
#include <errno.h>
diff --git a/libc/test/src/pthread/pthread_attr_test.cpp b/libc/test/src/pthread/pthread_attr_test.cpp
index fe002db966dcd..af9f5d07f1155 100644
--- a/libc/test/src/pthread/pthread_attr_test.cpp
+++ b/libc/test/src/pthread/pthread_attr_test.cpp
@@ -17,7 +17,7 @@
#include "src/pthread/pthread_attr_setstack.h"
#include "src/pthread/pthread_attr_setstacksize.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <linux/param.h> // For EXEC_PAGESIZE.
diff --git a/libc/test/src/pthread/pthread_mutexattr_test.cpp b/libc/test/src/pthread/pthread_mutexattr_test.cpp
index 19c9365dd16de..3ecbc4f5896a4 100644
--- a/libc/test/src/pthread/pthread_mutexattr_test.cpp
+++ b/libc/test/src/pthread/pthread_mutexattr_test.cpp
@@ -14,7 +14,7 @@
#include "src/pthread/pthread_mutexattr_setpshared.h"
#include "src/pthread/pthread_mutexattr_setrobust.h"
#include "src/pthread/pthread_mutexattr_settype.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <pthread.h>
diff --git a/libc/test/src/setjmp/setjmp_test.cpp b/libc/test/src/setjmp/setjmp_test.cpp
index 6dd1a22b8b2a9..8fa915f841c21 100644
--- a/libc/test/src/setjmp/setjmp_test.cpp
+++ b/libc/test/src/setjmp/setjmp_test.cpp
@@ -8,7 +8,7 @@
#include "src/setjmp/longjmp.h"
#include "src/setjmp/setjmp_impl.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
jmp_buf buf;
constexpr int MAX_LOOP = 123;
diff --git a/libc/test/src/signal/kill_test.cpp b/libc/test/src/signal/kill_test.cpp
index aaee7b951d8ae..7464f2c716dc2 100644
--- a/libc/test/src/signal/kill_test.cpp
+++ b/libc/test/src/signal/kill_test.cpp
@@ -11,7 +11,7 @@
#include "include/sys/syscall.h" // For syscall numbers.
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <signal.h>
diff --git a/libc/test/src/signal/raise_test.cpp b/libc/test/src/signal/raise_test.cpp
index 282cedc8b89c9..12c2a269627a1 100644
--- a/libc/test/src/signal/raise_test.cpp
+++ b/libc/test/src/signal/raise_test.cpp
@@ -9,7 +9,7 @@
#include "include/signal.h"
#include "src/signal/raise.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcSignalTest, Raise) {
// SIGCONT is ingored unless stopped, so we can use it to check the return
diff --git a/libc/test/src/signal/sigaction_test.cpp b/libc/test/src/signal/sigaction_test.cpp
index 3696694655b5b..f8f2940aab549 100644
--- a/libc/test/src/signal/sigaction_test.cpp
+++ b/libc/test/src/signal/sigaction_test.cpp
@@ -10,7 +10,7 @@
#include "src/signal/sigaction.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <signal.h>
diff --git a/libc/test/src/signal/sigaddset_test.cpp b/libc/test/src/signal/sigaddset_test.cpp
index 7633bdbc44f0a..a9cc5141cb8f2 100644
--- a/libc/test/src/signal/sigaddset_test.cpp
+++ b/libc/test/src/signal/sigaddset_test.cpp
@@ -11,7 +11,7 @@
#include "src/signal/sigaddset.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
// This tests invalid inputs and ensures errno is properly set.
TEST(LlvmLibcSignalTest, SigaddsetInvalid) {
diff --git a/libc/test/src/signal/sigaltstack_test.cpp b/libc/test/src/signal/sigaltstack_test.cpp
index 3920c0dfe193a..15f2089ee913c 100644
--- a/libc/test/src/signal/sigaltstack_test.cpp
+++ b/libc/test/src/signal/sigaltstack_test.cpp
@@ -13,7 +13,7 @@
#include "src/signal/sigaltstack.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <signal.h>
diff --git a/libc/test/src/signal/sigdelset_test.cpp b/libc/test/src/signal/sigdelset_test.cpp
index c4947a38b384a..334344e314c39 100644
--- a/libc/test/src/signal/sigdelset_test.cpp
+++ b/libc/test/src/signal/sigdelset_test.cpp
@@ -14,7 +14,7 @@
#include "src/signal/sigprocmask.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcSigdelset, Invalid) {
using __llvm_libc::testing::ErrnoSetterMatcher::Fails;
diff --git a/libc/test/src/signal/sigfillset_test.cpp b/libc/test/src/signal/sigfillset_test.cpp
index 3f5561eb153e7..683bfed1113cb 100644
--- a/libc/test/src/signal/sigfillset_test.cpp
+++ b/libc/test/src/signal/sigfillset_test.cpp
@@ -13,7 +13,7 @@
#include "src/signal/sigprocmask.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcSigfillset, Invalid) {
using __llvm_libc::testing::ErrnoSetterMatcher::Fails;
diff --git a/libc/test/src/signal/signal_test.cpp b/libc/test/src/signal/signal_test.cpp
index edcecbb097523..9946891e51667 100644
--- a/libc/test/src/signal/signal_test.cpp
+++ b/libc/test/src/signal/signal_test.cpp
@@ -13,7 +13,7 @@
#include "src/signal/signal.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::testing::ErrnoSetterMatcher::Fails;
using __llvm_libc::testing::ErrnoSetterMatcher::Succeeds;
diff --git a/libc/test/src/signal/sigprocmask_test.cpp b/libc/test/src/signal/sigprocmask_test.cpp
index e6463627ea9ed..e0ce054bdde8c 100644
--- a/libc/test/src/signal/sigprocmask_test.cpp
+++ b/libc/test/src/signal/sigprocmask_test.cpp
@@ -15,7 +15,7 @@
#include "src/signal/sigprocmask.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
class LlvmLibcSignalTest : public __llvm_libc::testing::Test {
sigset_t oldSet;
diff --git a/libc/test/src/spawn/posix_spawn_file_actions_test.cpp b/libc/test/src/spawn/posix_spawn_file_actions_test.cpp
index f486745158f9a..abd2d78fdd5bb 100644
--- a/libc/test/src/spawn/posix_spawn_file_actions_test.cpp
+++ b/libc/test/src/spawn/posix_spawn_file_actions_test.cpp
@@ -12,7 +12,7 @@
#include "src/spawn/posix_spawn_file_actions_addopen.h"
#include "src/spawn/posix_spawn_file_actions_destroy.h"
#include "src/spawn/posix_spawn_file_actions_init.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <spawn.h>
diff --git a/libc/test/src/stdio/fgetc_test.cpp b/libc/test/src/stdio/fgetc_test.cpp
index 5be141ecd202e..464fd20314ec0 100644
--- a/libc/test/src/stdio/fgetc_test.cpp
+++ b/libc/test/src/stdio/fgetc_test.cpp
@@ -14,7 +14,7 @@
#include "src/stdio/fopen.h"
#include "src/stdio/fwrite.h"
#include "src/stdio/getc.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdio/fgetc_unlocked_test.cpp b/libc/test/src/stdio/fgetc_unlocked_test.cpp
index 2687b2231afd5..d8e0cd1c6cd3a 100644
--- a/libc/test/src/stdio/fgetc_unlocked_test.cpp
+++ b/libc/test/src/stdio/fgetc_unlocked_test.cpp
@@ -17,7 +17,7 @@
#include "src/stdio/funlockfile.h"
#include "src/stdio/fwrite.h"
#include "src/stdio/getc_unlocked.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdio/fgets_test.cpp b/libc/test/src/stdio/fgets_test.cpp
index bd2271b832a61..1ef24150d944b 100644
--- a/libc/test/src/stdio/fgets_test.cpp
+++ b/libc/test/src/stdio/fgets_test.cpp
@@ -12,7 +12,7 @@
#include "src/stdio/fgets.h"
#include "src/stdio/fopen.h"
#include "src/stdio/fwrite.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdio/fileop_test.cpp b/libc/test/src/stdio/fileop_test.cpp
index f473abd7278cd..6d068adb96f8a 100644
--- a/libc/test/src/stdio/fileop_test.cpp
+++ b/libc/test/src/stdio/fileop_test.cpp
@@ -16,7 +16,7 @@
#include "src/stdio/fread.h"
#include "src/stdio/fseek.h"
#include "src/stdio/fwrite.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdio/fopencookie_test.cpp b/libc/test/src/stdio/fopencookie_test.cpp
index 328256fc1f608..ff24b5836a695 100644
--- a/libc/test/src/stdio/fopencookie_test.cpp
+++ b/libc/test/src/stdio/fopencookie_test.cpp
@@ -15,8 +15,8 @@
#include "src/stdio/fread.h"
#include "src/stdio/fseek.h"
#include "src/stdio/fwrite.h"
-#include "utils/UnitTest/MemoryMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/MemoryMatcher.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdio/fprintf_test.cpp b/libc/test/src/stdio/fprintf_test.cpp
index 84f1c316af822..7b0b1ad2086d8 100644
--- a/libc/test/src/stdio/fprintf_test.cpp
+++ b/libc/test/src/stdio/fprintf_test.cpp
@@ -13,7 +13,7 @@
#include "src/stdio/fprintf.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdio/fscanf_test.cpp b/libc/test/src/stdio/fscanf_test.cpp
index e73b6a6e7fb71..f4f61a2714d07 100644
--- a/libc/test/src/stdio/fscanf_test.cpp
+++ b/libc/test/src/stdio/fscanf_test.cpp
@@ -14,7 +14,7 @@
#include "src/stdio/fscanf.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdio/ftell_test.cpp b/libc/test/src/stdio/ftell_test.cpp
index 97facafe58bbb..5a74c44dfd363 100644
--- a/libc/test/src/stdio/ftell_test.cpp
+++ b/libc/test/src/stdio/ftell_test.cpp
@@ -14,7 +14,7 @@
#include "src/stdio/ftell.h"
#include "src/stdio/fwrite.h"
#include "src/stdio/setvbuf.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdio/printf_core/converter_test.cpp b/libc/test/src/stdio/printf_core/converter_test.cpp
index ac79d67d75dfb..55b77794720d2 100644
--- a/libc/test/src/stdio/printf_core/converter_test.cpp
+++ b/libc/test/src/stdio/printf_core/converter_test.cpp
@@ -11,7 +11,7 @@
#include "src/stdio/printf_core/string_writer.h"
#include "src/stdio/printf_core/writer.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
class LlvmLibcPrintfConverterTest : public __llvm_libc::testing::Test {
protected:
diff --git a/libc/test/src/stdio/printf_core/parser_test.cpp b/libc/test/src/stdio/printf_core/parser_test.cpp
index 3ae8bf47c8909..aa30a1c47a903 100644
--- a/libc/test/src/stdio/printf_core/parser_test.cpp
+++ b/libc/test/src/stdio/printf_core/parser_test.cpp
@@ -13,8 +13,8 @@
#include <stdarg.h>
-#include "utils/UnitTest/PrintfMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/PrintfMatcher.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::cpp::string_view;
diff --git a/libc/test/src/stdio/printf_core/string_writer_test.cpp b/libc/test/src/stdio/printf_core/string_writer_test.cpp
index 17094766faed0..7e67137584326 100644
--- a/libc/test/src/stdio/printf_core/string_writer_test.cpp
+++ b/libc/test/src/stdio/printf_core/string_writer_test.cpp
@@ -10,7 +10,7 @@
#include "src/stdio/printf_core/string_writer.h"
#include "src/stdio/printf_core/writer.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::cpp::string_view;
diff --git a/libc/test/src/stdio/printf_test.cpp b/libc/test/src/stdio/printf_test.cpp
index f781d90403b59..e2e3675d443dd 100644
--- a/libc/test/src/stdio/printf_test.cpp
+++ b/libc/test/src/stdio/printf_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdio/printf.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcPrintfTest, PrintOut) {
int written;
diff --git a/libc/test/src/stdio/putc_test.cpp b/libc/test/src/stdio/putc_test.cpp
index 7859588ddc4fc..384526b44748b 100644
--- a/libc/test/src/stdio/putc_test.cpp
+++ b/libc/test/src/stdio/putc_test.cpp
@@ -13,7 +13,7 @@
#include "src/stdio/putc.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdio/puts_test.cpp b/libc/test/src/stdio/puts_test.cpp
index c32fdff3bcda6..a9fe1717783fd 100644
--- a/libc/test/src/stdio/puts_test.cpp
+++ b/libc/test/src/stdio/puts_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdio/puts.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcPutsTest, PrintOut) {
int result;
diff --git a/libc/test/src/stdio/remove_test.cpp b/libc/test/src/stdio/remove_test.cpp
index 0c546b2f491fd..4295046b0df26 100644
--- a/libc/test/src/stdio/remove_test.cpp
+++ b/libc/test/src/stdio/remove_test.cpp
@@ -12,7 +12,7 @@
#include "src/unistd/access.h"
#include "src/unistd/close.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/stdio/scanf_core/converter_test.cpp b/libc/test/src/stdio/scanf_core/converter_test.cpp
index d90af34ff1979..97cb77e91c9b2 100644
--- a/libc/test/src/stdio/scanf_core/converter_test.cpp
+++ b/libc/test/src/stdio/scanf_core/converter_test.cpp
@@ -12,7 +12,7 @@
#include "src/stdio/scanf_core/reader.h"
#include "src/stdio/scanf_core/string_reader.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcScanfConverterTest, RawMatchBasic) {
const char *str = "abcdef";
diff --git a/libc/test/src/stdio/scanf_core/parser_test.cpp b/libc/test/src/stdio/scanf_core/parser_test.cpp
index 3d2c0817e880f..d5058a157349b 100644
--- a/libc/test/src/stdio/scanf_core/parser_test.cpp
+++ b/libc/test/src/stdio/scanf_core/parser_test.cpp
@@ -14,8 +14,8 @@
#include <stdarg.h>
-#include "utils/UnitTest/ScanfMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/ScanfMatcher.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::cpp::string_view;
diff --git a/libc/test/src/stdio/scanf_core/string_reader_test.cpp b/libc/test/src/stdio/scanf_core/string_reader_test.cpp
index 4331d488be06a..4b3d14855d517 100644
--- a/libc/test/src/stdio/scanf_core/string_reader_test.cpp
+++ b/libc/test/src/stdio/scanf_core/string_reader_test.cpp
@@ -10,7 +10,7 @@
#include "src/stdio/scanf_core/reader.h"
#include "src/stdio/scanf_core/string_reader.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcScanfStringReaderTest, Constructor) {
char str[10];
diff --git a/libc/test/src/stdio/setbuf_test.cpp b/libc/test/src/stdio/setbuf_test.cpp
index 0a53e221cf425..3c2bb379cad28 100644
--- a/libc/test/src/stdio/setbuf_test.cpp
+++ b/libc/test/src/stdio/setbuf_test.cpp
@@ -12,7 +12,7 @@
#include "src/stdio/fwrite.h"
#include "src/stdio/setbuf.h"
#include "src/stdio/ungetc.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stdio.h>
diff --git a/libc/test/src/stdio/setvbuf_test.cpp b/libc/test/src/stdio/setvbuf_test.cpp
index 3cdcc044c38e1..f111fcc1c0d19 100644
--- a/libc/test/src/stdio/setvbuf_test.cpp
+++ b/libc/test/src/stdio/setvbuf_test.cpp
@@ -11,7 +11,7 @@
#include "src/stdio/fread.h"
#include "src/stdio/fwrite.h"
#include "src/stdio/setvbuf.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdio/snprintf_test.cpp b/libc/test/src/stdio/snprintf_test.cpp
index 4930f37c4084c..124264b5a1e8a 100644
--- a/libc/test/src/stdio/snprintf_test.cpp
+++ b/libc/test/src/stdio/snprintf_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdio/snprintf.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
// The sprintf test cases cover testing the shared printf functionality, so
// these tests will focus on snprintf exclusive features.
diff --git a/libc/test/src/stdio/sprintf_test.cpp b/libc/test/src/stdio/sprintf_test.cpp
index 8e16c889a1a4a..6a5612380294b 100644
--- a/libc/test/src/stdio/sprintf_test.cpp
+++ b/libc/test/src/stdio/sprintf_test.cpp
@@ -10,7 +10,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/PlatformDefs.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/RoundingModeUtils.h"
// #include <stdio.h>
diff --git a/libc/test/src/stdio/sscanf_test.cpp b/libc/test/src/stdio/sscanf_test.cpp
index 64da77b377784..b6535dfde076c 100644
--- a/libc/test/src/stdio/sscanf_test.cpp
+++ b/libc/test/src/stdio/sscanf_test.cpp
@@ -14,8 +14,8 @@
#include <stdio.h> // For EOF
-#include "utils/UnitTest/FPMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/FPMatcher.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcSScanfTest, SimpleStringConv) {
int ret_val;
diff --git a/libc/test/src/stdio/ungetc_test.cpp b/libc/test/src/stdio/ungetc_test.cpp
index 0102be7b2e0fb..028343d8b9793 100644
--- a/libc/test/src/stdio/ungetc_test.cpp
+++ b/libc/test/src/stdio/ungetc_test.cpp
@@ -12,7 +12,7 @@
#include "src/stdio/fseek.h"
#include "src/stdio/fwrite.h"
#include "src/stdio/ungetc.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stdio.h>
diff --git a/libc/test/src/stdio/unlocked_fileop_test.cpp b/libc/test/src/stdio/unlocked_fileop_test.cpp
index 14b4bc6f57e27..86a63545b985c 100644
--- a/libc/test/src/stdio/unlocked_fileop_test.cpp
+++ b/libc/test/src/stdio/unlocked_fileop_test.cpp
@@ -15,7 +15,7 @@
#include "src/stdio/fread_unlocked.h"
#include "src/stdio/funlockfile.h"
#include "src/stdio/fwrite_unlocked.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdio.h>
diff --git a/libc/test/src/stdlib/AtoiTest.h b/libc/test/src/stdlib/AtoiTest.h
index db48945e3cd93..923489d6644c7 100644
--- a/libc/test/src/stdlib/AtoiTest.h
+++ b/libc/test/src/stdlib/AtoiTest.h
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/type_traits.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <limits.h>
diff --git a/libc/test/src/stdlib/DivTest.h b/libc/test/src/stdlib/DivTest.h
index 6d35943f0d684..5867c5b7a0231 100644
--- a/libc/test/src/stdlib/DivTest.h
+++ b/libc/test/src/stdlib/DivTest.h
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
template <typename IntType, typename ReturnType>
class DivTest : public __llvm_libc::testing::Test {
diff --git a/libc/test/src/stdlib/StrtolTest.h b/libc/test/src/stdlib/StrtolTest.h
index f240c64e52abf..f3d610e9799f9 100644
--- a/libc/test/src/stdlib/StrtolTest.h
+++ b/libc/test/src/stdlib/StrtolTest.h
@@ -8,7 +8,7 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/CPP/type_traits.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <limits.h>
diff --git a/libc/test/src/stdlib/_Exit_test.cpp b/libc/test/src/stdlib/_Exit_test.cpp
index a07034dbf310e..e4a55bc29b35d 100644
--- a/libc/test/src/stdlib/_Exit_test.cpp
+++ b/libc/test/src/stdlib/_Exit_test.cpp
@@ -9,7 +9,7 @@
#include "include/stdlib.h"
#include "src/stdlib/_Exit.h"
#include "src/stdlib/exit.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStdlib, _Exit) {
EXPECT_EXITS([] { __llvm_libc::_Exit(1); }, 1);
diff --git a/libc/test/src/stdlib/abort_test.cpp b/libc/test/src/stdlib/abort_test.cpp
index 759fb0223b801..cd3a2a14c1e8b 100644
--- a/libc/test/src/stdlib/abort_test.cpp
+++ b/libc/test/src/stdlib/abort_test.cpp
@@ -9,7 +9,7 @@
#include "include/signal.h"
#include "include/stdlib.h"
#include "src/stdlib/abort.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStdlib, abort) {
// -1 matches against any signal, which is necessary for now until
diff --git a/libc/test/src/stdlib/abs_test.cpp b/libc/test/src/stdlib/abs_test.cpp
index e01cd1892f3d6..a402253fb0695 100644
--- a/libc/test/src/stdlib/abs_test.cpp
+++ b/libc/test/src/stdlib/abs_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/stdlib/abs.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcAbsTest, Zero) { EXPECT_EQ(__llvm_libc::abs(0), 0); }
diff --git a/libc/test/src/stdlib/atexit_test.cpp b/libc/test/src/stdlib/atexit_test.cpp
index 2f79dbcd5bd69..eb295adfb719a 100644
--- a/libc/test/src/stdlib/atexit_test.cpp
+++ b/libc/test/src/stdlib/atexit_test.cpp
@@ -10,7 +10,7 @@
#include "src/__support/CPP/utility.h"
#include "src/stdlib/atexit.h"
#include "src/stdlib/exit.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
static int a;
TEST(LlvmLibcAtExit, Basic) {
diff --git a/libc/test/src/stdlib/atof_test.cpp b/libc/test/src/stdlib/atof_test.cpp
index 620308c37d605..3ca27977ecd14 100644
--- a/libc/test/src/stdlib/atof_test.cpp
+++ b/libc/test/src/stdlib/atof_test.cpp
@@ -9,7 +9,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/stdlib/atof.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <limits.h>
diff --git a/libc/test/src/stdlib/atoi_test.cpp b/libc/test/src/stdlib/atoi_test.cpp
index 7e605e479cc0f..70c5b98733975 100644
--- a/libc/test/src/stdlib/atoi_test.cpp
+++ b/libc/test/src/stdlib/atoi_test.cpp
@@ -10,6 +10,6 @@
#include "src/stdlib/atoi.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
ATOI_TEST(Atoi, __llvm_libc::atoi)
diff --git a/libc/test/src/stdlib/atol_test.cpp b/libc/test/src/stdlib/atol_test.cpp
index 5c1f22b8dab49..7b4dffd8d124d 100644
--- a/libc/test/src/stdlib/atol_test.cpp
+++ b/libc/test/src/stdlib/atol_test.cpp
@@ -10,6 +10,6 @@
#include "src/stdlib/atol.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
ATOI_TEST(Atol, __llvm_libc::atol)
diff --git a/libc/test/src/stdlib/atoll_test.cpp b/libc/test/src/stdlib/atoll_test.cpp
index c600058830e8a..8052f2fb15b69 100644
--- a/libc/test/src/stdlib/atoll_test.cpp
+++ b/libc/test/src/stdlib/atoll_test.cpp
@@ -10,6 +10,6 @@
#include "src/stdlib/atoll.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
ATOI_TEST(Atoll, __llvm_libc::atoll)
diff --git a/libc/test/src/stdlib/bsearch_test.cpp b/libc/test/src/stdlib/bsearch_test.cpp
index b8bd319f051ca..4726f28c129a6 100644
--- a/libc/test/src/stdlib/bsearch_test.cpp
+++ b/libc/test/src/stdlib/bsearch_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdlib/bsearch.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stdlib.h>
diff --git a/libc/test/src/stdlib/labs_test.cpp b/libc/test/src/stdlib/labs_test.cpp
index 144cbc6fd48b3..1209d174331e3 100644
--- a/libc/test/src/stdlib/labs_test.cpp
+++ b/libc/test/src/stdlib/labs_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/stdlib/labs.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcLabsTest, Zero) { EXPECT_EQ(__llvm_libc::labs(0l), 0l); }
diff --git a/libc/test/src/stdlib/llabs_test.cpp b/libc/test/src/stdlib/llabs_test.cpp
index 4d86c8fe6918b..13ed4f8f1c523 100644
--- a/libc/test/src/stdlib/llabs_test.cpp
+++ b/libc/test/src/stdlib/llabs_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/stdlib/llabs.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcLlabsTest, Zero) { EXPECT_EQ(__llvm_libc::llabs(0ll), 0ll); }
diff --git a/libc/test/src/stdlib/qsort_test.cpp b/libc/test/src/stdlib/qsort_test.cpp
index 99ccc3fa6046c..9808ad0dcc275 100644
--- a/libc/test/src/stdlib/qsort_test.cpp
+++ b/libc/test/src/stdlib/qsort_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdlib/qsort.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stdlib.h>
diff --git a/libc/test/src/stdlib/rand_test.cpp b/libc/test/src/stdlib/rand_test.cpp
index 5b03839f83f6f..fcd693cda743b 100644
--- a/libc/test/src/stdlib/rand_test.cpp
+++ b/libc/test/src/stdlib/rand_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdlib/rand.h"
#include "src/stdlib/srand.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stddef.h>
#include <stdlib.h>
diff --git a/libc/test/src/stdlib/strtod_test.cpp b/libc/test/src/stdlib/strtod_test.cpp
index e82547825c064..44f8dca4dda46 100644
--- a/libc/test/src/stdlib/strtod_test.cpp
+++ b/libc/test/src/stdlib/strtod_test.cpp
@@ -9,7 +9,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/stdlib/strtod.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/RoundingModeUtils.h"
#include <errno.h>
diff --git a/libc/test/src/stdlib/strtof_test.cpp b/libc/test/src/stdlib/strtof_test.cpp
index 09f13f97ec556..4fed552041974 100644
--- a/libc/test/src/stdlib/strtof_test.cpp
+++ b/libc/test/src/stdlib/strtof_test.cpp
@@ -9,7 +9,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/stdlib/strtof.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/RoundingModeUtils.h"
#include <errno.h>
diff --git a/libc/test/src/stdlib/strtol_test.cpp b/libc/test/src/stdlib/strtol_test.cpp
index ff329ea489177..f6cd120f92cf9 100644
--- a/libc/test/src/stdlib/strtol_test.cpp
+++ b/libc/test/src/stdlib/strtol_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdlib/strtol.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "StrtolTest.h"
diff --git a/libc/test/src/stdlib/strtold_test.cpp b/libc/test/src/stdlib/strtold_test.cpp
index e0305dd348532..75eb29e6a9815 100644
--- a/libc/test/src/stdlib/strtold_test.cpp
+++ b/libc/test/src/stdlib/strtold_test.cpp
@@ -10,7 +10,7 @@
#include "src/__support/UInt128.h"
#include "src/stdlib/strtold.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <limits.h>
diff --git a/libc/test/src/stdlib/strtoll_test.cpp b/libc/test/src/stdlib/strtoll_test.cpp
index 7ded293a0c9cc..b4b197d59ea06 100644
--- a/libc/test/src/stdlib/strtoll_test.cpp
+++ b/libc/test/src/stdlib/strtoll_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdlib/strtoll.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "StrtolTest.h"
diff --git a/libc/test/src/stdlib/strtoul_test.cpp b/libc/test/src/stdlib/strtoul_test.cpp
index a9ff51a8035ee..f2cd8603a9832 100644
--- a/libc/test/src/stdlib/strtoul_test.cpp
+++ b/libc/test/src/stdlib/strtoul_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdlib/strtoul.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "StrtolTest.h"
diff --git a/libc/test/src/stdlib/strtoull_test.cpp b/libc/test/src/stdlib/strtoull_test.cpp
index 5226f20281b20..c2544060d8bd5 100644
--- a/libc/test/src/stdlib/strtoull_test.cpp
+++ b/libc/test/src/stdlib/strtoull_test.cpp
@@ -8,7 +8,7 @@
#include "src/stdlib/strtoull.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "StrtolTest.h"
diff --git a/libc/test/src/string/bcmp_test.cpp b/libc/test/src/string/bcmp_test.cpp
index 5f0bb0fc932fa..a7f463cece35b 100644
--- a/libc/test/src/string/bcmp_test.cpp
+++ b/libc/test/src/string/bcmp_test.cpp
@@ -8,7 +8,7 @@
#include "memory_utils/memory_check_utils.h"
#include "src/string/bcmp.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/src/string/bcopy_test.cpp b/libc/test/src/string/bcopy_test.cpp
index fa57d2502c2de..c1c0dae4fcd6e 100644
--- a/libc/test/src/string/bcopy_test.cpp
+++ b/libc/test/src/string/bcopy_test.cpp
@@ -8,8 +8,8 @@
#include "src/__support/CPP/span.h"
#include "src/string/bcopy.h"
-#include "utils/UnitTest/MemoryMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/MemoryMatcher.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::cpp::array;
using __llvm_libc::cpp::span;
diff --git a/libc/test/src/string/bzero_test.cpp b/libc/test/src/string/bzero_test.cpp
index 1f4be711edc44..a476c43bdf6e6 100644
--- a/libc/test/src/string/bzero_test.cpp
+++ b/libc/test/src/string/bzero_test.cpp
@@ -8,7 +8,7 @@
#include "memory_utils/memory_check_utils.h"
#include "src/string/bzero.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/src/string/memccpy_test.cpp b/libc/test/src/string/memccpy_test.cpp
index c5a32600dc393..09f24ae7cdeac 100644
--- a/libc/test/src/string/memccpy_test.cpp
+++ b/libc/test/src/string/memccpy_test.cpp
@@ -8,7 +8,7 @@
#include "src/__support/CPP/span.h"
#include "src/string/memccpy.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stddef.h> // For size_t.
class LlvmLibcMemccpyTest : public __llvm_libc::testing::Test {
diff --git a/libc/test/src/string/memchr_test.cpp b/libc/test/src/string/memchr_test.cpp
index 5b70b4e89b516..1523be8f3fc36 100644
--- a/libc/test/src/string/memchr_test.cpp
+++ b/libc/test/src/string/memchr_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/memchr.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stddef.h>
// A helper function that calls memchr and abstracts away the explicit cast for
diff --git a/libc/test/src/string/memcmp_test.cpp b/libc/test/src/string/memcmp_test.cpp
index 9056851add960..1e412a3c22c63 100644
--- a/libc/test/src/string/memcmp_test.cpp
+++ b/libc/test/src/string/memcmp_test.cpp
@@ -8,7 +8,7 @@
#include "memory_utils/memory_check_utils.h"
#include "src/string/memcmp.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/src/string/memcpy_test.cpp b/libc/test/src/string/memcpy_test.cpp
index 99631630f2645..e9863e6f79819 100644
--- a/libc/test/src/string/memcpy_test.cpp
+++ b/libc/test/src/string/memcpy_test.cpp
@@ -8,7 +8,7 @@
#include "memory_utils/memory_check_utils.h"
#include "src/string/memcpy.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/src/string/memmove_test.cpp b/libc/test/src/string/memmove_test.cpp
index 26c193620b453..ab5d8ad210727 100644
--- a/libc/test/src/string/memmove_test.cpp
+++ b/libc/test/src/string/memmove_test.cpp
@@ -8,8 +8,8 @@
#include "src/__support/CPP/span.h"
#include "src/string/memmove.h"
-#include "utils/UnitTest/MemoryMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/MemoryMatcher.h"
+#include "test/UnitTest/Test.h"
using __llvm_libc::cpp::array;
using __llvm_libc::cpp::span;
diff --git a/libc/test/src/string/memory_utils/op_tests.cpp b/libc/test/src/string/memory_utils/op_tests.cpp
index 8b54cfec7fca5..567695698ddf6 100644
--- a/libc/test/src/string/memory_utils/op_tests.cpp
+++ b/libc/test/src/string/memory_utils/op_tests.cpp
@@ -11,7 +11,7 @@
#include "src/string/memory_utils/op_builtin.h"
#include "src/string/memory_utils/op_generic.h"
#include "src/string/memory_utils/op_x86.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <assert.h>
diff --git a/libc/test/src/string/memory_utils/utils_test.cpp b/libc/test/src/string/memory_utils/utils_test.cpp
index 5c7920c4960b6..3f8ce5da72aaa 100644
--- a/libc/test/src/string/memory_utils/utils_test.cpp
+++ b/libc/test/src/string/memory_utils/utils_test.cpp
@@ -8,7 +8,7 @@
#include "src/__support/CPP/array.h"
#include "src/string/memory_utils/utils.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/src/string/mempcpy_test.cpp b/libc/test/src/string/mempcpy_test.cpp
index 9f95db56b84cc..8d74a8b794469 100644
--- a/libc/test/src/string/mempcpy_test.cpp
+++ b/libc/test/src/string/mempcpy_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/mempcpy.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
// Since this function just calls out to memcpy, and memcpy has its own unit
// tests, it is assumed that memcpy works. These tests are just for the specific
diff --git a/libc/test/src/string/memrchr_test.cpp b/libc/test/src/string/memrchr_test.cpp
index d7a931970ce63..c8e81ecfbfaa7 100644
--- a/libc/test/src/string/memrchr_test.cpp
+++ b/libc/test/src/string/memrchr_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/memrchr.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stddef.h>
// A helper function that calls memrchr and abstracts away the explicit cast for
diff --git a/libc/test/src/string/memset_test.cpp b/libc/test/src/string/memset_test.cpp
index 1b484ef1f06a4..eab85e34836d4 100644
--- a/libc/test/src/string/memset_test.cpp
+++ b/libc/test/src/string/memset_test.cpp
@@ -8,7 +8,7 @@
#include "memory_utils/memory_check_utils.h"
#include "src/string/memset.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/src/string/stpcpy_test.cpp b/libc/test/src/string/stpcpy_test.cpp
index e5ed3fb06f785..56e53c12f8659 100644
--- a/libc/test/src/string/stpcpy_test.cpp
+++ b/libc/test/src/string/stpcpy_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/stpcpy.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "src/string/string_utils.h"
diff --git a/libc/test/src/string/stpncpy_test.cpp b/libc/test/src/string/stpncpy_test.cpp
index 09f977a46e67e..2448ea5759767 100644
--- a/libc/test/src/string/stpncpy_test.cpp
+++ b/libc/test/src/string/stpncpy_test.cpp
@@ -8,7 +8,7 @@
#include "src/__support/CPP/span.h"
#include "src/string/stpncpy.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stddef.h> // For size_t.
class LlvmLibcStpncpyTest : public __llvm_libc::testing::Test {
diff --git a/libc/test/src/string/strcasecmp_test.cpp b/libc/test/src/string/strcasecmp_test.cpp
index a8200104d22c2..2eb16ee76fd8a 100644
--- a/libc/test/src/string/strcasecmp_test.cpp
+++ b/libc/test/src/string/strcasecmp_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strcasecmp.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrCaseCmpTest, EmptyStringsShouldReturnZero) {
const char *s1 = "";
diff --git a/libc/test/src/string/strcasestr_test.cpp b/libc/test/src/string/strcasestr_test.cpp
index 313ad8ebee665..6345ac5e3e1c3 100644
--- a/libc/test/src/string/strcasestr_test.cpp
+++ b/libc/test/src/string/strcasestr_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strcasestr.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrCaseStrTest, NeedleNotInHaystack) {
EXPECT_STREQ(__llvm_libc::strcasestr("abcd", "e"), nullptr);
diff --git a/libc/test/src/string/strcat_test.cpp b/libc/test/src/string/strcat_test.cpp
index b72fe71d9307b..2fd42123ec79f 100644
--- a/libc/test/src/string/strcat_test.cpp
+++ b/libc/test/src/string/strcat_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strcat.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrCatTest, EmptyDest) {
const char *abc = "abc";
diff --git a/libc/test/src/string/strchr_test.cpp b/libc/test/src/string/strchr_test.cpp
index 6ba13f4a154a7..0dedd285a28f1 100644
--- a/libc/test/src/string/strchr_test.cpp
+++ b/libc/test/src/string/strchr_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strchr.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrChrTest, FindsFirstCharacter) {
const char *src = "abcde";
diff --git a/libc/test/src/string/strcmp_test.cpp b/libc/test/src/string/strcmp_test.cpp
index 9f707dbf1581b..78dd8c1a8d4e7 100644
--- a/libc/test/src/string/strcmp_test.cpp
+++ b/libc/test/src/string/strcmp_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strcmp.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrCmpTest, EmptyStringsShouldReturnZero) {
const char *s1 = "";
diff --git a/libc/test/src/string/strcoll_test.cpp b/libc/test/src/string/strcoll_test.cpp
index cb99f0a509b25..256c3c7bd281a 100644
--- a/libc/test/src/string/strcoll_test.cpp
+++ b/libc/test/src/string/strcoll_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strcoll.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
// TODO: Add more comprehensive tests once locale support is added.
diff --git a/libc/test/src/string/strcpy_test.cpp b/libc/test/src/string/strcpy_test.cpp
index 1b6c47741b17f..7508b56e23db2 100644
--- a/libc/test/src/string/strcpy_test.cpp
+++ b/libc/test/src/string/strcpy_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strcpy.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrCpyTest, EmptySrc) {
const char *empty = "";
diff --git a/libc/test/src/string/strcspn_test.cpp b/libc/test/src/string/strcspn_test.cpp
index eb8d4276bf59c..2f3565c78f6b3 100644
--- a/libc/test/src/string/strcspn_test.cpp
+++ b/libc/test/src/string/strcspn_test.cpp
@@ -8,7 +8,7 @@
#include "src/string/strcspn.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrCSpnTest, ComplementarySpanShouldNotGoPastNullTerminator) {
const char src[5] = {'a', 'b', '\0', 'c', 'd'};
diff --git a/libc/test/src/string/strdup_test.cpp b/libc/test/src/string/strdup_test.cpp
index 65760033156d6..ffbc55a70fb21 100644
--- a/libc/test/src/string/strdup_test.cpp
+++ b/libc/test/src/string/strdup_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strdup.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/libc/test/src/string/strerror_r_test.cpp b/libc/test/src/string/strerror_r_test.cpp
index ed1fb58824fe3..6ac3cdf480851 100644
--- a/libc/test/src/string/strerror_r_test.cpp
+++ b/libc/test/src/string/strerror_r_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strerror_r.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stddef.h>
diff --git a/libc/test/src/string/strerror_test.cpp b/libc/test/src/string/strerror_test.cpp
index dfe77223e3c0f..3830e1b6c01d8 100644
--- a/libc/test/src/string/strerror_test.cpp
+++ b/libc/test/src/string/strerror_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strerror.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrErrorTest, KnownErrors) {
ASSERT_STREQ(__llvm_libc::strerror(0), "Success");
diff --git a/libc/test/src/string/strlcat_test.cpp b/libc/test/src/string/strlcat_test.cpp
index 66db15e589278..50c4b2e33897d 100644
--- a/libc/test/src/string/strlcat_test.cpp
+++ b/libc/test/src/string/strlcat_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strlcat.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stdlib.h>
TEST(LlvmLibcStrlcatTest, TooBig) {
diff --git a/libc/test/src/string/strlcpy_test.cpp b/libc/test/src/string/strlcpy_test.cpp
index a37a7e0f9b418..41e244b239d06 100644
--- a/libc/test/src/string/strlcpy_test.cpp
+++ b/libc/test/src/string/strlcpy_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strlcpy.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stdlib.h>
TEST(LlvmLibcStrlcpyTest, TooBig) {
diff --git a/libc/test/src/string/strlen_test.cpp b/libc/test/src/string/strlen_test.cpp
index ab6d35562ac76..41b5fbede0fd0 100644
--- a/libc/test/src/string/strlen_test.cpp
+++ b/libc/test/src/string/strlen_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strlen.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrLenTest, EmptyString) {
const char *empty = "";
diff --git a/libc/test/src/string/strncasecmp_test.cpp b/libc/test/src/string/strncasecmp_test.cpp
index 0188c7fca74e9..cf6284318cf7e 100644
--- a/libc/test/src/string/strncasecmp_test.cpp
+++ b/libc/test/src/string/strncasecmp_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strncasecmp.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrNCaseCmpTest,
EmptyStringsShouldReturnZeroWithSufficientLength) {
diff --git a/libc/test/src/string/strncat_test.cpp b/libc/test/src/string/strncat_test.cpp
index f7442dc95c8ce..146922194eba2 100644
--- a/libc/test/src/string/strncat_test.cpp
+++ b/libc/test/src/string/strncat_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strncat.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrNCatTest, EmptyDest) {
const char *abc = "abc";
diff --git a/libc/test/src/string/strncmp_test.cpp b/libc/test/src/string/strncmp_test.cpp
index 52add6b516e8d..b3971f6b95a28 100644
--- a/libc/test/src/string/strncmp_test.cpp
+++ b/libc/test/src/string/strncmp_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strncmp.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
// This group is just copies of the strcmp tests, since all the same cases still
// need to be tested.
diff --git a/libc/test/src/string/strncpy_test.cpp b/libc/test/src/string/strncpy_test.cpp
index 6f08eecff8cb1..69265f82183b5 100644
--- a/libc/test/src/string/strncpy_test.cpp
+++ b/libc/test/src/string/strncpy_test.cpp
@@ -8,7 +8,7 @@
#include "src/__support/CPP/span.h"
#include "src/string/strncpy.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stddef.h> // For size_t.
class LlvmLibcStrncpyTest : public __llvm_libc::testing::Test {
diff --git a/libc/test/src/string/strndup_test.cpp b/libc/test/src/string/strndup_test.cpp
index 0a17a7285b6d8..53cdd368fb42a 100644
--- a/libc/test/src/string/strndup_test.cpp
+++ b/libc/test/src/string/strndup_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strndup.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stdlib.h>
TEST(LlvmLibcstrndupTest, EmptyString) {
diff --git a/libc/test/src/string/strnlen_test.cpp b/libc/test/src/string/strnlen_test.cpp
index e7323077046f8..e260cd65e878e 100644
--- a/libc/test/src/string/strnlen_test.cpp
+++ b/libc/test/src/string/strnlen_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strnlen.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <stddef.h>
TEST(LlvmLibcStrNLenTest, EmptyString) {
diff --git a/libc/test/src/string/strpbrk_test.cpp b/libc/test/src/string/strpbrk_test.cpp
index 8e28f14d6db1d..fe10f87930593 100644
--- a/libc/test/src/string/strpbrk_test.cpp
+++ b/libc/test/src/string/strpbrk_test.cpp
@@ -8,7 +8,7 @@
#include "src/string/strpbrk.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrPBrkTest, EmptyStringShouldReturnNullptr) {
// The search should not include the null terminator.
diff --git a/libc/test/src/string/strrchr_test.cpp b/libc/test/src/string/strrchr_test.cpp
index 76fde8274bcac..ba901cc8dc79e 100644
--- a/libc/test/src/string/strrchr_test.cpp
+++ b/libc/test/src/string/strrchr_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strrchr.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrRChrTest, FindsFirstCharacter) {
const char *src = "abcde";
diff --git a/libc/test/src/string/strsignal_test.cpp b/libc/test/src/string/strsignal_test.cpp
index 959d0f4bc04c4..f939b2376603f 100644
--- a/libc/test/src/string/strsignal_test.cpp
+++ b/libc/test/src/string/strsignal_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strsignal.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <signal.h>
diff --git a/libc/test/src/string/strspn_test.cpp b/libc/test/src/string/strspn_test.cpp
index 6ada757773d15..d5276091d7531 100644
--- a/libc/test/src/string/strspn_test.cpp
+++ b/libc/test/src/string/strspn_test.cpp
@@ -8,7 +8,7 @@
#include "src/string/strspn.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrSpnTest, EmptyStringShouldReturnZeroLengthSpan) {
// The search should not include the null terminator.
diff --git a/libc/test/src/string/strstr_test.cpp b/libc/test/src/string/strstr_test.cpp
index 435ce896c97c9..2008d1c42e94e 100644
--- a/libc/test/src/string/strstr_test.cpp
+++ b/libc/test/src/string/strstr_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strstr.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrStrTest, NeedleNotInHaystack) {
const char *haystack = "12345";
diff --git a/libc/test/src/string/strtok_r_test.cpp b/libc/test/src/string/strtok_r_test.cpp
index e767b5ce0c838..fa436e0116b37 100644
--- a/libc/test/src/string/strtok_r_test.cpp
+++ b/libc/test/src/string/strtok_r_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strtok_r.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrTokReentrantTest, NoTokenFound) {
{ // Empty source and delimiter string.
diff --git a/libc/test/src/string/strtok_test.cpp b/libc/test/src/string/strtok_test.cpp
index 65f8ac35fd792..24033c4124435 100644
--- a/libc/test/src/string/strtok_test.cpp
+++ b/libc/test/src/string/strtok_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/string/strtok.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcStrTokTest, NoTokenFound) {
char empty[] = "";
diff --git a/libc/test/src/sys/mman/linux/madvise_test.cpp b/libc/test/src/sys/mman/linux/madvise_test.cpp
index 0932dd9ef880a..4f8c24022dbbc 100644
--- a/libc/test/src/sys/mman/linux/madvise_test.cpp
+++ b/libc/test/src/sys/mman/linux/madvise_test.cpp
@@ -10,7 +10,7 @@
#include "src/sys/mman/mmap.h"
#include "src/sys/mman/munmap.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <sys/mman.h>
diff --git a/libc/test/src/sys/mman/linux/mmap_test.cpp b/libc/test/src/sys/mman/linux/mmap_test.cpp
index a1a0a0879442b..41fb737b35630 100644
--- a/libc/test/src/sys/mman/linux/mmap_test.cpp
+++ b/libc/test/src/sys/mman/linux/mmap_test.cpp
@@ -9,7 +9,7 @@
#include "src/sys/mman/mmap.h"
#include "src/sys/mman/munmap.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <sys/mman.h>
diff --git a/libc/test/src/sys/mman/linux/mprotect_test.cpp b/libc/test/src/sys/mman/linux/mprotect_test.cpp
index 83325461f2749..66c2e9a031743 100644
--- a/libc/test/src/sys/mman/linux/mprotect_test.cpp
+++ b/libc/test/src/sys/mman/linux/mprotect_test.cpp
@@ -10,7 +10,7 @@
#include "src/sys/mman/mprotect.h"
#include "src/sys/mman/munmap.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <signal.h>
diff --git a/libc/test/src/sys/mman/linux/posix_madvise_test.cpp b/libc/test/src/sys/mman/linux/posix_madvise_test.cpp
index d434cde4d87a3..151e043351778 100644
--- a/libc/test/src/sys/mman/linux/posix_madvise_test.cpp
+++ b/libc/test/src/sys/mman/linux/posix_madvise_test.cpp
@@ -10,7 +10,7 @@
#include "src/sys/mman/munmap.h"
#include "src/sys/mman/posix_madvise.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <sys/mman.h>
diff --git a/libc/test/src/sys/random/linux/getrandom_test.cpp b/libc/test/src/sys/random/linux/getrandom_test.cpp
index 669f197f30284..3514613020fe4 100644
--- a/libc/test/src/sys/random/linux/getrandom_test.cpp
+++ b/libc/test/src/sys/random/linux/getrandom_test.cpp
@@ -1,7 +1,7 @@
#include "src/math/fabs.h"
#include "src/sys/random/getrandom.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcGetRandomTest, InvalidFlag) {
using __llvm_libc::testing::ErrnoSetterMatcher::Fails;
diff --git a/libc/test/src/sys/resource/getrlimit_setrlimit_test.cpp b/libc/test/src/sys/resource/getrlimit_setrlimit_test.cpp
index f87b5f437321a..285624af6ef07 100644
--- a/libc/test/src/sys/resource/getrlimit_setrlimit_test.cpp
+++ b/libc/test/src/sys/resource/getrlimit_setrlimit_test.cpp
@@ -13,7 +13,7 @@
#include "src/unistd/close.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <sys/resource.h>
diff --git a/libc/test/src/sys/select/select_failure_test.cpp b/libc/test/src/sys/select/select_failure_test.cpp
index 86863544a0ce3..242e93ca4cfbc 100644
--- a/libc/test/src/sys/select/select_failure_test.cpp
+++ b/libc/test/src/sys/select/select_failure_test.cpp
@@ -9,7 +9,7 @@
#include "src/sys/select/select.h"
#include "src/unistd/read.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <sys/select.h>
diff --git a/libc/test/src/sys/select/select_ui_test.cpp b/libc/test/src/sys/select/select_ui_test.cpp
index 200b29173be78..d290b18654d27 100644
--- a/libc/test/src/sys/select/select_ui_test.cpp
+++ b/libc/test/src/sys/select/select_ui_test.cpp
@@ -8,7 +8,7 @@
#include "src/sys/select/select.h"
#include "src/unistd/read.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <sys/select.h>
diff --git a/libc/test/src/sys/sendfile/sendfile_test.cpp b/libc/test/src/sys/sendfile/sendfile_test.cpp
index 78f9dbfb11148..95103aac7c103 100644
--- a/libc/test/src/sys/sendfile/sendfile_test.cpp
+++ b/libc/test/src/sys/sendfile/sendfile_test.cpp
@@ -14,7 +14,7 @@
#include "src/unistd/unlink.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/sys/stat/chmod_test.cpp b/libc/test/src/sys/stat/chmod_test.cpp
index e6841bbec81e9..456b867a2164a 100644
--- a/libc/test/src/sys/stat/chmod_test.cpp
+++ b/libc/test/src/sys/stat/chmod_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/close.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/sys/stat/fchmod_test.cpp b/libc/test/src/sys/stat/fchmod_test.cpp
index 74b528a7ea86e..54d945760865f 100644
--- a/libc/test/src/sys/stat/fchmod_test.cpp
+++ b/libc/test/src/sys/stat/fchmod_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/close.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/sys/stat/fchmodat_test.cpp b/libc/test/src/sys/stat/fchmodat_test.cpp
index c9d031a48e794..109a162b8466f 100644
--- a/libc/test/src/sys/stat/fchmodat_test.cpp
+++ b/libc/test/src/sys/stat/fchmodat_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/close.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/sys/stat/fstat_test.cpp b/libc/test/src/sys/stat/fstat_test.cpp
index d05f31d35aa2e..6db0d653fb607 100644
--- a/libc/test/src/sys/stat/fstat_test.cpp
+++ b/libc/test/src/sys/stat/fstat_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/close.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/sys/stat/lstat_test.cpp b/libc/test/src/sys/stat/lstat_test.cpp
index e2eda0156af44..b5a06c82d5fc7 100644
--- a/libc/test/src/sys/stat/lstat_test.cpp
+++ b/libc/test/src/sys/stat/lstat_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/close.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/sys/stat/mkdirat_test.cpp b/libc/test/src/sys/stat/mkdirat_test.cpp
index dae54c51280c5..2e742009a0b19 100644
--- a/libc/test/src/sys/stat/mkdirat_test.cpp
+++ b/libc/test/src/sys/stat/mkdirat_test.cpp
@@ -9,7 +9,7 @@
#include "src/sys/stat/mkdirat.h"
#include "src/unistd/rmdir.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/sys/stat/stat_test.cpp b/libc/test/src/sys/stat/stat_test.cpp
index 4e85a4a97ba94..ba6e302465627 100644
--- a/libc/test/src/sys/stat/stat_test.cpp
+++ b/libc/test/src/sys/stat/stat_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/close.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/sys/utsname/uname_test.cpp b/libc/test/src/sys/utsname/uname_test.cpp
index ffe63cfd3c5f4..013f94040a1d3 100644
--- a/libc/test/src/sys/utsname/uname_test.cpp
+++ b/libc/test/src/sys/utsname/uname_test.cpp
@@ -10,7 +10,7 @@
#include "src/__support/macros/architectures.h"
#include "src/sys/utsname/uname.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <sys/utsname.h>
diff --git a/libc/test/src/sys/wait/wait4_test.cpp b/libc/test/src/sys/wait/wait4_test.cpp
index 096db0019cb9e..7464ee02a812a 100644
--- a/libc/test/src/sys/wait/wait4_test.cpp
+++ b/libc/test/src/sys/wait/wait4_test.cpp
@@ -8,7 +8,7 @@
#include "src/sys/wait/wait4.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <sys/wait.h>
diff --git a/libc/test/src/sys/wait/waitpid_test.cpp b/libc/test/src/sys/wait/waitpid_test.cpp
index 302be07baab26..136946c4e0fe3 100644
--- a/libc/test/src/sys/wait/waitpid_test.cpp
+++ b/libc/test/src/sys/wait/waitpid_test.cpp
@@ -8,7 +8,7 @@
#include "src/sys/wait/waitpid.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <sys/wait.h>
diff --git a/libc/test/src/termios/termios_test.cpp b/libc/test/src/termios/termios_test.cpp
index 19f5f86c4b062..2e6b12f938b0d 100644
--- a/libc/test/src/termios/termios_test.cpp
+++ b/libc/test/src/termios/termios_test.cpp
@@ -16,7 +16,7 @@
#include "src/termios/tcsetattr.h"
#include "src/unistd/close.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <termios.h>
diff --git a/libc/test/src/time/TmMatcher.h b/libc/test/src/time/TmMatcher.h
index 3217c5f2e497c..ffed35e1095c6 100644
--- a/libc/test/src/time/TmMatcher.h
+++ b/libc/test/src/time/TmMatcher.h
@@ -11,7 +11,7 @@
#include <time.h>
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace __llvm_libc {
namespace tmmatcher {
diff --git a/libc/test/src/time/asctime_r_test.cpp b/libc/test/src/time/asctime_r_test.cpp
index f9ccdda50a32d..748cec4f2bc92 100644
--- a/libc/test/src/time/asctime_r_test.cpp
+++ b/libc/test/src/time/asctime_r_test.cpp
@@ -9,8 +9,8 @@
#include "src/time/asctime_r.h"
#include "src/time/time_utils.h"
+#include "test/UnitTest/Test.h"
#include "test/src/time/TmHelper.h"
-#include "utils/UnitTest/Test.h"
using __llvm_libc::time_utils::TimeConstants;
diff --git a/libc/test/src/time/asctime_test.cpp b/libc/test/src/time/asctime_test.cpp
index 93591de9422b7..e6a5040de235d 100644
--- a/libc/test/src/time/asctime_test.cpp
+++ b/libc/test/src/time/asctime_test.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "src/time/asctime.h"
+#include "test/UnitTest/Test.h"
#include "test/src/time/TmHelper.h"
-#include "utils/UnitTest/Test.h"
static inline char *call_asctime(struct tm *tm_data, int year, int month,
int mday, int hour, int min, int sec, int wday,
diff --git a/libc/test/src/time/clock_gettime_test.cpp b/libc/test/src/time/clock_gettime_test.cpp
index 3214ca19c72ae..6bea4ab539af1 100644
--- a/libc/test/src/time/clock_gettime_test.cpp
+++ b/libc/test/src/time/clock_gettime_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/time/clock_gettime.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <time.h>
diff --git a/libc/test/src/time/clock_test.cpp b/libc/test/src/time/clock_test.cpp
index 2aa61babad351..31f7f1737ec18 100644
--- a/libc/test/src/time/clock_test.cpp
+++ b/libc/test/src/time/clock_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/time/clock.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <limits.h>
diff --git a/libc/test/src/time/
diff time_test.cpp b/libc/test/src/time/
diff time_test.cpp
index 4c07e3d235aeb..61bb4bf4e9003 100644
--- a/libc/test/src/time/
diff time_test.cpp
+++ b/libc/test/src/time/
diff time_test.cpp
@@ -10,7 +10,7 @@
#include "src/time/
diff time.h"
#include "src/time/time_utils.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/test/src/time/gettimeofday_test.cpp b/libc/test/src/time/gettimeofday_test.cpp
index 9fbc2b413b6c0..771bea0b946e8 100644
--- a/libc/test/src/time/gettimeofday_test.cpp
+++ b/libc/test/src/time/gettimeofday_test.cpp
@@ -12,7 +12,7 @@
#include "src/time/gettimeofday.h"
#include "src/time/nanosleep.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace cpp = __llvm_libc::cpp;
diff --git a/libc/test/src/time/gmtime_r_test.cpp b/libc/test/src/time/gmtime_r_test.cpp
index b6556702ab56d..0d210b6f04fe6 100644
--- a/libc/test/src/time/gmtime_r_test.cpp
+++ b/libc/test/src/time/gmtime_r_test.cpp
@@ -8,8 +8,8 @@
#include "src/time/gmtime_r.h"
#include "src/time/time_utils.h"
+#include "test/UnitTest/Test.h"
#include "test/src/time/TmMatcher.h"
-#include "utils/UnitTest/Test.h"
using __llvm_libc::time_utils::TimeConstants;
diff --git a/libc/test/src/time/gmtime_test.cpp b/libc/test/src/time/gmtime_test.cpp
index 6069533f9278e..47b78105adc05 100644
--- a/libc/test/src/time/gmtime_test.cpp
+++ b/libc/test/src/time/gmtime_test.cpp
@@ -9,8 +9,8 @@
#include "src/time/gmtime.h"
#include "src/time/time_utils.h"
#include "test/ErrnoSetterMatcher.h"
+#include "test/UnitTest/Test.h"
#include "test/src/time/TmMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <errno.h>
#include <limits.h>
diff --git a/libc/test/src/time/mktime_test.cpp b/libc/test/src/time/mktime_test.cpp
index e046fdcaac273..6793298fc0731 100644
--- a/libc/test/src/time/mktime_test.cpp
+++ b/libc/test/src/time/mktime_test.cpp
@@ -9,9 +9,9 @@
#include "src/time/mktime.h"
#include "src/time/time_utils.h"
#include "test/ErrnoSetterMatcher.h"
+#include "test/UnitTest/Test.h"
#include "test/src/time/TmHelper.h"
#include "test/src/time/TmMatcher.h"
-#include "utils/UnitTest/Test.h"
#include <errno.h>
#include <limits.h>
diff --git a/libc/test/src/time/nanosleep_test.cpp b/libc/test/src/time/nanosleep_test.cpp
index 2b2c90710e1a3..054ce36897012 100644
--- a/libc/test/src/time/nanosleep_test.cpp
+++ b/libc/test/src/time/nanosleep_test.cpp
@@ -12,7 +12,7 @@
#include "src/time/nanosleep.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
namespace cpp = __llvm_libc::cpp;
diff --git a/libc/test/src/time/time_test.cpp b/libc/test/src/time/time_test.cpp
index 2f5214a15a1b6..7183469db2615 100644
--- a/libc/test/src/time/time_test.cpp
+++ b/libc/test/src/time/time_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/time/time_func.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <limits.h>
diff --git a/libc/test/src/unistd/access_test.cpp b/libc/test/src/unistd/access_test.cpp
index fc158b3e481e7..30c3cb4572c19 100644
--- a/libc/test/src/unistd/access_test.cpp
+++ b/libc/test/src/unistd/access_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/close.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/chdir_test.cpp b/libc/test/src/unistd/chdir_test.cpp
index 4e24444ea6637..998d42aeddfda 100644
--- a/libc/test/src/unistd/chdir_test.cpp
+++ b/libc/test/src/unistd/chdir_test.cpp
@@ -10,7 +10,7 @@
#include "src/unistd/chdir.h"
#include "src/unistd/close.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/dup2_test.cpp b/libc/test/src/unistd/dup2_test.cpp
index e08972f2be0bd..b595a66a5a109 100644
--- a/libc/test/src/unistd/dup2_test.cpp
+++ b/libc/test/src/unistd/dup2_test.cpp
@@ -13,7 +13,7 @@
#include "src/unistd/unlink.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/dup3_test.cpp b/libc/test/src/unistd/dup3_test.cpp
index 36ca66b9c0afe..3d4b2e50cbff3 100644
--- a/libc/test/src/unistd/dup3_test.cpp
+++ b/libc/test/src/unistd/dup3_test.cpp
@@ -13,7 +13,7 @@
#include "src/unistd/unlink.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/dup_test.cpp b/libc/test/src/unistd/dup_test.cpp
index 54f8b5d6c61c9..414176261f437 100644
--- a/libc/test/src/unistd/dup_test.cpp
+++ b/libc/test/src/unistd/dup_test.cpp
@@ -13,7 +13,7 @@
#include "src/unistd/unlink.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/fchdir_test.cpp b/libc/test/src/unistd/fchdir_test.cpp
index e44b6b0657642..b331f4e193794 100644
--- a/libc/test/src/unistd/fchdir_test.cpp
+++ b/libc/test/src/unistd/fchdir_test.cpp
@@ -10,7 +10,7 @@
#include "src/unistd/close.h"
#include "src/unistd/fchdir.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/ftruncate_test.cpp b/libc/test/src/unistd/ftruncate_test.cpp
index c0bb37689cfd0..77d3bd7931bf7 100644
--- a/libc/test/src/unistd/ftruncate_test.cpp
+++ b/libc/test/src/unistd/ftruncate_test.cpp
@@ -14,7 +14,7 @@
#include "src/unistd/unlink.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/geteuid_test.cpp b/libc/test/src/unistd/geteuid_test.cpp
index 878a16cf90e9c..6ac6abafd60e8 100644
--- a/libc/test/src/unistd/geteuid_test.cpp
+++ b/libc/test/src/unistd/geteuid_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/unistd/geteuid.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcGetEuidTest, SmokeTest) {
// geteuid always succeeds. So, we just call it as a smoke test.
diff --git a/libc/test/src/unistd/getopt_test.cpp b/libc/test/src/unistd/getopt_test.cpp
index d043e5881f6c7..b90ea6499e0d0 100644
--- a/libc/test/src/unistd/getopt_test.cpp
+++ b/libc/test/src/unistd/getopt_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/unistd/getopt.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "src/__support/CPP/array.h"
#include "src/stdio/fflush.h"
diff --git a/libc/test/src/unistd/getpid_test.cpp b/libc/test/src/unistd/getpid_test.cpp
index 15510bc0604de..fc8805309d43c 100644
--- a/libc/test/src/unistd/getpid_test.cpp
+++ b/libc/test/src/unistd/getpid_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/unistd/getpid.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcGetPidTest, SmokeTest) {
// getpid always succeeds. So, we just call it as a smoke test.
diff --git a/libc/test/src/unistd/getppid_test.cpp b/libc/test/src/unistd/getppid_test.cpp
index 061c7ad4ebf18..e9724765a478d 100644
--- a/libc/test/src/unistd/getppid_test.cpp
+++ b/libc/test/src/unistd/getppid_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/unistd/getppid.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcGetPpidTest, SmokeTest) {
// getppid always succeeds. So, we just call it as a smoke test.
diff --git a/libc/test/src/unistd/getuid_test.cpp b/libc/test/src/unistd/getuid_test.cpp
index 3d43a42324668..8f2d9d9a7be62 100644
--- a/libc/test/src/unistd/getuid_test.cpp
+++ b/libc/test/src/unistd/getuid_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/unistd/getuid.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
TEST(LlvmLibcGetUidTest, SmokeTest) {
// getuid always succeeds. So, we just call it as a smoke test.
diff --git a/libc/test/src/unistd/isatty_test.cpp b/libc/test/src/unistd/isatty_test.cpp
index 77680ad55110c..0d949eec88f8c 100644
--- a/libc/test/src/unistd/isatty_test.cpp
+++ b/libc/test/src/unistd/isatty_test.cpp
@@ -10,7 +10,7 @@
#include "src/unistd/close.h"
#include "src/unistd/isatty.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/link_test.cpp b/libc/test/src/unistd/link_test.cpp
index e54005261d2d1..b42336f171fe2 100644
--- a/libc/test/src/unistd/link_test.cpp
+++ b/libc/test/src/unistd/link_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/link.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/linkat_test.cpp b/libc/test/src/unistd/linkat_test.cpp
index 8e3266ff26bd7..5a61b4e9301e8 100644
--- a/libc/test/src/unistd/linkat_test.cpp
+++ b/libc/test/src/unistd/linkat_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/linkat.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/lseek_test.cpp b/libc/test/src/unistd/lseek_test.cpp
index 1285c2d065375..065753fe427db 100644
--- a/libc/test/src/unistd/lseek_test.cpp
+++ b/libc/test/src/unistd/lseek_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/lseek.h"
#include "src/unistd/read.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/pread_pwrite_test.cpp b/libc/test/src/unistd/pread_pwrite_test.cpp
index bccdaffd7f4fd..cfc5e37d43c7c 100644
--- a/libc/test/src/unistd/pread_pwrite_test.cpp
+++ b/libc/test/src/unistd/pread_pwrite_test.cpp
@@ -14,7 +14,7 @@
#include "src/unistd/unlink.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/read_write_test.cpp b/libc/test/src/unistd/read_write_test.cpp
index 2113d8ceeac25..aa402e2977805 100644
--- a/libc/test/src/unistd/read_write_test.cpp
+++ b/libc/test/src/unistd/read_write_test.cpp
@@ -12,7 +12,7 @@
#include "src/unistd/read.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/readlink_test.cpp b/libc/test/src/unistd/readlink_test.cpp
index ea9e164144bd3..df02a05429a26 100644
--- a/libc/test/src/unistd/readlink_test.cpp
+++ b/libc/test/src/unistd/readlink_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/symlink.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/readlinkat_test.cpp b/libc/test/src/unistd/readlinkat_test.cpp
index 942b6290288a1..e92ded5b7a479 100644
--- a/libc/test/src/unistd/readlinkat_test.cpp
+++ b/libc/test/src/unistd/readlinkat_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/symlink.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/libc/test/src/unistd/rmdir_test.cpp b/libc/test/src/unistd/rmdir_test.cpp
index 5e07849df5ea2..1580166c90a4f 100644
--- a/libc/test/src/unistd/rmdir_test.cpp
+++ b/libc/test/src/unistd/rmdir_test.cpp
@@ -9,7 +9,7 @@
#include "src/sys/stat/mkdir.h"
#include "src/unistd/rmdir.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/symlink_test.cpp b/libc/test/src/unistd/symlink_test.cpp
index 52d666262200a..489ecfd5dda9e 100644
--- a/libc/test/src/unistd/symlink_test.cpp
+++ b/libc/test/src/unistd/symlink_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/symlink.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/symlinkat_test.cpp b/libc/test/src/unistd/symlinkat_test.cpp
index a1f416a403e61..9f4658d275c0c 100644
--- a/libc/test/src/unistd/symlinkat_test.cpp
+++ b/libc/test/src/unistd/symlinkat_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/symlinkat.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/syscall_test.cpp b/libc/test/src/unistd/syscall_test.cpp
index e4c50545b1e37..7d0cc309806bf 100644
--- a/libc/test/src/unistd/syscall_test.cpp
+++ b/libc/test/src/unistd/syscall_test.cpp
@@ -8,7 +8,7 @@
#include "src/unistd/syscall.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/libc/test/src/unistd/sysconf_test.cpp b/libc/test/src/unistd/sysconf_test.cpp
index 9f93746e03590..eda2e566b0257 100644
--- a/libc/test/src/unistd/sysconf_test.cpp
+++ b/libc/test/src/unistd/sysconf_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/unistd/sysconf.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <unistd.h>
diff --git a/libc/test/src/unistd/truncate_test.cpp b/libc/test/src/unistd/truncate_test.cpp
index ae7765ec6b557..70d6d8944c403 100644
--- a/libc/test/src/unistd/truncate_test.cpp
+++ b/libc/test/src/unistd/truncate_test.cpp
@@ -14,7 +14,7 @@
#include "src/unistd/unlink.h"
#include "src/unistd/write.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/unlink_test.cpp b/libc/test/src/unistd/unlink_test.cpp
index be358cf5eeac3..d8588a5a7d744 100644
--- a/libc/test/src/unistd/unlink_test.cpp
+++ b/libc/test/src/unistd/unlink_test.cpp
@@ -10,7 +10,7 @@
#include "src/unistd/close.h"
#include "src/unistd/unlink.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/src/unistd/unlinkat_test.cpp b/libc/test/src/unistd/unlinkat_test.cpp
index 8ce10c95d1c49..32cecc2d669e3 100644
--- a/libc/test/src/unistd/unlinkat_test.cpp
+++ b/libc/test/src/unistd/unlinkat_test.cpp
@@ -11,7 +11,7 @@
#include "src/unistd/close.h"
#include "src/unistd/unlinkat.h"
#include "test/ErrnoSetterMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/FDReader.h"
#include <errno.h>
diff --git a/libc/test/utils/FPUtil/x86_long_double_test.cpp b/libc/test/utils/FPUtil/x86_long_double_test.cpp
index 9555a03413822..16248ae267619 100644
--- a/libc/test/utils/FPUtil/x86_long_double_test.cpp
+++ b/libc/test/utils/FPUtil/x86_long_double_test.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/FPBits.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/utils/UnitTest/testfilter_test.cpp b/libc/test/utils/UnitTest/testfilter_test.cpp
index 8f3a310b131e6..8a62f7d767101 100644
--- a/libc/test/utils/UnitTest/testfilter_test.cpp
+++ b/libc/test/utils/UnitTest/testfilter_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/UnitTest/LibcTest.h"
+#include "test/UnitTest/LibcTest.h"
TEST(LlvmLibcTestFilterTest, CorrectFilter) {}
diff --git a/libc/utils/CMakeLists.txt b/libc/utils/CMakeLists.txt
index da8abd77783cd..e6cfc8fdd0b81 100644
--- a/libc/utils/CMakeLists.txt
+++ b/libc/utils/CMakeLists.txt
@@ -1,8 +1,2 @@
add_subdirectory(MPFRWrapper)
add_subdirectory(testutils)
-add_subdirectory(UnitTest)
-
-if(LLVM_LIBC_FULL_BUILD AND NOT
- (LIBC_TARGET_ARCHITECTURE_IS_GPU OR LIBC_TARGET_OS_IS_BAREMETAL))
- add_subdirectory(IntegrationTest)
-endif()
diff --git a/libc/utils/MPFRWrapper/MPFRUtils.cpp b/libc/utils/MPFRWrapper/MPFRUtils.cpp
index 2b44c2493f029..53b95344361b4 100644
--- a/libc/utils/MPFRWrapper/MPFRUtils.cpp
+++ b/libc/utils/MPFRWrapper/MPFRUtils.cpp
@@ -11,7 +11,7 @@
#include "src/__support/CPP/string_view.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/PlatformDefs.h"
-#include "utils/UnitTest/FPMatcher.h"
+#include "test/UnitTest/FPMatcher.h"
#include <cmath>
#include <fenv.h>
diff --git a/libc/utils/MPFRWrapper/MPFRUtils.h b/libc/utils/MPFRWrapper/MPFRUtils.h
index dbb9b410d1b1f..a202003764aad 100644
--- a/libc/utils/MPFRWrapper/MPFRUtils.h
+++ b/libc/utils/MPFRWrapper/MPFRUtils.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_UTILS_TESTUTILS_MPFRUTILS_H
#include "src/__support/CPP/type_traits.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
#include "utils/testutils/RoundingModeUtils.h"
#include <stdint.h>
diff --git a/utils/bazel/llvm-project-overlay/libc/utils/UnitTest/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
similarity index 100%
rename from utils/bazel/llvm-project-overlay/libc/utils/UnitTest/BUILD.bazel
rename to utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
diff --git a/utils/bazel/llvm-project-overlay/libc/test/libc_test_rules.bzl b/utils/bazel/llvm-project-overlay/libc/test/libc_test_rules.bzl
index a4fb2672dfe7d..302fdfabc3172 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/libc_test_rules.bzl
+++ b/utils/bazel/llvm-project-overlay/libc/test/libc_test_rules.bzl
@@ -29,7 +29,7 @@ def libc_test(name, srcs, libc_function_deps, deps = [], **kwargs):
srcs = srcs,
deps = [d + INTERNAL_SUFFIX for d in libc_function_deps] + [
"//libc:libc_root",
- "//libc/utils/UnitTest:LibcUnitTest",
+ "//libc/test/UnitTest:LibcUnitTest",
] + deps,
features = ["-link_llvmlibc"], # Do not link libllvmlibc.a
**kwargs
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/fenv/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/fenv/BUILD.bazel
index a21477c9d1bb6..81ac36279521c 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/fenv/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/fenv/BUILD.bazel
@@ -44,7 +44,7 @@ libc_test(
deps = [
"//libc:__support_common",
"//libc:__support_fputil_fenv_impl",
- "//libc/utils/UnitTest:fp_test_helpers",
+ "//libc/test/UnitTest:fp_test_helpers",
],
)
@@ -58,7 +58,7 @@ libc_test(
deps = [
"//libc:__support_common",
"//libc:__support_fputil_fenv_impl",
- "//libc/utils/UnitTest:fp_test_helpers",
+ "//libc/test/UnitTest:fp_test_helpers",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/math/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/math/BUILD.bazel
index 01f64f4d8cdf4..5ce089f3dec7e 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/math/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/math/BUILD.bazel
@@ -176,8 +176,8 @@ cc_library(
"//libc:__support_fputil_basic_operations",
"//libc:__support_fputil_fp_bits",
"//libc/utils/MPFRWrapper:mpfr_wrapper",
- "//libc/utils/UnitTest:LibcUnitTest",
- "//libc/utils/UnitTest:fp_test_helpers",
+ "//libc/test/UnitTest:LibcUnitTest",
+ "//libc/test/UnitTest:fp_test_helpers",
],
)
@@ -292,7 +292,7 @@ cc_library(
deps = [
"//libc:__support_fputil_fp_bits",
"//libc:__support_fputil_manipulation_functions",
- "//libc/utils/UnitTest:LibcUnitTest",
+ "//libc/test/UnitTest:LibcUnitTest",
],
)
@@ -318,8 +318,8 @@ cc_library(
"//libc:__support_fputil_basic_operations",
"//libc:__support_fputil_fenv_impl",
"//libc:__support_fputil_fp_bits",
- "//libc/utils/UnitTest:LibcUnitTest",
- "//libc/utils/UnitTest:fp_test_helpers",
+ "//libc/test/UnitTest:LibcUnitTest",
+ "//libc/test/UnitTest:fp_test_helpers",
],
)
@@ -344,8 +344,8 @@ cc_library(
deps = [
"//libc:__support_fputil_fp_bits",
"//libc:__support_fputil_normal_float",
- "//libc/utils/UnitTest:LibcUnitTest",
- "//libc/utils/UnitTest:fp_test_helpers",
+ "//libc/test/UnitTest:LibcUnitTest",
+ "//libc/test/UnitTest:fp_test_helpers",
],
)
@@ -371,8 +371,8 @@ cc_library(
"//libc:__support_fputil_fenv_impl",
"//libc:__support_fputil_fp_bits",
"//libc/utils/MPFRWrapper:mpfr_wrapper",
- "//libc/utils/UnitTest:LibcUnitTest",
- "//libc/utils/UnitTest:fp_test_helpers",
+ "//libc/test/UnitTest:LibcUnitTest",
+ "//libc/test/UnitTest:fp_test_helpers",
],
)
@@ -407,8 +407,8 @@ cc_library(
"//libc:__support_fputil_fenv_impl",
"//libc:__support_fputil_fp_bits",
"//libc/utils/MPFRWrapper:mpfr_wrapper",
- "//libc/utils/UnitTest:LibcUnitTest",
- "//libc/utils/UnitTest:fp_test_helpers",
+ "//libc/test/UnitTest:LibcUnitTest",
+ "//libc/test/UnitTest:fp_test_helpers",
],
)
@@ -517,8 +517,8 @@ cc_library(
"//libc:__support_cpp_type_traits",
"//libc:__support_fputil_basic_operations",
"//libc:__support_fputil_fp_bits",
- "//libc/utils/UnitTest:LibcUnitTest",
- "//libc/utils/UnitTest:fp_test_helpers",
+ "//libc/test/UnitTest:LibcUnitTest",
+ "//libc/test/UnitTest:fp_test_helpers",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/math/libc_math_test_rules.bzl b/utils/bazel/llvm-project-overlay/libc/test/src/math/libc_math_test_rules.bzl
index b8d72ffb2ab31..0394da505c498 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/math/libc_math_test_rules.bzl
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/math/libc_math_test_rules.bzl
@@ -33,7 +33,7 @@ def math_test(name, hdrs = [], deps = [], **kwargs):
"//libc:__support_uint128",
"//libc:__support_fputil_manipulation_functions",
"//libc:__support_fputil_nearest_integer_operations",
- "//libc/utils/UnitTest:fp_test_helpers",
+ "//libc/test/UnitTest:fp_test_helpers",
] + deps,
**kwargs
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/string/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/string/BUILD.bazel
index cfda301ff2d7a..5f83c17ec5b9a 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/string/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/string/BUILD.bazel
@@ -142,7 +142,7 @@ libc_test(
],
deps = [
"//libc:__support_cpp_span",
- "//libc/utils/UnitTest:memory_matcher",
+ "//libc/test/UnitTest:memory_matcher",
],
)
@@ -154,7 +154,7 @@ libc_test(
],
deps = [
"//libc:__support_cpp_span",
- "//libc/utils/UnitTest:memory_matcher",
+ "//libc/test/UnitTest:memory_matcher",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel
index a0791aaec209d..3cd50bf5307d2 100644
--- a/utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel
@@ -37,8 +37,8 @@ cc_library(
"//libc:__support_fputil_platform_defs",
"//libc:libc_root",
"//libc/utils/MPFRWrapper:mpfr_impl",
- "//libc/utils/UnitTest:LibcUnitTest",
- "//libc/utils/UnitTest:fp_test_helpers",
+ "//libc/test/UnitTest:LibcUnitTest",
+ "//libc/test/UnitTest:fp_test_helpers",
"//libc/utils/testutils:libc_test_utils",
],
)
More information about the libc-commits
mailing list