Fix aub targets generation

Do not generate aub related targets, unless AUB_TESTS config is explicitly
specified for a platform in platforms.cmake

Change-Id: I8cc58a8e70a1de44be5bb5c0229084b04c2a78be
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski 2019-07-11 11:03:53 +02:00 committed by sys_ocldev
parent 3b8d39be62
commit 2403f4cef7
1 changed files with 32 additions and 29 deletions

View File

@ -69,19 +69,7 @@ target_link_libraries(igdrcl_aub_tests gmock-gtest ${IGDRCL_EXTRA_LIBS})
target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${IGDRCL_SOURCE_DIR}/unit_tests/gen_common${BRANCH_DIR_SUFFIX}) target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${IGDRCL_SOURCE_DIR}/unit_tests/gen_common${BRANCH_DIR_SUFFIX})
macro(macro_for_each_test_config) macro(macro_for_each_test_config)
set(AUB_TESTS_OPTIONS "") if(NOT TARGET ${PLATFORM_IT_LOWER}_aub_tests)
if (NOT ${AUB_DUMP_BUFFER_FORMAT} STREQUAL "")
list(APPEND AUB_TESTS_OPTIONS --dump_buffer_format)
list(APPEND AUB_TESTS_OPTIONS ${AUB_DUMP_BUFFER_FORMAT})
endif()
if (NOT ${AUB_DUMP_IMAGE_FORMAT} STREQUAL "")
list(APPEND AUB_TESTS_OPTIONS --dump_image_format)
list(APPEND AUB_TESTS_OPTIONS ${AUB_DUMP_IMAGE_FORMAT})
endif()
neo_run_aub_target(${PLATFORM_IT_LOWER} "${PLATFORM_IT} ${SLICES}x${SUBSLICES}x${EU_PER_SS}" ${PLATFORM_IT_LOWER} ${SLICES} ${SUBSLICES} ${EU_PER_SS} "${AUB_TESTS_OPTIONS}")
endmacro()
macro(macro_for_each_platform)
add_custom_target(${PLATFORM_IT_LOWER}_aub_tests add_custom_target(${PLATFORM_IT_LOWER}_aub_tests
DEPENDS igdrcl_aub_tests DEPENDS igdrcl_aub_tests
DEPENDS copy_test_files_${PLATFORM_IT_LOWER} DEPENDS copy_test_files_${PLATFORM_IT_LOWER}
@ -111,6 +99,21 @@ macro(macro_for_each_platform)
if(WIN32) if(WIN32)
add_dependencies(${PLATFORM_IT_LOWER}_aub_tests mock_gdi) add_dependencies(${PLATFORM_IT_LOWER}_aub_tests mock_gdi)
endif() endif()
endif()
set(AUB_TESTS_OPTIONS "")
if (NOT ${AUB_DUMP_BUFFER_FORMAT} STREQUAL "")
list(APPEND AUB_TESTS_OPTIONS --dump_buffer_format)
list(APPEND AUB_TESTS_OPTIONS ${AUB_DUMP_BUFFER_FORMAT})
endif()
if (NOT ${AUB_DUMP_IMAGE_FORMAT} STREQUAL "")
list(APPEND AUB_TESTS_OPTIONS --dump_image_format)
list(APPEND AUB_TESTS_OPTIONS ${AUB_DUMP_IMAGE_FORMAT})
endif()
neo_run_aub_target(${PLATFORM_IT_LOWER} "${PLATFORM_IT} ${SLICES}x${SUBSLICES}x${EU_PER_SS}" ${PLATFORM_IT_LOWER} ${SLICES} ${SUBSLICES} ${EU_PER_SS} "${AUB_TESTS_OPTIONS}")
endmacro()
macro(macro_for_each_platform)
apply_macro_for_each_test_config("AUB_TESTS") apply_macro_for_each_test_config("AUB_TESTS")
endmacro() endmacro()