From caa212dcf3e72d1cfce3e3f49a9d6fecf744bb1b Mon Sep 17 00:00:00 2001 From: Mateusz Hoppe Date: Tue, 6 Oct 2020 15:26:28 +0200 Subject: [PATCH] Create top level copy_test_file_per_product target - new target depends on all product specific copy_test_files targets Change-Id: I90adb6598790dc4a25d61e6c22f2b2b58e898717 Signed-off-by: Mateusz Hoppe --- manifests/manifest.yml | 2 +- opencl/test/unit_test/CMakeLists.txt | 4 +++- opencl/test/unit_test/gen11/ehl/CMakeLists.txt | 2 +- opencl/test/unit_test/gen11/icllp/CMakeLists.txt | 2 +- opencl/test/unit_test/gen11/lkf/CMakeLists.txt | 2 +- opencl/test/unit_test/gen12lp/dg1/CMakeLists.txt | 2 +- opencl/test/unit_test/gen12lp/rkl/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/bxt/CMakeLists.txt | 2 +- opencl/test/unit_test/gen9/cfl/CMakeLists.txt | 2 +- opencl/test/unit_test/gen9/glk/CMakeLists.txt | 2 +- opencl/test/unit_test/gen9/kbl/CMakeLists.txt | 2 +- opencl/test/unit_test/gen9/skl/CMakeLists.txt | 2 +- 14 files changed, 16 insertions(+), 14 deletions(-) diff --git a/manifests/manifest.yml b/manifests/manifest.yml index 4bfb83dc0c..bb7cf9ea61 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -19,7 +19,7 @@ components: internal: branch: master dest_dir: internal - revision: 22ed7b8461c9edf117ce5efe7e52602f30e5a6c6 + revision: 0edabc102242ead4ec9d00228c5c9b1ee392c924 type: git kmdaf: branch: kmdaf diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt index 5354144e60..3884ea40b7 100644 --- a/opencl/test/unit_test/CMakeLists.txt +++ b/opencl/test/unit_test/CMakeLists.txt @@ -39,9 +39,11 @@ endfunction() ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION() link_libraries(${ASAN_LIBS} ${TSAN_LIBS}) -add_custom_target(unit_tests) add_custom_target(prepare_test_kernels) +add_custom_target(copy_test_files_per_product) add_custom_target(run_unit_tests ALL) +add_custom_target(unit_tests) +add_dependencies(unit_tests copy_test_files_per_product) set(IGDRCL_SRCS_tests_local ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt diff --git a/opencl/test/unit_test/gen11/ehl/CMakeLists.txt b/opencl/test/unit_test/gen11/ehl/CMakeLists.txt index d3a75c4b98..cc1fb92df3 100644 --- a/opencl/test/unit_test/gen11/ehl/CMakeLists.txt +++ b/opencl/test/unit_test/gen11/ehl/CMakeLists.txt @@ -13,5 +13,5 @@ if(TESTS_EHL) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_ehl}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_ehl_0 ehl 0) - add_dependencies(unit_tests copy_test_files_ehl_0) + add_dependencies(copy_test_files_per_product copy_test_files_ehl_0) endif() diff --git a/opencl/test/unit_test/gen11/icllp/CMakeLists.txt b/opencl/test/unit_test/gen11/icllp/CMakeLists.txt index 5e9b629ae5..a550a542df 100644 --- a/opencl/test/unit_test/gen11/icllp/CMakeLists.txt +++ b/opencl/test/unit_test/gen11/icllp/CMakeLists.txt @@ -15,5 +15,5 @@ if(TESTS_ICLLP) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_icllp}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_icllp_0 icllp 0) - add_dependencies(unit_tests copy_test_files_icllp_0) + add_dependencies(copy_test_files_per_product copy_test_files_icllp_0) endif() diff --git a/opencl/test/unit_test/gen11/lkf/CMakeLists.txt b/opencl/test/unit_test/gen11/lkf/CMakeLists.txt index 90999623ee..12f16d4a6a 100644 --- a/opencl/test/unit_test/gen11/lkf/CMakeLists.txt +++ b/opencl/test/unit_test/gen11/lkf/CMakeLists.txt @@ -13,5 +13,5 @@ if(TESTS_LKF) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_lkf}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_lkf_0 lkf 0) - add_dependencies(unit_tests copy_test_files_lkf_0) + add_dependencies(copy_test_files_per_product copy_test_files_lkf_0) endif() diff --git a/opencl/test/unit_test/gen12lp/dg1/CMakeLists.txt b/opencl/test/unit_test/gen12lp/dg1/CMakeLists.txt index dc700515f6..46c5cb262c 100644 --- a/opencl/test/unit_test/gen12lp/dg1/CMakeLists.txt +++ b/opencl/test/unit_test/gen12lp/dg1/CMakeLists.txt @@ -16,5 +16,5 @@ if(TESTS_DG1) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_dg1}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_dg1_0 dg1 0) - add_dependencies(unit_tests copy_test_files_dg1_0) + add_dependencies(copy_test_files_per_product copy_test_files_dg1_0) endif() diff --git a/opencl/test/unit_test/gen12lp/rkl/CMakeLists.txt b/opencl/test/unit_test/gen12lp/rkl/CMakeLists.txt index f98ac15687..53c68836e0 100644 --- a/opencl/test/unit_test/gen12lp/rkl/CMakeLists.txt +++ b/opencl/test/unit_test/gen12lp/rkl/CMakeLists.txt @@ -14,5 +14,5 @@ if(TESTS_RKL) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_rkl}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_rkl_0 rkl 0) - add_dependencies(unit_tests copy_test_files_rkl_0) + add_dependencies(copy_test_files_per_product copy_test_files_rkl_0) endif() diff --git a/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt b/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt index a2ada99764..80119faaca 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt +++ b/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt @@ -15,5 +15,5 @@ if(TESTS_TGLLP) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_tgllp}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_tgllp_0 tgllp 0) - add_dependencies(unit_tests copy_test_files_tgllp_0) + add_dependencies(copy_test_files_per_product copy_test_files_tgllp_0) endif() diff --git a/opencl/test/unit_test/gen8/bdw/CMakeLists.txt b/opencl/test/unit_test/gen8/bdw/CMakeLists.txt index bf3fdcd0d1..5ed198a848 100644 --- a/opencl/test/unit_test/gen8/bdw/CMakeLists.txt +++ b/opencl/test/unit_test/gen8/bdw/CMakeLists.txt @@ -14,5 +14,5 @@ if(TESTS_BDW) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen8_bdw}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_bdw_0 bdw 0) - add_dependencies(unit_tests copy_test_files_bdw_0) + add_dependencies(copy_test_files_per_product copy_test_files_bdw_0) endif() diff --git a/opencl/test/unit_test/gen9/bxt/CMakeLists.txt b/opencl/test/unit_test/gen9/bxt/CMakeLists.txt index 12d983eae8..ff8d72486c 100644 --- a/opencl/test/unit_test/gen9/bxt/CMakeLists.txt +++ b/opencl/test/unit_test/gen9/bxt/CMakeLists.txt @@ -14,5 +14,5 @@ if(TESTS_BXT) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_bxt}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_bxt_0 bxt 0) - add_dependencies(unit_tests copy_test_files_bxt_0) + add_dependencies(copy_test_files_per_product copy_test_files_bxt_0) endif() diff --git a/opencl/test/unit_test/gen9/cfl/CMakeLists.txt b/opencl/test/unit_test/gen9/cfl/CMakeLists.txt index 140e4ec7b9..7a6a0ef6d9 100644 --- a/opencl/test/unit_test/gen9/cfl/CMakeLists.txt +++ b/opencl/test/unit_test/gen9/cfl/CMakeLists.txt @@ -13,5 +13,5 @@ if(TESTS_CFL) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_cfl}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_cfl_9 cfl 9) - add_dependencies(unit_tests copy_test_files_cfl_9) + add_dependencies(copy_test_files_per_product copy_test_files_cfl_9) endif() diff --git a/opencl/test/unit_test/gen9/glk/CMakeLists.txt b/opencl/test/unit_test/gen9/glk/CMakeLists.txt index 4d1666a884..9bedf212a9 100644 --- a/opencl/test/unit_test/gen9/glk/CMakeLists.txt +++ b/opencl/test/unit_test/gen9/glk/CMakeLists.txt @@ -13,5 +13,5 @@ if(TESTS_GLK) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_glk}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_glk_0 glk 0) - add_dependencies(unit_tests copy_test_files_glk_0) + add_dependencies(copy_test_files_per_product copy_test_files_glk_0) endif() diff --git a/opencl/test/unit_test/gen9/kbl/CMakeLists.txt b/opencl/test/unit_test/gen9/kbl/CMakeLists.txt index d522c61cfb..9b0f6e729f 100644 --- a/opencl/test/unit_test/gen9/kbl/CMakeLists.txt +++ b/opencl/test/unit_test/gen9/kbl/CMakeLists.txt @@ -13,5 +13,5 @@ if(TESTS_KBL) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_kbl}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_kbl_9 kbl 9) - add_dependencies(unit_tests copy_test_files_kbl_9) + add_dependencies(copy_test_files_per_product copy_test_files_kbl_9) endif() diff --git a/opencl/test/unit_test/gen9/skl/CMakeLists.txt b/opencl/test/unit_test/gen9/skl/CMakeLists.txt index 993b6b20a7..27dcb5d452 100644 --- a/opencl/test/unit_test/gen9/skl/CMakeLists.txt +++ b/opencl/test/unit_test/gen9/skl/CMakeLists.txt @@ -19,5 +19,5 @@ if(TESTS_SKL) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_skl}) add_subdirectories() neo_copy_test_files_with_revision(copy_test_files_skl_9 skl 9) - add_dependencies(unit_tests copy_test_files_skl_9) + add_dependencies(copy_test_files_per_product copy_test_files_skl_9) endif()