cmake: fix GTEST_SHUFFLE setup

Change-Id: I1a6cc40445afafbcf6c13dce292a6a7cf6b1ec5f
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk
2020-03-25 12:31:47 +01:00
committed by sys_ocldev
parent 557aff4610
commit a086310a4e
3 changed files with 12 additions and 26 deletions

View File

@ -168,6 +168,18 @@ else()
set(NEO_ARCH "x86")
endif()
if(NOT SKIP_UNIT_TESTS)
if(NOT DEFINED GTEST_REPEAT)
set(GTEST_REPEAT 1)
endif()
message(STATUS "GTest repeat count set to ${GTEST_REPEAT}")
if(NOT DEFINED GTEST_SHUFFLE)
set(GTEST_SHUFFLE --gtest_shuffle --gtest_random_seed=0)
endif()
message(STATUS "GTest shuffle set to ${GTEST_SHUFFLE}")
endif()
if(NOT KMDAF_HEADERS_DIR)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../kmdaf/inc/common/kmDaf.h")
get_filename_component(KMDAF_HEADERS_DIR "../kmdaf/inc/common/" ABSOLUTE)

View File

@ -141,14 +141,4 @@ else()
set(RUN_ULT_CMD LD_LIBRARY_PATH=$<TARGET_FILE_DIR:${TARGET_NAME}> $<TARGET_FILE:${TARGET_NAME}>)
endif()
if(NOT GTEST_REPEAT)
set(GTEST_REPEAT 1 CACHE STRING "Google test iterations")
endif()
message(STATUS "GTest repeat count set to ${GTEST_REPEAT}")
if(NOT GTEST_SHUFFLE)
set(GTEST_SHUFFLE --gtest_shuffle --gtest_random_seed=0)
endif()
message(STATUS "GTest shuffle set to ${GTEST_SHUFFLE}")
create_source_tree(${TARGET_NAME} ${L0_ROOT_DIR}/..)

View File

@ -112,22 +112,6 @@ include(${NEO_SOURCE_DIR}/opencl/test/unit_test/core_unit_tests_files.cmake)
hide_subdir(gen_common)
add_subdirectory(gen_common)
if(NOT GTEST_REPEAT)
set(GTEST_REPEAT 1 CACHE STRING "Google test iterations")
endif()
set(GTEST_REPEAT ${GTEST_REPEAT} CACHE STRING "Google test iterations")
if(NOT DEFINED GTEST_XML_OUTPUT_DIR)
set(GTEST_XML_OUTPUT_DIR "test_logs")
endif()
set(GTEST_XML_OUTPUT_DIR ${GTEST_XML_OUTPUT_DIR} CACHE STRING "Google Test xml output file location")
message(STATUS "GTest repeat count set to ${GTEST_REPEAT}")
if(NOT GTEST_SHUFFLE)
set(GTEST_SHUFFLE --gtest_shuffle --gtest_random_seed=0)
endif()
message(STATUS "GTest shuffle set to ${GTEST_SHUFFLE}")
if(NOT GTEST_EXCEPTION_OPTIONS)
set(GTEST_EXCEPTION_OPTIONS --gtest_catch_exceptions=1)
endif()