[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.

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(

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

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>
 

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
 )

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 {

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>

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>

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.

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 {

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>
 

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>
 

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>
 

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>
 

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);
 

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;

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>
 

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>
 

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>
 

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>

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>
 

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>
 

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>
 

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>

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)

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)

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>

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>

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>

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

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;

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>
 

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; }

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; }

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};

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.

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;

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 {
 

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;
 

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 {
 

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;

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;

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;

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;
 

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>;

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 "test/UnitTest/MemoryMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
 
 #include <stdio.h>
 #include <stdlib.h>

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
 

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

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;

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;

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;
 

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 {
 

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;

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 =

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"
 

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:

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

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);
 

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

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

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"
 

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

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

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

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

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

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) {

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:

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

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

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) {

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

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) {

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) {

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>

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;

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>

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>

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 "test/UnitTest/FPExceptMatcher.h"
-#include "utils/UnitTest/Test.h"
+#include "test/UnitTest/Test.h"
 
 #include <fenv.h>
 #include <signal.h>

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>
 

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>
 

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>