Skip to content

Commit 9f37775

Browse files
stellaraccidentStella Laurenzo
authored andcommitted
[cmake] Prefix gtest and gtest_main with "llvm_".
The upstream project ships CMake rules for building vanilla gtest/gmock which conflict with the names chosen by LLVM. Since LLVM's build rules here are quite specific to LLVM, prefixing them to avoid collision is the right thing (i.e. there does not appear to be a path to letting someone *replace* LLVM's googletest with one they bring, so co-existence should be the goal). This allows LLVM to be included with testing enabled within projects that themselves have a dependency on an official gtest release. Reviewed By: mehdi_amini Differential Revision: https://reviews.llvm.org/D120789
1 parent 7380427 commit 9f37775

File tree

20 files changed

+37
-37
lines changed

20 files changed

+37
-37
lines changed

compiler-rt/lib/asan/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ function(add_asan_tests arch test_runtime)
172172
function(generate_asan_tests test_objects test_suite testname)
173173
generate_compiler_rt_tests(${test_objects} ${test_suite} ${testname} ${arch}
174174
COMPILE_DEPS ${ASAN_UNITTEST_HEADERS} ${ASAN_IGNORELIST_FILE}
175-
DEPS gtest asan
175+
DEPS llvm_gtest asan
176176
KIND ${TEST_KIND}
177177
${ARGN}
178178
)

compiler-rt/lib/fuzzer/tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH)
7474
FuzzerUnitTests "Fuzzer-${arch}-Test" ${arch}
7575
SOURCES FuzzerUnittest.cpp ${COMPILER_RT_GTEST_SOURCE}
7676
RUNTIME ${LIBFUZZER_TEST_RUNTIME}
77-
DEPS gtest ${LIBFUZZER_TEST_RUNTIME_DEPS}
77+
DEPS llvm_gtest ${LIBFUZZER_TEST_RUNTIME_DEPS}
7878
CFLAGS ${LIBFUZZER_UNITTEST_CFLAGS} ${LIBFUZZER_TEST_RUNTIME_CFLAGS}
7979
LINK_FLAGS ${LIBFUZZER_UNITTEST_LINK_FLAGS} ${LIBFUZZER_TEST_RUNTIME_LINK_FLAGS})
8080
set_target_properties(FuzzerUnitTests PROPERTIES
@@ -84,7 +84,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH)
8484
generate_compiler_rt_tests(FuzzedDataProviderTestObjects
8585
FuzzedDataProviderUnitTests "FuzzerUtils-${arch}-Test" ${arch}
8686
SOURCES FuzzedDataProviderUnittest.cpp ${COMPILER_RT_GTEST_SOURCE}
87-
DEPS gtest ${LIBFUZZER_TEST_RUNTIME_DEPS} ${COMPILER_RT_SOURCE_DIR}/include/fuzzer/FuzzedDataProvider.h
87+
DEPS llvm_gtest ${LIBFUZZER_TEST_RUNTIME_DEPS} ${COMPILER_RT_SOURCE_DIR}/include/fuzzer/FuzzedDataProvider.h
8888
CFLAGS ${LIBFUZZER_UNITTEST_CFLAGS} ${LIBFUZZER_TEST_RUNTIME_CFLAGS}
8989
LINK_FLAGS ${LIBFUZZER_UNITTEST_LINK_FLAGS} ${LIBFUZZER_TEST_RUNTIME_LINK_FLAGS})
9090
set_target_properties(FuzzedDataProviderUnitTests PROPERTIES

compiler-rt/lib/gwp_asan/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST GWP_ASAN_SUPPORTED_ARCH)
6666
GwpAsanUnitTests "GwpAsan-${arch}-Test" ${arch}
6767
SOURCES ${GWP_ASAN_UNITTESTS} ${COMPILER_RT_GTEST_SOURCE}
6868
RUNTIME ${GWP_ASAN_TEST_RUNTIME}
69-
DEPS gtest ${GWP_ASAN_UNIT_TEST_HEADERS}
69+
DEPS llvm_gtest ${GWP_ASAN_UNIT_TEST_HEADERS}
7070
CFLAGS ${GWP_ASAN_UNITTEST_CFLAGS}
7171
LINK_FLAGS ${GWP_ASAN_UNITTEST_LINK_FLAGS})
7272
set_target_properties(GwpAsanUnitTests PROPERTIES

compiler-rt/lib/interception/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ macro(add_interception_tests_for_arch arch)
9595
RUNTIME ${INTERCEPTION_COMMON_LIB}
9696
SOURCES ${INTERCEPTION_UNITTESTS} ${COMPILER_RT_GTEST_SOURCE}
9797
COMPILE_DEPS ${INTERCEPTION_TEST_HEADERS}
98-
DEPS gtest
98+
DEPS llvm_gtest
9999
CFLAGS ${INTERCEPTION_TEST_CFLAGS_COMMON}
100100
LINK_FLAGS ${INTERCEPTION_TEST_LINK_FLAGS_COMMON})
101101
endmacro()

compiler-rt/lib/msan/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ macro(msan_compile obj_list source arch kind cflags)
6666
${obj_list} ${source} ${arch}
6767
KIND ${kind}
6868
COMPILE_DEPS ${MSAN_UNITTEST_HEADERS}
69-
DEPS gtest msan
69+
DEPS llvm_gtest msan
7070
CFLAGS -isystem ${CMAKE_CURRENT_BINARY_DIR}/../libcxx_msan_${arch}/include/c++/v1
7171
${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${cflags}
7272
)

compiler-rt/lib/orc/unittests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ else()
5252
append_list_if(COMPILER_RT_HAS_LIBEXECINFO -lexecinfo ORC_UNITTEST_LINK_FLAGS)
5353
endif()
5454

55-
set(ORC_DEPS gtest orc)
55+
set(ORC_DEPS llvm_gtest orc)
5656
# ORC uses C++ standard library headers.
5757
if (TARGET cxx-headers OR HAVE_LIBCXX)
5858
set(ORC_DEPS cxx-headers)

compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ macro(add_sanitizer_tests_for_arch arch)
163163
RUNTIME "${SANITIZER_COMMON_LIB}"
164164
SOURCES ${SANITIZER_UNITTESTS} ${COMPILER_RT_GTEST_SOURCE} ${COMPILER_RT_GMOCK_SOURCE}
165165
COMPILE_DEPS ${SANITIZER_TEST_HEADERS}
166-
DEPS gtest
166+
DEPS llvm_gtest
167167
CFLAGS ${SANITIZER_TEST_CFLAGS_COMMON} ${extra_flags}
168168
LINK_FLAGS ${SANITIZER_TEST_LINK_FLAGS_COMMON} ${TARGET_LINK_FLAGS} ${extra_flags})
169169

compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ macro(add_scudo_unittest testname)
7373
"${testname}-${arch}-Test" ${arch}
7474
SOURCES ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE}
7575
COMPILE_DEPS ${SCUDO_TEST_HEADERS}
76-
DEPS gtest scudo_standalone
76+
DEPS llvm_gtest scudo_standalone
7777
RUNTIME ${RUNTIME}
7878
CFLAGS ${SCUDO_UNITTEST_CFLAGS}
7979
LINK_FLAGS ${LINK_FLAGS})

compiler-rt/lib/tsan/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ foreach (header ${TSAN_HEADERS})
6262
list(APPEND TSAN_RTL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../${header})
6363
endforeach()
6464

65-
set(TSAN_DEPS gtest tsan)
65+
set(TSAN_DEPS llvm_gtest tsan)
6666
# TSan uses C++ standard library headers.
6767
if (TARGET cxx-headers OR HAVE_LIBCXX)
6868
set(TSAN_DEPS cxx-headers)

compiler-rt/lib/xray/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ macro(add_xray_unittest testname)
102102
${XRAY_HEADERS} ${XRAY_ALL_SOURCE_FILES_ABS_PATHS}
103103
"test_helpers.h"
104104
RUNTIME "${XRAY_RUNTIME_LIBS}"
105-
DEPS gtest xray llvm-xray LLVMXRay LLVMTestingSupport
105+
DEPS llvm_gtest xray llvm-xray LLVMXRay LLVMTestingSupport
106106
CFLAGS ${XRAY_UNITTEST_CFLAGS}
107107
LINK_FLAGS ${TARGET_LINK_FLAGS} ${XRAY_UNITTEST_LINK_FLAGS}
108108
)

flang/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ if (FLANG_STANDALONE_BUILD)
148148
if (FLANG_INCLUDE_TESTS)
149149
set(UNITTEST_DIR ${LLVM_BUILD_MAIN_SRC_DIR}/utils/unittest)
150150
if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
151-
if (NOT TARGET gtest)
152-
add_library(gtest
151+
if (NOT TARGET llvm_gtest)
152+
add_library(llvm_gtest
153153
${UNITTEST_DIR}/googletest/src/gtest-all.cc
154154
${UNITTEST_DIR}/googlemock/src/gmock-all.cc
155155
)
156-
target_include_directories(gtest
156+
target_include_directories(llvm_gtest
157157
PUBLIC
158158
"${UNITTEST_DIR}/googletest/include"
159159
"${UNITTEST_DIR}/googlemock/include"
@@ -163,9 +163,9 @@ if (FLANG_STANDALONE_BUILD)
163163
"${UNITTEST_DIR}/googlemock"
164164
)
165165
find_package(Threads)
166-
target_link_libraries(gtest PUBLIC Threads::Threads)
167-
add_library(gtest_main ${UNITTEST_DIR}/UnitTestMain/TestMain.cpp)
168-
target_link_libraries(gtest_main PUBLIC gtest)
166+
target_link_libraries(llvm_gtest PUBLIC Threads::Threads)
167+
add_library(llvm_gtest_main ${UNITTEST_DIR}/UnitTestMain/TestMain.cpp)
168+
target_link_libraries(gtest_main PUBLIC llvm_gtest)
169169
endif()
170170
set(FLANG_GTEST_AVAIL 1)
171171
else()
@@ -467,7 +467,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
467467
PATTERN "config.h" EXCLUDE
468468
PATTERN ".git" EXCLUDE
469469
PATTERN "CMakeFiles" EXCLUDE)
470-
470+
471471
install(DIRECTORY ${FLANG_INCLUDE_DIR}/flang
472472
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
473473
COMPONENT flang-headers

libc/benchmarks/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ function(add_libc_benchmark_unittest target_name)
2525
)
2626
target_link_libraries(${target_name}
2727
PRIVATE
28-
gtest_main
29-
gtest
28+
llvm_gtest_main
29+
llvm_gtest
3030
${LIBC_BENCHMARKS_UNITTEST_DEPENDS}
3131
)
3232
llvm_update_compile_flags(${target_name})

libc/test/utils/tools/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ function(add_libc_tool_unittest target_name)
1616
)
1717
target_link_libraries(${target_name}
1818
PRIVATE
19-
gtest_main
20-
gtest
19+
llvm_gtest_main
20+
llvm_gtest
2121
${LIBC_TOOL_UNITTEST_DEPENDS}
2222
)
2323

2424
add_custom_command(
2525
TARGET ${target_name}
2626
POST_BUILD
27-
COMMAND $<TARGET_FILE:${target_name}>
27+
COMMAND $<TARGET_FILE:${target_name}>
2828
${LIBC_TOOL_UNITTEST_ARGS}
2929
)
3030
add_dependencies(libc-tool-unittests ${target_name})

lldb/unittests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ endif ()
2020
if (LLDB_BUILT_STANDALONE)
2121
# Build the gtest library needed for unittests, if we have LLVM sources
2222
# handy.
23-
if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest AND NOT TARGET gtest)
23+
if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest AND NOT TARGET llvm_gtest)
2424
add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/unittest utils/unittest)
2525
endif()
2626
# LLVMTestingSupport library is needed for Process/gdb-remote.

llvm/cmake/modules/AddLLVM.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ function(add_unittest test_suite test_name)
15021502
# libpthreads overrides some standard library symbols, so main
15031503
# executable must be linked with it in order to provide consistent
15041504
# API for all shared libaries loaded by this executable.
1505-
target_link_libraries(${test_name} PRIVATE gtest_main gtest ${LLVM_PTHREAD_LIB})
1505+
target_link_libraries(${test_name} PRIVATE llvm_gtest_main llvm_gtest ${LLVM_PTHREAD_LIB})
15061506
15071507
add_dependencies(${test_suite} ${test_name})
15081508
get_target_property(test_suite_folder ${test_suite} FOLDER)

llvm/lib/Testing/Support/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ add_llvm_library(LLVMTestingSupport
1212
Support
1313
)
1414

15-
target_link_libraries(LLVMTestingSupport PRIVATE gtest)
15+
target_link_libraries(LLVMTestingSupport PRIVATE llvm_gtest)
1616

1717
# This is to avoid the error in gtest-death-test-internal.h
1818
# (150,16): error: 'Create' overrides a member function but

llvm/runtimes/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,8 +480,8 @@ if(runtimes)
480480
obj2yaml
481481
sancov
482482
sanstats
483-
gtest_main
484-
gtest
483+
llvm_gtest_main
484+
llvm_gtest
485485
)
486486
foreach(target ${test_targets} ${SUB_CHECK_TARGETS})
487487
add_dependencies(${target} ${RUNTIMES_TEST_DEPENDS})

llvm/unittests/Support/CommandLineInit/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ add_llvm_executable(${test_name}
2626
IGNORE_EXTERNALIZE_DEBUGINFO NO_INSTALL_RPATH
2727
CommandLineInitTest.cpp)
2828

29-
target_link_libraries(${test_name} PRIVATE gtest)
29+
target_link_libraries(${test_name} PRIVATE llvm_gtest)
3030

3131
add_dependencies(${test_suite} ${test_name})
3232

llvm/utils/unittest/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if (LLVM_PTHREAD_LIBRARY_PATH)
3939
list(APPEND LIBS pthread)
4040
endif()
4141

42-
add_llvm_library(gtest
42+
add_llvm_library(llvm_gtest
4343
googletest/src/gtest-all.cc
4444
googlemock/src/gmock-all.cc
4545

@@ -58,14 +58,14 @@ add_llvm_library(gtest
5858
# that warning here for any targets that link to gtest.
5959
if(CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG)
6060
add_definitions("-Wno-suggest-override")
61-
set_target_properties(gtest PROPERTIES INTERFACE_COMPILE_OPTIONS "-Wno-suggest-override")
61+
set_target_properties(llvm_gtest PROPERTIES INTERFACE_COMPILE_OPTIONS "-Wno-suggest-override")
6262
endif()
6363

6464
if (NOT LLVM_ENABLE_THREADS)
65-
target_compile_definitions(gtest PUBLIC GTEST_HAS_PTHREAD=0)
65+
target_compile_definitions(llvm_gtest PUBLIC GTEST_HAS_PTHREAD=0)
6666
endif ()
6767

68-
target_include_directories(gtest
68+
target_include_directories(llvm_gtest
6969
PUBLIC googletest/include googlemock/include
7070
PRIVATE googletest googlemock
7171
)
@@ -89,5 +89,5 @@ function (gtest_remove_dylib_from_link_interface target)
8989
endif()
9090
endfunction()
9191

92-
gtest_remove_dylib_from_link_interface(gtest)
93-
gtest_remove_dylib_from_link_interface(gtest_main)
92+
gtest_remove_dylib_from_link_interface(llvm_gtest)
93+
gtest_remove_dylib_from_link_interface(llvm_gtest_main)

llvm/utils/unittest/UnitTestMain/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
add_llvm_library(gtest_main
1+
add_llvm_library(llvm_gtest_main
22
TestMain.cpp
33

44
LINK_LIBS
5-
gtest
5+
llvm_gtest
66

77
LINK_COMPONENTS
88
Support # Depends on llvm::cl

0 commit comments

Comments
 (0)