From 3241eea8fcf76776c5cd726dae7d14f24afd43df Mon Sep 17 00:00:00 2001 From: Mateusz Hoppe Date: Wed, 4 Mar 2020 10:08:40 +0100 Subject: [PATCH] Respect global option APPVERIFIER_ALLOWED in ult targets Change-Id: Ifb8044c97ec98d85cbeb132637bd6f6592b01372 Signed-off-by: Mateusz Hoppe --- opencl/test/unit_test/cmake/run_ult_target.cmake | 2 +- opencl/test/unit_test/gen11/icllp/CMakeLists.txt | 2 +- opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt | 2 +- opencl/test/unit_test/gen8/bdw/CMakeLists.txt | 2 +- opencl/test/unit_test/gen9/skl/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opencl/test/unit_test/cmake/run_ult_target.cmake b/opencl/test/unit_test/cmake/run_ult_target.cmake index 7a053dfbc4..dd0a1b041a 100644 --- a/opencl/test/unit_test/cmake/run_ult_target.cmake +++ b/opencl/test/unit_test/cmake/run_ult_target.cmake @@ -23,7 +23,7 @@ add_custom_command( ) add_dependencies(run_unit_tests run_${product}_unit_tests) -if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND "${IGDRCL_OPTION__BITS}" STREQUAL "64" AND DEFINED appverified_allowed) +if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND "${IGDRCL_OPTION__BITS}" STREQUAL "64" AND appverified_allowed) add_custom_command( TARGET run_${product}_unit_tests POST_BUILD diff --git a/opencl/test/unit_test/gen11/icllp/CMakeLists.txt b/opencl/test/unit_test/gen11/icllp/CMakeLists.txt index baae39cb5b..58c7300626 100644 --- a/opencl/test/unit_test/gen11/icllp/CMakeLists.txt +++ b/opencl/test/unit_test/gen11/icllp/CMakeLists.txt @@ -14,7 +14,7 @@ if(TESTS_ICLLP) ) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_icllp}) add_subdirectories() - set(appverified_allowed TRUE) + set(appverified_allowed ${APPVERIFIER_ALLOWED}) set(unit_test_config "icllp/1/8/8") include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake) endif() diff --git a/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt b/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt index 0424baaab6..1ba831ef2d 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt +++ b/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt @@ -13,7 +13,7 @@ if(TESTS_TGLLP) ) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_tgllp}) add_subdirectories() - set(appverified_allowed TRUE) + set(appverified_allowed ${APPVERIFIER_ALLOWED}) set(unit_test_config "tgllp/1/6/16") include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake) endif() diff --git a/opencl/test/unit_test/gen8/bdw/CMakeLists.txt b/opencl/test/unit_test/gen8/bdw/CMakeLists.txt index 8c51b49dd2..d3666f61d1 100644 --- a/opencl/test/unit_test/gen8/bdw/CMakeLists.txt +++ b/opencl/test/unit_test/gen8/bdw/CMakeLists.txt @@ -13,7 +13,7 @@ if(TESTS_BDW) ) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen8_bdw}) add_subdirectories() - set(appverified_allowed TRUE) + set(appverified_allowed ${APPVERIFIER_ALLOWED}) set(unit_test_config "bdw/1/3/8") include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake) endif() diff --git a/opencl/test/unit_test/gen9/skl/CMakeLists.txt b/opencl/test/unit_test/gen9/skl/CMakeLists.txt index bf052eeb3c..d9701272bf 100644 --- a/opencl/test/unit_test/gen9/skl/CMakeLists.txt +++ b/opencl/test/unit_test/gen9/skl/CMakeLists.txt @@ -18,7 +18,7 @@ if(TESTS_SKL) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_skl}) add_subdirectories() - set(appverified_allowed TRUE) + set(appverified_allowed ${APPVERIFIER_ALLOWED}) set(unit_test_config "skl/1/3/8") include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake) endif()