From 553d931f4c20252bd573b3ce4b5685b48c74952d Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Thu, 20 Nov 2025 15:17:19 +0000 Subject: [PATCH] build: rename gmock-gtest target to gtest Signed-off-by: Mateusz Jablonski --- .clang-format | 2 +- cmake/find_gtest.cmake | 8 ++++---- level_zero/core/test/aub_tests/CMakeLists.txt | 2 +- level_zero/core/test/unit_tests/CMakeLists.txt | 2 +- level_zero/core/test/unit_tests/fixtures/CMakeLists.txt | 4 ++-- level_zero/core/test/unit_tests/mocks/CMakeLists.txt | 2 +- level_zero/core/test/unit_tests/mt_tests/CMakeLists.txt | 2 +- level_zero/sysman/test/unit_tests/CMakeLists.txt | 2 +- level_zero/tools/test/unit_tests/CMakeLists.txt | 2 +- opencl/test/unit_test/CMakeLists.txt | 2 +- opencl/test/unit_test/aub_tests/CMakeLists.txt | 2 +- opencl/test/unit_test/libult/CMakeLists.txt | 2 +- opencl/test/unit_test/linux/CMakeLists.txt | 2 +- opencl/test/unit_test/mocks/CMakeLists.txt | 2 +- opencl/test/unit_test/mt_tests/CMakeLists.txt | 2 +- opencl/test/unit_test/offline_compiler/CMakeLists.txt | 2 +- .../offline_compiler/segfault_test/CMakeLists.txt | 2 +- opencl/test/unit_test/windows/CMakeLists.txt | 2 +- shared/test/common/libult/CMakeLists.txt | 2 +- shared/test/common/mocks/CMakeLists.txt | 2 +- .../common/test_configuration/aub_tests/CMakeLists.txt | 2 +- .../common/test_configuration/mt_tests/CMakeLists.txt | 2 +- .../common/test_configuration/unit_tests/CMakeLists.txt | 2 +- shared/test/unit_test/CMakeLists.txt | 2 +- shared/test/unit_test/mt_tests/CMakeLists.txt | 2 +- 25 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.clang-format b/.clang-format index c3daf1162b..b259050969 100644 --- a/.clang-format +++ b/.clang-format @@ -62,7 +62,7 @@ IncludeCategories: Priority: 5 - Regex: '^.(third_party|llvm|llvm-c|clang|clang-c|gtest|isl|json)/' Priority: 5 - - Regex: '^.(gmock|cl|gl|d3d)' + - Regex: '^.(cl|gl|d3d)' Priority: 5 - Regex: '^<.*>$' Priority: 10 diff --git a/cmake/find_gtest.cmake b/cmake/find_gtest.cmake index c31a5b7f02..d792ddb03e 100644 --- a/cmake/find_gtest.cmake +++ b/cmake/find_gtest.cmake @@ -1,5 +1,5 @@ # -# Copyright (C) 2024 Intel Corporation +# Copyright (C) 2024-2025 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -7,10 +7,10 @@ get_filename_component(GTEST_DIR "${NEO_SOURCE_DIR}/third_party/gtest" ABSOLUTE) if(IS_DIRECTORY ${GTEST_DIR}) - add_library(gmock-gtest STATIC EXCLUDE_FROM_ALL + add_library(gtest STATIC EXCLUDE_FROM_ALL ${NEO_SOURCE_DIR}/cmake/find_gtest.cmake ${GTEST_DIR}/src/gtest-all.cc ) - target_include_directories(gmock-gtest PRIVATE ${GTEST_DIR}) - target_include_directories(gmock-gtest PUBLIC ${GTEST_DIR}/include) + target_include_directories(gtest PRIVATE ${GTEST_DIR}) + target_include_directories(gtest PUBLIC ${GTEST_DIR}/include) endif() diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt index 00e2058ccd..2c81edc93d 100644 --- a/level_zero/core/test/aub_tests/CMakeLists.txt +++ b/level_zero/core/test/aub_tests/CMakeLists.txt @@ -77,7 +77,7 @@ if(NOT NEO_SKIP_AUB_TESTS AND DEFINED AUB_STREAM_PROJECT_NAME) target_link_libraries(${TARGET_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME}) target_link_libraries(${TARGET_NAME} ${HW_LIBS_ULT}) - target_link_libraries(${TARGET_NAME} gmock-gtest) + target_link_libraries(${TARGET_NAME} gtest) target_link_libraries(${TARGET_NAME} ${NEO_EXTRA_LIBS}) target_link_libraries(${TARGET_NAME} ${AUB_STREAM_PROJECT_NAME}) diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt index 05ff27f6d3..cafc08ca00 100644 --- a/level_zero/core/test/unit_tests/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/CMakeLists.txt @@ -70,7 +70,7 @@ endif() target_link_libraries(${TARGET_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} ${HW_LIBS_ULT} - gmock-gtest + gtest ${NEO_EXTRA_LIBS} ) diff --git a/level_zero/core/test/unit_tests/fixtures/CMakeLists.txt b/level_zero/core/test/unit_tests/fixtures/CMakeLists.txt index 4be97acaf0..0fb76acb2e 100644 --- a/level_zero/core/test/unit_tests/fixtures/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/fixtures/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2023 Intel Corporation +# Copyright (C) 2020-2025 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -32,7 +32,7 @@ set(L0_FIXTURES_SOURCES add_library(${TARGET_NAME} OBJECT ${L0_FIXTURES_SOURCES} ${NEO_CORE_tests_compiler_mocks}) target_include_directories(${TARGET_NAME} PRIVATE - $ + $ $ $ ${NEO_SOURCE_DIR}/level_zero/core/test/unit_test diff --git a/level_zero/core/test/unit_tests/mocks/CMakeLists.txt b/level_zero/core/test/unit_tests/mocks/CMakeLists.txt index 86b799c43c..186024a09e 100644 --- a/level_zero/core/test/unit_tests/mocks/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/mocks/CMakeLists.txt @@ -45,7 +45,7 @@ set(L0_MOCKS_SOURCES add_library(${TARGET_NAME} OBJECT ${L0_MOCKS_SOURCES}) target_include_directories(${TARGET_NAME} PRIVATE - $ + $ $ $ ${NEO_SOURCE_DIR}/level_zero/core/test/unit_test diff --git a/level_zero/core/test/unit_tests/mt_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/mt_tests/CMakeLists.txt index 1102a4ce79..aa53ce2320 100644 --- a/level_zero/core/test/unit_tests/mt_tests/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/mt_tests/CMakeLists.txt @@ -68,7 +68,7 @@ if(NOT NEO_SKIP_MT_UNIT_TESTS) target_link_libraries(${TARGET_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} ${HW_LIBS_ULT} - gmock-gtest + gtest ${NEO_EXTRA_LIBS} ) diff --git a/level_zero/sysman/test/unit_tests/CMakeLists.txt b/level_zero/sysman/test/unit_tests/CMakeLists.txt index 5b76908776..7a86377a20 100644 --- a/level_zero/sysman/test/unit_tests/CMakeLists.txt +++ b/level_zero/sysman/test/unit_tests/CMakeLists.txt @@ -68,7 +68,7 @@ endif() target_link_libraries(${TARGET_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} ${HW_LIBS_ULT} - gmock-gtest + gtest ${NEO_EXTRA_LIBS} ) diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt index 7853ebc5e9..c70aa1c2dd 100644 --- a/level_zero/tools/test/unit_tests/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/CMakeLists.txt @@ -69,7 +69,7 @@ endif() target_link_libraries(${TARGET_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} ${HW_LIBS_ULT} - gmock-gtest + gtest ${NEO_EXTRA_LIBS} ) diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt index 3aed9584d8..4f2f883d0d 100644 --- a/opencl/test/unit_test/CMakeLists.txt +++ b/opencl/test/unit_test/CMakeLists.txt @@ -97,7 +97,7 @@ target_include_directories(igdrcl_tests PRIVATE ${KHRONOS_GL_HEADERS_DIR} ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests ) -target_link_libraries(igdrcl_tests gmock-gtest ${NEO_EXTRA_LIBS}) +target_link_libraries(igdrcl_tests gtest ${NEO_EXTRA_LIBS}) set(BUILT_IN_KERNEL_DIR "${NEO_SOURCE_DIR}/shared/source/built_ins") diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt index 3359581cdc..7845d612c0 100644 --- a/opencl/test/unit_test/aub_tests/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt @@ -61,7 +61,7 @@ if(NOT NEO_SKIP_AUB_TESTS AND DEFINED AUB_STREAM_PROJECT_NAME) target_link_libraries(igdrcl_aub_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME}) target_link_libraries(igdrcl_aub_tests igdrcl_mocks) - target_link_libraries(igdrcl_aub_tests gmock-gtest ${NEO_EXTRA_LIBS}) + target_link_libraries(igdrcl_aub_tests gtest ${NEO_EXTRA_LIBS}) target_link_libraries(igdrcl_aub_tests ${AUB_STREAM_PROJECT_NAME}) if(UNIX) diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt index a5f1836d89..47174c05f3 100644 --- a/opencl/test/unit_test/libult/CMakeLists.txt +++ b/opencl/test/unit_test/libult/CMakeLists.txt @@ -63,7 +63,7 @@ add_library(igdrcl_libult_env OBJECT EXCLUDE_FROM_ALL ) target_include_directories(igdrcl_libult_env PRIVATE - $ + $ ) set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW ${IGDRCL_SRCS_ENABLE_TESTED_HW}) diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt index c9aed8a712..9623d116b5 100644 --- a/opencl/test/unit_test/linux/CMakeLists.txt +++ b/opencl/test/unit_test/linux/CMakeLists.txt @@ -42,7 +42,7 @@ if(NOT DISABLE_WDDM_LINUX) target_sources(igdrcl_${target_name} PRIVATE ${NEO_SHARED_DIRECTORY}/dll/wddm/wddm_create.cpp) endif() -target_link_libraries(igdrcl_${target_name} ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks ${NEO_EXTRA_LIBS} gmock-gtest) +target_link_libraries(igdrcl_${target_name} ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks ${NEO_EXTRA_LIBS} gtest) target_compile_options(igdrcl_${target_name} PRIVATE -O0) diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt index ec49630250..35a0256c30 100644 --- a/opencl/test/unit_test/mocks/CMakeLists.txt +++ b/opencl/test/unit_test/mocks/CMakeLists.txt @@ -63,7 +63,7 @@ add_library(igdrcl_mocks STATIC EXCLUDE_FROM_ALL ${IGDRCL_SRCS_tests_mocks}) add_subdirectories() target_include_directories(igdrcl_mocks PRIVATE - $ + $ $ ) target_compile_definitions(igdrcl_mocks PRIVATE MOCKABLE_VIRTUAL=virtual $) diff --git a/opencl/test/unit_test/mt_tests/CMakeLists.txt b/opencl/test/unit_test/mt_tests/CMakeLists.txt index f1c77dd651..d5969804a7 100644 --- a/opencl/test/unit_test/mt_tests/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt @@ -36,7 +36,7 @@ if(NOT NEO_SKIP_MT_UNIT_TESTS) target_link_libraries(igdrcl_mt_tests ${TSAN_LIB}) target_link_libraries(igdrcl_mt_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME}) - target_link_libraries(igdrcl_mt_tests gmock-gtest) + target_link_libraries(igdrcl_mt_tests gtest) target_link_libraries(igdrcl_mt_tests igdrcl_mocks ${NEO_EXTRA_LIBS}) add_dependencies(igdrcl_mt_tests diff --git a/opencl/test/unit_test/offline_compiler/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/CMakeLists.txt index 56bf067716..29fdb2e6ec 100644 --- a/opencl/test/unit_test/offline_compiler/CMakeLists.txt +++ b/opencl/test/unit_test/offline_compiler/CMakeLists.txt @@ -162,7 +162,7 @@ target_compile_definitions(ocloc_tests PUBLIC DEFAULT_TEST_PLATFORM_NAME="${CLOC_LIB_DEFAULT_DEVICE}" ) -target_link_libraries(ocloc_tests gmock-gtest) +target_link_libraries(ocloc_tests gtest) if(WIN32) target_link_libraries(ocloc_tests dbghelp) diff --git a/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt index 147902a52f..35f37b71d9 100644 --- a/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt +++ b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt @@ -40,7 +40,7 @@ else() endif() add_executable(ocloc_segfault_test ${CLOC_SEGFAULT_TEST_SOURCES}) -target_link_libraries(ocloc_segfault_test gmock-gtest) +target_link_libraries(ocloc_segfault_test gtest) if(WIN32) if(MSVC) target_compile_options(ocloc_segfault_test PRIVATE /Zi) diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt index 782fe96895..3e414ccf8b 100644 --- a/opencl/test/unit_test/windows/CMakeLists.txt +++ b/opencl/test/unit_test/windows/CMakeLists.txt @@ -41,7 +41,7 @@ if(WIN32) ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp ) - target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${NEO_EXTRA_LIBS}) + target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gtest ${NEO_EXTRA_LIBS}) target_include_directories(igdrcl_windows_dll_tests PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index 3644d1b661..73f94165cb 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -267,7 +267,7 @@ foreach(target_name "neo_libult_common" "neo_libult") target_include_directories(${target_name} PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests $ - $ + $ ) target_compile_definitions(${target_name} PRIVATE $) # please do not add new sources below this function diff --git a/shared/test/common/mocks/CMakeLists.txt b/shared/test/common/mocks/CMakeLists.txt index 7898b80242..e5ecad5204 100644 --- a/shared/test/common/mocks/CMakeLists.txt +++ b/shared/test/common/mocks/CMakeLists.txt @@ -164,7 +164,7 @@ set_target_properties(neo_shared_mocks PROPERTIES FOLDER ${SHARED_TEST_PROJECTS_ set_property(TARGET neo_shared_mocks APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) target_include_directories(neo_shared_mocks PRIVATE $ - $ + $ ) target_compile_definitions(neo_shared_mocks PRIVATE $) create_project_source_tree(neo_shared_mocks) diff --git a/shared/test/common/test_configuration/aub_tests/CMakeLists.txt b/shared/test/common/test_configuration/aub_tests/CMakeLists.txt index 5178b794a7..6dd38deee7 100644 --- a/shared/test/common/test_configuration/aub_tests/CMakeLists.txt +++ b/shared/test/common/test_configuration/aub_tests/CMakeLists.txt @@ -39,7 +39,7 @@ set_target_properties(neo_aub_tests_config PROPERTIES FOLDER ${SHARED_TEST_PROJE set_property(TARGET neo_aub_tests_config APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) target_include_directories(neo_aub_tests_config PUBLIC $ - $ + $ ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX} ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/shared/test/common/test_configuration/mt_tests/CMakeLists.txt b/shared/test/common/test_configuration/mt_tests/CMakeLists.txt index 4a5a756b06..db783946e2 100644 --- a/shared/test/common/test_configuration/mt_tests/CMakeLists.txt +++ b/shared/test/common/test_configuration/mt_tests/CMakeLists.txt @@ -30,7 +30,7 @@ set_target_properties(neo_mt_tests_config PROPERTIES FOLDER ${SHARED_TEST_PROJEC set_property(TARGET neo_mt_tests_config APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) target_include_directories(neo_mt_tests_config PRIVATE $ - $ + $ ) target_compile_definitions(neo_mt_tests_config PRIVATE $) create_project_source_tree(neo_mt_tests_config) diff --git a/shared/test/common/test_configuration/unit_tests/CMakeLists.txt b/shared/test/common/test_configuration/unit_tests/CMakeLists.txt index b027681391..b3e698549c 100644 --- a/shared/test/common/test_configuration/unit_tests/CMakeLists.txt +++ b/shared/test/common/test_configuration/unit_tests/CMakeLists.txt @@ -30,7 +30,7 @@ set_target_properties(neo_unit_tests_config PROPERTIES FOLDER ${SHARED_TEST_PROJ set_property(TARGET neo_unit_tests_config APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) target_include_directories(neo_unit_tests_config PRIVATE $ - $ + $ ) target_compile_definitions(neo_unit_tests_config PRIVATE $) create_project_source_tree(neo_unit_tests_config) diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index 26d0ed1e93..868566087a 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -54,7 +54,7 @@ if(WIN32) endif() target_link_libraries(neo_shared_tests - gmock-gtest + gtest ${NEO_SHARED_MOCKABLE_LIB_NAME} ${NEO_EXTRA_LIBS} ) diff --git a/shared/test/unit_test/mt_tests/CMakeLists.txt b/shared/test/unit_test/mt_tests/CMakeLists.txt index 14c0061cb4..04141d3fd0 100644 --- a/shared/test/unit_test/mt_tests/CMakeLists.txt +++ b/shared/test/unit_test/mt_tests/CMakeLists.txt @@ -56,7 +56,7 @@ if(NOT NEO_SKIP_MT_UNIT_TESTS) target_link_libraries(neo_shared_mt_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} - gmock-gtest + gtest ${NEO_EXTRA_LIBS} )