72 files changed, 18 insertions, 18 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index c9f86d4c9889..8763cc0c1caa 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -111,11 +111,11 @@ if(CLANG_BUILT_STANDALONE)
         set(LLVM_UTILS_PROVIDED ON)
         set(CLANG_TEST_DEPS FileCheck count not)
       endif()
-      set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
+      set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
       if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
           AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
           AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
-        add_subdirectory(${UNITTEST_DIR} third-party/unittest)
+        add_subdirectory(${UNITTEST_DIR} utils/unittest)
       endif()
     endif()
 
@@ -526,7 +526,7 @@ endif()
 
 
 if( CLANG_INCLUDE_TESTS )
-  if(EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h)
+  if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
     add_subdirectory(unittests)
     list(APPEND CLANG_TEST_DEPS ClangUnitTests)
     list(APPEND CLANG_TEST_PARAMS
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index e244a5417997..674c7e765268 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -639,7 +639,7 @@ elseif (SANITIZER_TEST_CXX_LIBNAME STREQUAL "libstdc++")
 endif()
 
 # Unittests support.
-set(COMPILER_RT_GTEST_PATH ${LLVM_THIRD_PARTY_DIR}/unittest/googletest)
+set(COMPILER_RT_GTEST_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest)
 set(COMPILER_RT_GTEST_SOURCE ${COMPILER_RT_GTEST_PATH}/src/gtest-all.cc)
 set(COMPILER_RT_GTEST_CFLAGS
   -DGTEST_NO_LLVM_SUPPORT=1
@@ -649,7 +649,7 @@ set(COMPILER_RT_GTEST_CFLAGS
 )
 
 # Mocking support.
-set(COMPILER_RT_GMOCK_PATH ${LLVM_THIRD_PATY_DIR}/unittest/googlemock)
+set(COMPILER_RT_GMOCK_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googlemock)
 set(COMPILER_RT_GMOCK_SOURCE ${COMPILER_RT_GMOCK_PATH}/src/gmock-all.cc)
 set(COMPILER_RT_GMOCK_CFLAGS
   -DGTEST_NO_LLVM_SUPPORT=1
diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt
index 99f284e2e226..21a33c9425a0 100644
--- a/lld/CMakeLists.txt
+++ b/lld/CMakeLists.txt
@@ -68,11 +68,11 @@ if(LLD_BUILT_STANDALONE)
         set(LLVM_UTILS_PROVIDED ON)
         set(LLD_TEST_DEPS FileCheck not)
       endif()
-      set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
+      set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
       if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
           AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
           AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
-        add_subdirectory(${UNITTEST_DIR} third-party/unittest)
+        add_subdirectory(${UNITTEST_DIR} utils/unittest)
       endif()
     else()
       # Seek installed Lit.
diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake
index ce16f558012c..3ce63f12eef3 100644
--- a/lldb/cmake/modules/LLDBStandalone.cmake
+++ b/lldb/cmake/modules/LLDBStandalone.cmake
@@ -100,8 +100,8 @@ include_directories(
 if(LLDB_INCLUDE_TESTS)
   # Build the gtest library needed for unittests, if we have LLVM sources
   # handy.
-  if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest AND NOT TARGET llvm_gtest)
-    add_subdirectory(${LLVM_THIRD_PARTY_DIR}}/utils/unittest third-party/unittest)
+  if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest AND NOT TARGET llvm_gtest)
+    add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/unittest utils/unittest)
   endif()
   # LLVMTestingSupport library is needed for Process/gdb-remote.
   if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 60e1f29620af..aafdbbe0ef29 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -401,6 +401,7 @@ set(LLVM_MAIN_SRC_DIR     ${CMAKE_CURRENT_SOURCE_DIR}  ) # --src-root
 set(LLVM_MAIN_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/include ) # --includedir
 set(LLVM_BINARY_DIR       ${CMAKE_CURRENT_BINARY_DIR}  ) # --prefix
 
+set(LLVM_THIRD_PARTY_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/../third-party)
 
 # Note: LLVM_CMAKE_DIR does not include generated files
 set(LLVM_CMAKE_DIR ${LLVM_MAIN_SRC_DIR}/cmake/modules)
@@ -1193,7 +1194,7 @@ if( LLVM_INCLUDE_UTILS )
   add_subdirectory(utils/yaml-bench)
   add_subdirectory(utils/split-file)
   if( LLVM_INCLUDE_TESTS )
-    add_subdirectory(${LLVM_THIRD_PARTY_DIR}/unittest ${CMAKE_CURRENT_BINARY_DIR}/third-party/unittest)
+    add_subdirectory(utils/unittest)
   endif()
 else()
   if ( LLVM_INCLUDE_TESTS )
diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
index 7f141d93d4c2..abf10df85504 100644
--- a/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -1260,6 +1260,3 @@ if(LLVM_USE_RELATIVE_PATHS_IN_FILES)
   append_if(SUPPORTS_FFILE_PREFIX_MAP "-ffile-prefix-map=${source_root}/=${LLVM_SOURCE_PREFIX}" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
   add_flag_if_supported("-no-canonical-prefixes" NO_CANONICAL_PREFIXES)
 endif()
-
-set(LLVM_THIRD_PARTY_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/../third-party CACHE STRING
-    "Directory containing third party software used by LLVM (e.g. googletest)")
diff --git a/third-party/unittest/CMakeLists.txt b/llvm/utils/unittest/CMakeLists.txt
index 0e54e0e57c35..0e54e0e57c35 100644
--- a/third-party/unittest/CMakeLists.txt
+++ b/llvm/utils/unittest/CMakeLists.txt
diff --git a/third-party/unittest/UnitTestMain/CMakeLists.txt b/llvm/utils/unittest/UnitTestMain/CMakeLists.txt
index 7a3ac8a0f43e..7a3ac8a0f43e 100644
--- a/third-party/unittest/UnitTestMain/CMakeLists.txt
+++ b/llvm/utils/unittest/UnitTestMain/CMakeLists.txt
diff --git a/third-party/unittest/UnitTestMain/TestMain.cpp b/llvm/utils/unittest/UnitTestMain/TestMain.cpp
index 35ba72ba3fcd..35ba72ba3fcd 100644
--- a/third-party/unittest/UnitTestMain/TestMain.cpp
+++ b/llvm/utils/unittest/UnitTestMain/TestMain.cpp
diff --git a/third-party/unittest/googlemock/LICENSE.txt b/llvm/utils/unittest/googlemock/LICENSE.txt
index 1941a11f8ce9..1941a11f8ce9 100644
--- a/third-party/unittest/googlemock/LICENSE.txt
+++ b/llvm/utils/unittest/googlemock/LICENSE.txt
diff --git a/third-party/unittest/googlemock/README.LLVM b/llvm/utils/unittest/googlemock/README.LLVM
index 1fb6f4776e81..1fb6f4776e81 100644
--- a/third-party/unittest/googlemock/README.LLVM
+++ b/llvm/utils/unittest/googlemock/README.LLVM
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-actions.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h
index de58b18edc1d..de58b18edc1d 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-actions.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-cardinalities.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h
index 32c57b3b3272..32c57b3b3272 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-cardinalities.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-function-mocker.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-function-mocker.h
index 18127b844c57..18127b844c57 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-function-mocker.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-function-mocker.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-generated-actions.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
index c538dce8d272..c538dce8d272 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-generated-actions.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
index d131bea8158b..d131bea8158b 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-generated-matchers.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h
index 48ea9358d7c6..48ea9358d7c6 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-generated-matchers.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-matchers.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
index 8d636f48c67d..8d636f48c67d 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-matchers.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-more-actions.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h
index f6ee4a68c032..f6ee4a68c032 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-more-actions.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-more-matchers.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-more-matchers.h
index e96bd21d714e..e96bd21d714e 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-more-matchers.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-more-matchers.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-nice-strict.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-nice-strict.h
index 140fc19fcd7d..140fc19fcd7d 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-nice-strict.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-nice-strict.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock-spec-builders.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
index 80b0b8726fc6..80b0b8726fc6 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock-spec-builders.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
diff --git a/third-party/unittest/googlemock/include/gmock/gmock.h b/llvm/utils/unittest/googlemock/include/gmock/gmock.h
index 57469a0db89e..57469a0db89e 100644
--- a/third-party/unittest/googlemock/include/gmock/gmock.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock.h
diff --git a/third-party/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
index 4e381faf4084..4e381faf4084 100644
--- a/third-party/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
diff --git a/third-party/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h b/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
index 3a9b7cd31d4f..3a9b7cd31d4f 100644
--- a/third-party/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
diff --git a/third-party/unittest/googlemock/include/gmock/internal/custom/gmock-port.h b/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
index be78e2add8a0..be78e2add8a0 100644
--- a/third-party/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
diff --git a/third-party/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h b/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
index 9ee68b7261bc..9ee68b7261bc 100644
--- a/third-party/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
diff --git a/third-party/unittest/googlemock/include/gmock/internal/gmock-port.h b/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h
index cdb1c3ef62c5..cdb1c3ef62c5 100644
--- a/third-party/unittest/googlemock/include/gmock/internal/gmock-port.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h
diff --git a/third-party/unittest/googlemock/include/gmock/internal/gmock-pp.h b/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-pp.h
index 1ab80e1cdbee..1ab80e1cdbee 100644
--- a/third-party/unittest/googlemock/include/gmock/internal/gmock-pp.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-pp.h
diff --git a/third-party/unittest/googlemock/src/gmock-all.cc b/llvm/utils/unittest/googlemock/src/gmock-all.cc
index e43c9b7b4c15..e43c9b7b4c15 100644
--- a/third-party/unittest/googlemock/src/gmock-all.cc
+++ b/llvm/utils/unittest/googlemock/src/gmock-all.cc
diff --git a/third-party/unittest/googlemock/src/gmock-cardinalities.cc b/llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc
index 7463f4383233..7463f4383233 100644
--- a/third-party/unittest/googlemock/src/gmock-cardinalities.cc
+++ b/llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc
diff --git a/third-party/unittest/googlemock/src/gmock-internal-utils.cc b/llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc
index e5b547981d14..e5b547981d14 100644
--- a/third-party/unittest/googlemock/src/gmock-internal-utils.cc
+++ b/llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc
diff --git a/third-party/unittest/googlemock/src/gmock-matchers.cc b/llvm/utils/unittest/googlemock/src/gmock-matchers.cc
index 4a3f7af2351d..4a3f7af2351d 100644
--- a/third-party/unittest/googlemock/src/gmock-matchers.cc
+++ b/llvm/utils/unittest/googlemock/src/gmock-matchers.cc
diff --git a/third-party/unittest/googlemock/src/gmock-spec-builders.cc b/llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc
index f9d3434560b4..f9d3434560b4 100644
--- a/third-party/unittest/googlemock/src/gmock-spec-builders.cc
+++ b/llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc
diff --git a/third-party/unittest/googlemock/src/gmock.cc b/llvm/utils/unittest/googlemock/src/gmock.cc
index 32b2a7394fd0..32b2a7394fd0 100644
--- a/third-party/unittest/googlemock/src/gmock.cc
+++ b/llvm/utils/unittest/googlemock/src/gmock.cc
diff --git a/third-party/unittest/googletest/LICENSE.TXT b/llvm/utils/unittest/googletest/LICENSE.TXT
index 1941a11f8ce9..1941a11f8ce9 100644
--- a/third-party/unittest/googletest/LICENSE.TXT
+++ b/llvm/utils/unittest/googletest/LICENSE.TXT
diff --git a/third-party/unittest/googletest/README.LLVM b/llvm/utils/unittest/googletest/README.LLVM
index 3bc41c9ee3a2..3bc41c9ee3a2 100644
--- a/third-party/unittest/googletest/README.LLVM
+++ b/llvm/utils/unittest/googletest/README.LLVM
diff --git a/third-party/unittest/googletest/include/gtest/gtest-death-test.h b/llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h
index 1b89d84de3ca..1b89d84de3ca 100644
--- a/third-party/unittest/googletest/include/gtest/gtest-death-test.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h
diff --git a/third-party/unittest/googletest/include/gtest/gtest-matchers.h b/llvm/utils/unittest/googletest/include/gtest/gtest-matchers.h
index 667d16e6e727..667d16e6e727 100644
--- a/third-party/unittest/googletest/include/gtest/gtest-matchers.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest-matchers.h
diff --git a/third-party/unittest/googletest/include/gtest/gtest-message.h b/llvm/utils/unittest/googletest/include/gtest/gtest-message.h
index 5802907f9395..5802907f9395 100644
--- a/third-party/unittest/googletest/include/gtest/gtest-message.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest-message.h
diff --git a/third-party/unittest/googletest/include/gtest/gtest-param-test.h b/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
index 7bcf60c47a30..7bcf60c47a30 100644
--- a/third-party/unittest/googletest/include/gtest/gtest-param-test.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
diff --git a/third-party/unittest/googletest/include/gtest/gtest-printers.h b/llvm/utils/unittest/googletest/include/gtest/gtest-printers.h
index 8479435ac7e6..8479435ac7e6 100644
--- a/third-party/unittest/googletest/include/gtest/gtest-printers.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest-printers.h
diff --git a/third-party/unittest/googletest/include/gtest/gtest-spi.h b/llvm/utils/unittest/googletest/include/gtest/gtest-spi.h
index 4849e433fca7..4849e433fca7 100644
--- a/third-party/unittest/googletest/include/gtest/gtest-spi.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest-spi.h
diff --git a/third-party/unittest/googletest/include/gtest/gtest-test-part.h b/llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h
index 53526c98ee89..53526c98ee89 100644
--- a/third-party/unittest/googletest/include/gtest/gtest-test-part.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h
diff --git a/third-party/unittest/googletest/include/gtest/gtest-typed-test.h b/llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h
index 891f02e2a2fe..891f02e2a2fe 100644
--- a/third-party/unittest/googletest/include/gtest/gtest-typed-test.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h
diff --git a/third-party/unittest/googletest/include/gtest/gtest.h b/llvm/utils/unittest/googletest/include/gtest/gtest.h
index eb5c5cc0d0b6..eb5c5cc0d0b6 100644
--- a/third-party/unittest/googletest/include/gtest/gtest.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest.h
diff --git a/third-party/unittest/googletest/include/gtest/gtest_pred_impl.h b/llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h
index 50c156e664eb..50c156e664eb 100644
--- a/third-party/unittest/googletest/include/gtest/gtest_pred_impl.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h
diff --git a/third-party/unittest/googletest/include/gtest/gtest_prod.h b/llvm/utils/unittest/googletest/include/gtest/gtest_prod.h
index e651671ebde8..e651671ebde8 100644
--- a/third-party/unittest/googletest/include/gtest/gtest_prod.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest_prod.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/custom/gtest-port.h b/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-port.h
index cd85d956d2dc..cd85d956d2dc 100644
--- a/third-party/unittest/googletest/include/gtest/internal/custom/gtest-port.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-port.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/custom/gtest-printers.h b/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
index b7320920061c..b7320920061c 100644
--- a/third-party/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/custom/gtest.h b/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest.h
index 4c8e07be23f1..4c8e07be23f1 100644
--- a/third-party/unittest/googletest/include/gtest/internal/custom/gtest.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/custom/raw-ostream.h b/llvm/utils/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
index cff78f5c33f6..cff78f5c33f6 100644
--- a/third-party/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
index 052dc978252e..052dc978252e 100644
--- a/third-party/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/gtest-filepath.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h
index ca60a70d15b4..ca60a70d15b4 100644
--- a/third-party/unittest/googletest/include/gtest/internal/gtest-filepath.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/gtest-internal.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
index d861a0a4f76f..d861a0a4f76f 100644
--- a/third-party/unittest/googletest/include/gtest/internal/gtest-internal.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/gtest-param-util.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h
index f90b6422d667..f90b6422d667 100644
--- a/third-party/unittest/googletest/include/gtest/internal/gtest-param-util.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/gtest-port-arch.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h
index 357cffc13c80..357cffc13c80 100644
--- a/third-party/unittest/googletest/include/gtest/internal/gtest-port-arch.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/gtest-port.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h
index 9ec07b8d4a6a..9ec07b8d4a6a 100644
--- a/third-party/unittest/googletest/include/gtest/internal/gtest-port.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/gtest-string.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h
index 66ef15dc1dea..66ef15dc1dea 100644
--- a/third-party/unittest/googletest/include/gtest/internal/gtest-string.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h
diff --git a/third-party/unittest/googletest/include/gtest/internal/gtest-type-util.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h
index 892378a85f5c..892378a85f5c 100644
--- a/third-party/unittest/googletest/include/gtest/internal/gtest-type-util.h
+++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h
diff --git a/third-party/unittest/googletest/src/gtest-all.cc b/llvm/utils/unittest/googletest/src/gtest-all.cc
index ad292905cf38..ad292905cf38 100644
--- a/third-party/unittest/googletest/src/gtest-all.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-all.cc
diff --git a/third-party/unittest/googletest/src/gtest-death-test.cc b/llvm/utils/unittest/googletest/src/gtest-death-test.cc
index 5d1031bea257..5d1031bea257 100644
--- a/third-party/unittest/googletest/src/gtest-death-test.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-death-test.cc
diff --git a/third-party/unittest/googletest/src/gtest-filepath.cc b/llvm/utils/unittest/googletest/src/gtest-filepath.cc
index bd7b99ff03e4..bd7b99ff03e4 100644
--- a/third-party/unittest/googletest/src/gtest-filepath.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-filepath.cc
diff --git a/third-party/unittest/googletest/src/gtest-internal-inl.h b/llvm/utils/unittest/googletest/src/gtest-internal-inl.h
index 8ed70daab094..8ed70daab094 100644
--- a/third-party/unittest/googletest/src/gtest-internal-inl.h
+++ b/llvm/utils/unittest/googletest/src/gtest-internal-inl.h
diff --git a/third-party/unittest/googletest/src/gtest-matchers.cc b/llvm/utils/unittest/googletest/src/gtest-matchers.cc
index 7d2fb6851ec4..7d2fb6851ec4 100644
--- a/third-party/unittest/googletest/src/gtest-matchers.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-matchers.cc
diff --git a/third-party/unittest/googletest/src/gtest-port.cc b/llvm/utils/unittest/googletest/src/gtest-port.cc
index fc5ba6becc55..fc5ba6becc55 100644
--- a/third-party/unittest/googletest/src/gtest-port.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-port.cc
diff --git a/third-party/unittest/googletest/src/gtest-printers.cc b/llvm/utils/unittest/googletest/src/gtest-printers.cc
index 3337be312ea4..3337be312ea4 100644
--- a/third-party/unittest/googletest/src/gtest-printers.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-printers.cc
diff --git a/third-party/unittest/googletest/src/gtest-test-part.cc b/llvm/utils/unittest/googletest/src/gtest-test-part.cc
index 178317a6bcdb..178317a6bcdb 100644
--- a/third-party/unittest/googletest/src/gtest-test-part.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-test-part.cc
diff --git a/third-party/unittest/googletest/src/gtest-typed-test.cc b/llvm/utils/unittest/googletest/src/gtest-typed-test.cc
index 8677caf732b4..8677caf732b4 100644
--- a/third-party/unittest/googletest/src/gtest-typed-test.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-typed-test.cc
diff --git a/third-party/unittest/googletest/src/gtest.cc b/llvm/utils/unittest/googletest/src/gtest.cc
index a5b4e5ac78ca..a5b4e5ac78ca 100644
--- a/third-party/unittest/googletest/src/gtest.cc
+++ b/llvm/utils/unittest/googletest/src/gtest.cc
diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt
index 651ec1a8c979..0d86a5d6027b 100644
--- a/mlir/CMakeLists.txt
+++ b/mlir/CMakeLists.txt
@@ -25,9 +25,11 @@ if(MLIR_STANDALONE_BUILD)
 
   include_directories(${LLVM_INCLUDE_DIRS})
 
-  set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
+  set(LLVM_MAIN_SRC_DIR ${CMAKE_SOURCE_DIR}/../llvm CACHE PATH
+      "Path to LLVM source tree")
+  set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
   if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
-    add_subdirectory(${UNITTEST_DIR} third-party/unittest)
+    add_subdirectory(${UNITTEST_DIR} utils/unittest)
   endif()
 
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
@@ -176,7 +178,7 @@ add_subdirectory(lib/CAPI)
 if (MLIR_INCLUDE_TESTS)
   add_definitions(-DMLIR_INCLUDE_TESTS)
   add_custom_target(MLIRUnitTests)
-  if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h)
+  if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
     add_subdirectory(unittests)
   else()
     message(WARNING "gtest not found, unittests will not be available")
diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt
index aa992decc422..2e906fdd8fc7 100644
--- a/polly/CMakeLists.txt
+++ b/polly/CMakeLists.txt
@@ -28,10 +28,10 @@ if(POLLY_STANDALONE_BUILD)
 
   # Enable unit tests if available.
   set(POLLY_GTEST_AVAIL 0)
-  set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
+  set(UNITTEST_DIR ${LLVM_SOURCE_ROOT}/utils/unittest)
   if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
     if (NOT TARGET gtest)
-      add_subdirectory(${UNITTEST_DIR} third-party/unittest)
+      add_subdirectory(${UNITTEST_DIR} utils/unittest)
     endif()
     set(POLLY_GTEST_AVAIL 1)
   endif()