This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG59052468c3e3: Move googletest to the third-party directory
(authored by tstellar).
Changed prior to commit:
https://reviews.llvm.org/D131919?vs=468784&id=474310#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D131919/new/
https://reviews.llvm.org/D131919
Files:
clang/CMakeLists.txt
compiler-rt/CMakeLists.txt
lld/CMakeLists.txt
lldb/cmake/modules/LLDBStandalone.cmake
llvm/CMakeLists.txt
llvm/cmake/modules/HandleLLVMOptions.cmake
llvm/utils/unittest/CMakeLists.txt
llvm/utils/unittest/UnitTestMain/CMakeLists.txt
llvm/utils/unittest/UnitTestMain/TestMain.cpp
llvm/utils/unittest/googlemock/LICENSE.txt
llvm/utils/unittest/googlemock/README.LLVM
llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h
llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h
llvm/utils/unittest/googlemock/include/gmock/gmock-function-mocker.h
llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h
llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h
llvm/utils/unittest/googlemock/include/gmock/gmock-more-matchers.h
llvm/utils/unittest/googlemock/include/gmock/gmock-nice-strict.h
llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
llvm/utils/unittest/googlemock/include/gmock/gmock.h
llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
llvm/utils/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h
llvm/utils/unittest/googlemock/include/gmock/internal/gmock-pp.h
llvm/utils/unittest/googlemock/src/gmock-all.cc
llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc
llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc
llvm/utils/unittest/googlemock/src/gmock-matchers.cc
llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc
llvm/utils/unittest/googlemock/src/gmock.cc
llvm/utils/unittest/googletest/LICENSE.TXT
llvm/utils/unittest/googletest/README.LLVM
llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h
llvm/utils/unittest/googletest/include/gtest/gtest-matchers.h
llvm/utils/unittest/googletest/include/gtest/gtest-message.h
llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
llvm/utils/unittest/googletest/include/gtest/gtest-printers.h
llvm/utils/unittest/googletest/include/gtest/gtest-spi.h
llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h
llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h
llvm/utils/unittest/googletest/include/gtest/gtest.h
llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h
llvm/utils/unittest/googletest/include/gtest/gtest_prod.h
llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-port.h
llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
llvm/utils/unittest/googletest/include/gtest/internal/custom/gtest.h
llvm/utils/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h
llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h
llvm/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h
llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h
llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h
llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h
llvm/utils/unittest/googletest/src/gtest-all.cc
llvm/utils/unittest/googletest/src/gtest-death-test.cc
llvm/utils/unittest/googletest/src/gtest-filepath.cc
llvm/utils/unittest/googletest/src/gtest-internal-inl.h
llvm/utils/unittest/googletest/src/gtest-matchers.cc
llvm/utils/unittest/googletest/src/gtest-port.cc
llvm/utils/unittest/googletest/src/gtest-printers.cc
llvm/utils/unittest/googletest/src/gtest-test-part.cc
llvm/utils/unittest/googletest/src/gtest-typed-test.cc
llvm/utils/unittest/googletest/src/gtest.cc
mlir/CMakeLists.txt
polly/CMakeLists.txt
third-party/unittest/CMakeLists.txt
third-party/unittest/UnitTestMain/CMakeLists.txt
third-party/unittest/UnitTestMain/TestMain.cpp
third-party/unittest/googlemock/LICENSE.txt
third-party/unittest/googlemock/README.LLVM
third-party/unittest/googlemock/include/gmock/gmock-actions.h
third-party/unittest/googlemock/include/gmock/gmock-cardinalities.h
third-party/unittest/googlemock/include/gmock/gmock-function-mocker.h
third-party/unittest/googlemock/include/gmock/gmock-generated-actions.h
third-party/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
third-party/unittest/googlemock/include/gmock/gmock-generated-matchers.h
third-party/unittest/googlemock/include/gmock/gmock-matchers.h
third-party/unittest/googlemock/include/gmock/gmock-more-actions.h
third-party/unittest/googlemock/include/gmock/gmock-more-matchers.h
third-party/unittest/googlemock/include/gmock/gmock-nice-strict.h
third-party/unittest/googlemock/include/gmock/gmock-spec-builders.h
third-party/unittest/googlemock/include/gmock/gmock.h
third-party/unittest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
third-party/unittest/googlemock/include/gmock/internal/custom/gmock-matchers.h
third-party/unittest/googlemock/include/gmock/internal/custom/gmock-port.h
third-party/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
third-party/unittest/googlemock/include/gmock/internal/gmock-port.h
third-party/unittest/googlemock/include/gmock/internal/gmock-pp.h
third-party/unittest/googlemock/src/gmock-all.cc
third-party/unittest/googlemock/src/gmock-cardinalities.cc
third-party/unittest/googlemock/src/gmock-internal-utils.cc
third-party/unittest/googlemock/src/gmock-matchers.cc
third-party/unittest/googlemock/src/gmock-spec-builders.cc
third-party/unittest/googlemock/src/gmock.cc
third-party/unittest/googletest/LICENSE.TXT
third-party/unittest/googletest/README.LLVM
third-party/unittest/googletest/include/gtest/gtest-death-test.h
third-party/unittest/googletest/include/gtest/gtest-matchers.h
third-party/unittest/googletest/include/gtest/gtest-message.h
third-party/unittest/googletest/include/gtest/gtest-param-test.h
third-party/unittest/googletest/include/gtest/gtest-printers.h
third-party/unittest/googletest/include/gtest/gtest-spi.h
third-party/unittest/googletest/include/gtest/gtest-test-part.h
third-party/unittest/googletest/include/gtest/gtest-typed-test.h
third-party/unittest/googletest/include/gtest/gtest.h
third-party/unittest/googletest/include/gtest/gtest_pred_impl.h
third-party/unittest/googletest/include/gtest/gtest_prod.h
third-party/unittest/googletest/include/gtest/internal/custom/gtest-port.h
third-party/unittest/googletest/include/gtest/internal/custom/gtest-printers.h
third-party/unittest/googletest/include/gtest/internal/custom/gtest.h
third-party/unittest/googletest/include/gtest/internal/custom/raw-ostream.h
third-party/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
third-party/unittest/googletest/include/gtest/internal/gtest-filepath.h
third-party/unittest/googletest/include/gtest/internal/gtest-internal.h
third-party/unittest/googletest/include/gtest/internal/gtest-param-util.h
third-party/unittest/googletest/include/gtest/internal/gtest-port-arch.h
third-party/unittest/googletest/include/gtest/internal/gtest-port.h
third-party/unittest/googletest/include/gtest/internal/gtest-string.h
third-party/unittest/googletest/include/gtest/internal/gtest-type-util.h
third-party/unittest/googletest/src/gtest-all.cc
third-party/unittest/googletest/src/gtest-death-test.cc
third-party/unittest/googletest/src/gtest-filepath.cc
third-party/unittest/googletest/src/gtest-internal-inl.h
third-party/unittest/googletest/src/gtest-matchers.cc
third-party/unittest/googletest/src/gtest-port.cc
third-party/unittest/googletest/src/gtest-printers.cc
third-party/unittest/googletest/src/gtest-test-part.cc
third-party/unittest/googletest/src/gtest-typed-test.cc
third-party/unittest/googletest/src/gtest.cc
Index: polly/CMakeLists.txt
===================================================================
--- polly/CMakeLists.txt
+++ polly/CMakeLists.txt
@@ -28,10 +28,10 @@
# Enable unit tests if available.
set(POLLY_GTEST_AVAIL 0)
- set(UNITTEST_DIR ${LLVM_SOURCE_ROOT}/utils/unittest)
+ set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
if (NOT TARGET gtest)
- add_subdirectory(${UNITTEST_DIR} utils/unittest)
+ add_subdirectory(${UNITTEST_DIR} third-party/unittest)
endif()
set(POLLY_GTEST_AVAIL 1)
endif()
Index: mlir/CMakeLists.txt
===================================================================
--- mlir/CMakeLists.txt
+++ mlir/CMakeLists.txt
@@ -25,11 +25,9 @@
include_directories(${LLVM_INCLUDE_DIRS})
- 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)
+ set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
- add_subdirectory(${UNITTEST_DIR} utils/unittest)
+ add_subdirectory(${UNITTEST_DIR} third-party/unittest)
endif()
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
@@ -178,7 +176,7 @@
if (MLIR_INCLUDE_TESTS)
add_definitions(-DMLIR_INCLUDE_TESTS)
add_custom_target(MLIRUnitTests)
- if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
+ if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h)
add_subdirectory(unittests)
else()
message(WARNING "gtest not found, unittests will not be available")
Index: llvm/cmake/modules/HandleLLVMOptions.cmake
===================================================================
--- llvm/cmake/modules/HandleLLVMOptions.cmake
+++ llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -1260,3 +1260,6 @@
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)")
Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -401,7 +401,6 @@
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)
@@ -1194,7 +1193,7 @@
add_subdirectory(utils/yaml-bench)
add_subdirectory(utils/split-file)
if( LLVM_INCLUDE_TESTS )
- add_subdirectory(utils/unittest)
+ add_subdirectory(${LLVM_THIRD_PARTY_DIR}/unittest ${CMAKE_CURRENT_BINARY_DIR}/third-party/unittest)
endif()
else()
if ( LLVM_INCLUDE_TESTS )
Index: lldb/cmake/modules/LLDBStandalone.cmake
===================================================================
--- lldb/cmake/modules/LLDBStandalone.cmake
+++ lldb/cmake/modules/LLDBStandalone.cmake
@@ -100,8 +100,8 @@
if(LLDB_INCLUDE_TESTS)
# Build the gtest library needed for unittests, if we have LLVM sources
# handy.
- if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest AND NOT TARGET llvm_gtest)
- add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/unittest utils/unittest)
+ if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest AND NOT TARGET llvm_gtest)
+ add_subdirectory(${LLVM_THIRD_PARTY_DIR}}/utils/unittest third-party/unittest)
endif()
# LLVMTestingSupport library is needed for Process/gdb-remote.
if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
Index: lld/CMakeLists.txt
===================================================================
--- lld/CMakeLists.txt
+++ lld/CMakeLists.txt
@@ -68,11 +68,11 @@
set(LLVM_UTILS_PROVIDED ON)
set(LLD_TEST_DEPS FileCheck not)
endif()
- set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
+ set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/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} utils/unittest)
+ add_subdirectory(${UNITTEST_DIR} third-party/unittest)
endif()
else()
# Seek installed Lit.
Index: compiler-rt/CMakeLists.txt
===================================================================
--- compiler-rt/CMakeLists.txt
+++ compiler-rt/CMakeLists.txt
@@ -639,7 +639,7 @@
endif()
# Unittests support.
-set(COMPILER_RT_GTEST_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest)
+set(COMPILER_RT_GTEST_PATH ${LLVM_THIRD_PARTY_DIR}/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 @@
)
# Mocking support.
-set(COMPILER_RT_GMOCK_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googlemock)
+set(COMPILER_RT_GMOCK_PATH ${LLVM_THIRD_PATY_DIR}/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
Index: clang/CMakeLists.txt
===================================================================
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -111,11 +111,11 @@
set(LLVM_UTILS_PROVIDED ON)
set(CLANG_TEST_DEPS FileCheck count not)
endif()
- set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
+ set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/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} utils/unittest)
+ add_subdirectory(${UNITTEST_DIR} third-party/unittest)
endif()
endif()
@@ -526,7 +526,7 @@
if( CLANG_INCLUDE_TESTS )
- if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
+ if(EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h)
add_subdirectory(unittests)
list(APPEND CLANG_TEST_DEPS ClangUnitTests)
list(APPEND CLANG_TEST_PARAMS
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
