Add ocl to filenames with excludes for opencl unit tests

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

opencl/test/unit_test/gen11/ehl/CMakeLists.txt

@@ -1,11 +1,16 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_EHL)
+  set(IGDRCL_SRCS_tests_gen11_ehl_excludes
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_ehl.cpp
+  )
+  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen11_ehl_excludes})
   set(IGDRCL_SRCS_tests_gen11_ehl
+      ${IGDRCL_SRCS_tests_gen11_ehl_excludes}
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_ehl.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_ehl.cpp

opencl/test/unit_test/gen11/ehl/excludes_ocl_ehl.cpp

@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2022 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/test/common/test_macros/test.h"
+
+HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ELKHARTLAKE);

opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -62,5 +62,3 @@ EHLTEST_F(EhlHwInfo, givenBoolWhenCallEhlHardwareInfoSetupThenFeatureTableAndWor
         EXPECT_EQ(setParamBool, workaroundTable.flags.waReportPerfCountUseGlobalContextID);
     }
 }
-
-HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ELKHARTLAKE);

opencl/test/unit_test/gen11/icllp/CMakeLists.txt

@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2019-2021 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_ICLLP)
   set(IGDRCL_SRCS_tests_gen11_icllp_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_icllp.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_icllp.cpp
   )
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen11_icllp_excludes})
 

opencl/test/unit_test/gen11/icllp/excludes_ocl_icllp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

opencl/test/unit_test/gen12lp/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 if(TESTS_GEN12LP)
   set(IGDRCL_SRCS_tests_gen12lp_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_gen12lp.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_gen12lp.cpp
   )
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_excludes})
 

opencl/test/unit_test/gen12lp/adlp/CMakeLists.txt

@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_ADLP)
   set(IGDRCL_SRCS_tests_gen12lp_adlp_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_adlp.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_adlp.cpp
   )
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_adlp_excludes})
 

opencl/test/unit_test/gen12lp/adlp/excludes_ocl_adlp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

opencl/test/unit_test/gen12lp/adls/CMakeLists.txt

@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2020-2021 Intel Corporation
+# Copyright (C) 2020-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_ADLS)
   set(IGDRCL_SRCS_tests_gen12lp_adls_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_adls.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_adls.cpp
   )
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_adls_excludes})
 

opencl/test/unit_test/gen12lp/adls/excludes_ocl_adls.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

opencl/test/unit_test/gen12lp/dg1/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 if(TESTS_DG1)
   set(IGDRCL_SRCS_tests_gen12lp_dg1_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_dg1.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_dg1.cpp
   )
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_dg1_excludes})
 

opencl/test/unit_test/gen12lp/dg1/excludes_ocl_dg1.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

opencl/test/unit_test/gen12lp/excludes_ocl_gen12lp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

opencl/test/unit_test/gen12lp/rkl/CMakeLists.txt

@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2020-2021 Intel Corporation
+# Copyright (C) 2020-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_RKL)
   set(IGDRCL_SRCS_tests_gen12lp_rkl_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_rkl.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_rkl.cpp
   )
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_rkl_excludes})
 

opencl/test/unit_test/gen12lp/rkl/excludes_ocl_rkl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt

@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2019-2021 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_TGLLP)
   set(IGDRCL_SRCS_tests_gen12lp_tgllp_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_tgllp.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_tgllp.cpp
   )
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_tgllp_excludes})
 

opencl/test/unit_test/gen12lp/tgllp/excludes_ocl_tgllp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

opencl/test/unit_test/xe_hp_core/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 if(TESTS_XE_HP_CORE)
   set(IGDRCL_SRCS_tests_xe_hp_core_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hp_core.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_xe_hp_core.cpp
   )
 
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hp_core_excludes})

opencl/test/unit_test/xe_hpc_core/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 if(TESTS_XE_HPC_CORE)
   set(IGDRCL_SRCS_tests_xe_hpc_core_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpc_core.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_xe_hpc_core.cpp
   )
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpc_core_excludes})
 

opencl/test/unit_test/xe_hpg_core/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 if(TESTS_XE_HPG_CORE)
   set(IGDRCL_SRCS_tests_xe_hpg_core_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_xe_hpg_core.cpp
   )
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpg_core_excludes})
 

opencl/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 if(TESTS_DG2)
   set(IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_dg2.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_dg2.cpp
   )
   set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes})