Move api tests to single cpp

Change-Id: Ie591e4680cfdeb68f47c7d16b5977bd03202c997

unit_tests/CMakeLists.txt

@@ -99,6 +99,8 @@ endif()
 
 if(NOT MSVC)
   set_source_files_properties(helpers/uint16_sse4_tests.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
+else()
+  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/api/api_tests.cpp PROPERTIES COMPILE_FLAGS -bigobj)
 endif()
 
 target_link_libraries(igdrcl_tests ${NEO_MOCKABLE_LIB_NAME})

unit_tests/api/CMakeLists.txt

@@ -20,110 +20,111 @@
 
 set(IGDRCL_SRCS_tests_api
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/api_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_api_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_api_tests.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_build_program_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_clone_kernel_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_compile_program_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_buffer_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_command_queue_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_command_queue_with_properties_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_context_from_type_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_context_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_image_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_kernel_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_kernels_in_program_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_perf_counters_command_queue_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_pipe_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_program_with_binary_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_program_with_built_in_kernels_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sampler_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sampler_with_properties_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sub_buffer_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sub_devices_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_user_event_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_build_program_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_clone_kernel_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_compile_program_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_command_queue_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_command_queue_with_properties_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_context_from_type_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_context_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_kernel_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_kernels_in_program_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_perf_counters_command_queue_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_pipe_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_program_with_binary_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_program_with_built_in_kernels_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sampler_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sampler_with_properties_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sub_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sub_devices_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_user_event_tests.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_user_event_tests_mt.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_barrier_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_barrier_with_wait_list_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_copy_buffer_rect_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_copy_buffer_to_image_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_copy_image_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_copy_image_to_buffer_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_fill_buffer_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_fill_image_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_image_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_map_buffer_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_map_image_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_marker_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_marker_with_wait_list_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_migrate_mem_objects_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_native_kernel_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_nd_range_kernel_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_read_buffer_rect_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_read_buffer_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_read_image_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_free_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_map_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_mem_fill_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_memcpy_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_migrate_mem_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_unmap_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_task_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_unmap_mem_object_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_wait_for_events_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_write_buffer_rect_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_write_buffer_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_write_image_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_finish_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_flush_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_context_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_device_and_host_timer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_device_ids_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_device_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_event_profiling_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_extension_function_address_for_platform_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_extension_function_address_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_image_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_image_params_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_kernel_arg_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_kernel_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_kernel_sub_group_info_khr_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_kernel_sub_group_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_kernel_work_group_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_mem_object_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_pipe_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_ids_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_barrier_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_barrier_with_wait_list_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_copy_buffer_rect_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_copy_buffer_to_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_copy_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_copy_image_to_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_fill_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_fill_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_map_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_map_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_marker_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_marker_with_wait_list_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_migrate_mem_objects_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_native_kernel_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_nd_range_kernel_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_read_buffer_rect_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_read_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_read_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_free_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_map_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_mem_fill_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_memcpy_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_migrate_mem_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_unmap_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_task_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_unmap_mem_object_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_wait_for_events_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_write_buffer_rect_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_write_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_write_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_finish_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_flush_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_context_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_device_and_host_timer.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_device_ids_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_device_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_event_profiling_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_extension_function_address_for_platform_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_extension_function_address_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_image_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_image_params_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_kernel_arg_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_kernel_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_kernel_sub_group_info_khr_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_kernel_sub_group_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_kernel_work_group_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_mem_object_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_pipe_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_ids_tests.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_ids_tests_mt.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_program_build_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_program_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_supported_image_formats_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_icd_get_platform_ids_khr_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_intel_accelerator_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_intel_motion_estimation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_link_program_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_command_queue_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_context_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_event_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_kernel_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_mem_obj_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_program_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_retain_mem_obj_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_retain_release_command_queue_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_retain_release_context_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_retain_release_device_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_retain_release_sampler_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_default_device_command_queue_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_event_callback_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_kernel_arg_svm_pointer_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_kernel_exec_info_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_mem_object_destructor_callback_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_program_build_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_program_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_supported_image_formats_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_icd_get_platform_ids_khr_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_intel_accelerator_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_intel_motion_estimation.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_link_program_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_command_queue_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_context_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_event_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_kernel_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_mem_obj_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_program_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_retain_mem_obj_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_retain_release_command_queue_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_retain_release_context_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_retain_release_device_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_retain_release_sampler_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_default_device_command_queue_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_event_callback_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_kernel_arg_svm_pointer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_kernel_exec_info_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_mem_object_destructor_callback_tests.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_mem_object_destructor_callback_tests_mt.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_performance_configuration_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_svm_alloc_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_svm_free_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_unload_compiler_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/cl_unload_platform_compiler_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_performance_configuration_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_svm_alloc_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_svm_free_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_unload_compiler_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_unload_platform_compiler_tests.inl
 )
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_api})
 

unit_tests/api/api_tests.cpp

@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2018, Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "unit_tests/api/cl_build_program_tests.inl"
+#include "unit_tests/api/cl_clone_kernel_tests.inl"
+#include "unit_tests/api/cl_compile_program_tests.inl"
+#include "unit_tests/api/cl_create_buffer_tests.inl"
+#include "unit_tests/api/cl_create_command_queue_tests.inl"
+#include "unit_tests/api/cl_create_command_queue_with_properties_tests.inl"
+#include "unit_tests/api/cl_create_context_from_type_tests.inl"
+#include "unit_tests/api/cl_create_context_tests.inl"
+#include "unit_tests/api/cl_create_image_tests.inl"
+#include "unit_tests/api/cl_create_kernel_tests.inl"
+#include "unit_tests/api/cl_create_kernels_in_program_tests.inl"
+#include "unit_tests/api/cl_create_perf_counters_command_queue_tests.inl"
+#include "unit_tests/api/cl_create_pipe_tests.inl"
+#include "unit_tests/api/cl_create_program_with_binary_tests.inl"
+#include "unit_tests/api/cl_create_program_with_built_in_kernels_tests.inl"
+#include "unit_tests/api/cl_create_sampler_tests.inl"
+#include "unit_tests/api/cl_create_sampler_with_properties_tests.inl"
+#include "unit_tests/api/cl_create_sub_buffer_tests.inl"
+#include "unit_tests/api/cl_create_sub_devices_tests.inl"
+#include "unit_tests/api/cl_create_user_event_tests.inl"
+#include "unit_tests/api/cl_enqueue_barrier_tests.inl"
+#include "unit_tests/api/cl_enqueue_barrier_with_wait_list_tests.inl"
+#include "unit_tests/api/cl_enqueue_copy_buffer_rect_tests.inl"
+#include "unit_tests/api/cl_enqueue_copy_buffer_to_image_tests.inl"
+#include "unit_tests/api/cl_enqueue_copy_image_tests.inl"
+#include "unit_tests/api/cl_enqueue_copy_image_to_buffer_tests.inl"
+#include "unit_tests/api/cl_enqueue_fill_buffer_tests.inl"
+#include "unit_tests/api/cl_enqueue_fill_image_tests.inl"
+#include "unit_tests/api/cl_enqueue_image_tests.inl"
+#include "unit_tests/api/cl_enqueue_map_buffer_tests.inl"
+#include "unit_tests/api/cl_enqueue_map_image_tests.inl"
+#include "unit_tests/api/cl_enqueue_marker_tests.inl"
+#include "unit_tests/api/cl_enqueue_marker_with_wait_list_tests.inl"
+#include "unit_tests/api/cl_enqueue_migrate_mem_objects_tests.inl"
+#include "unit_tests/api/cl_enqueue_native_kernel_tests.inl"
+#include "unit_tests/api/cl_enqueue_nd_range_kernel_tests.inl"
+#include "unit_tests/api/cl_enqueue_read_buffer_rect_tests.inl"
+#include "unit_tests/api/cl_enqueue_read_buffer_tests.inl"
+#include "unit_tests/api/cl_enqueue_read_image_tests.inl"
+#include "unit_tests/api/cl_enqueue_svm_free_tests.inl"
+#include "unit_tests/api/cl_enqueue_svm_map_tests.inl"
+#include "unit_tests/api/cl_enqueue_svm_mem_fill_tests.inl"
+#include "unit_tests/api/cl_enqueue_svm_memcpy_tests.inl"
+#include "unit_tests/api/cl_enqueue_svm_migrate_mem_tests.inl"
+#include "unit_tests/api/cl_enqueue_svm_unmap_tests.inl"
+#include "unit_tests/api/cl_enqueue_task_tests.inl"
+#include "unit_tests/api/cl_enqueue_unmap_mem_object_tests.inl"
+#include "unit_tests/api/cl_enqueue_wait_for_events_tests.inl"
+#include "unit_tests/api/cl_enqueue_write_buffer_rect_tests.inl"
+#include "unit_tests/api/cl_enqueue_write_buffer_tests.inl"
+#include "unit_tests/api/cl_enqueue_write_image_tests.inl"
+#include "unit_tests/api/cl_finish_tests.inl"
+#include "unit_tests/api/cl_flush_tests.inl"
+#include "unit_tests/api/cl_get_context_info_tests.inl"
+#include "unit_tests/api/cl_get_device_and_host_timer.inl"
+#include "unit_tests/api/cl_get_device_ids_tests.inl"
+#include "unit_tests/api/cl_get_device_info_tests.inl"
+#include "unit_tests/api/cl_get_event_profiling_info_tests.inl"
+#include "unit_tests/api/cl_get_extension_function_address_for_platform_tests.inl"
+#include "unit_tests/api/cl_get_extension_function_address_tests.inl"
+#include "unit_tests/api/cl_get_image_info_tests.inl"
+#include "unit_tests/api/cl_get_image_params_tests.inl"
+#include "unit_tests/api/cl_get_kernel_arg_info_tests.inl"
+#include "unit_tests/api/cl_get_kernel_info_tests.inl"
+#include "unit_tests/api/cl_get_kernel_sub_group_info_khr_tests.inl"
+#include "unit_tests/api/cl_get_kernel_sub_group_info_tests.inl"
+#include "unit_tests/api/cl_get_kernel_work_group_info_tests.inl"
+#include "unit_tests/api/cl_get_mem_object_info_tests.inl"
+#include "unit_tests/api/cl_get_pipe_info_tests.inl"
+#include "unit_tests/api/cl_get_platform_ids_tests.inl"
+#include "unit_tests/api/cl_get_platform_info_tests.inl"
+#include "unit_tests/api/cl_get_program_build_info_tests.inl"
+#include "unit_tests/api/cl_get_program_info_tests.inl"
+#include "unit_tests/api/cl_get_supported_image_formats_tests.inl"
+#include "unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl"
+#include "unit_tests/api/cl_intel_accelerator_tests.inl"
+#include "unit_tests/api/cl_intel_motion_estimation.inl"
+#include "unit_tests/api/cl_link_program_tests.inl"
+#include "unit_tests/api/cl_release_command_queue_tests.inl"
+#include "unit_tests/api/cl_release_context_tests.inl"
+#include "unit_tests/api/cl_release_event_tests.inl"
+#include "unit_tests/api/cl_release_kernel_tests.inl"
+#include "unit_tests/api/cl_release_mem_obj_tests.inl"
+#include "unit_tests/api/cl_release_program_tests.inl"
+#include "unit_tests/api/cl_retain_mem_obj_tests.inl"
+#include "unit_tests/api/cl_retain_release_command_queue_tests.inl"
+#include "unit_tests/api/cl_retain_release_context_tests.inl"
+#include "unit_tests/api/cl_retain_release_device_tests.inl"
+#include "unit_tests/api/cl_retain_release_sampler_tests.inl"
+#include "unit_tests/api/cl_set_default_device_command_queue_tests.inl"
+#include "unit_tests/api/cl_set_event_callback_tests.inl"
+#include "unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl"
+#include "unit_tests/api/cl_set_kernel_exec_info_tests.inl"
+#include "unit_tests/api/cl_set_mem_object_destructor_callback_tests.inl"
+#include "unit_tests/api/cl_set_performance_configuration_tests.inl"
+#include "unit_tests/api/cl_svm_alloc_tests.inl"
+#include "unit_tests/api/cl_svm_free_tests.inl"
+#include "unit_tests/api/cl_unload_compiler_tests.inl"
+#include "unit_tests/api/cl_unload_platform_compiler_tests.inl"

unit_tests/api/cl_create_buffer_tests.inl

@@ -33,7 +33,7 @@ using namespace OCLRT;
 
 typedef api_tests clCreateBufferTests;
 
-namespace ULT {
+namespace ClCreateBufferTests {
 
 class clCreateBufferTemplateTests : public api_fixture,
                                     public testing::TestWithParam<uint64_t> {
@@ -244,4 +244,4 @@ TEST_F(clCreateBufferTestsWithRestrictions, givenMemoryManagerRestrictionsWhenMi
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
-} // namespace ULT
+} // namespace ClCreateBufferTests

unit_tests/api/cl_create_context_from_type_tests.inl

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017, Intel Corporation
+* Copyright (c) 2017 - 2018, Intel Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_create_context_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,7 +27,7 @@ using namespace OCLRT;
 
 typedef api_tests clCreateContextTests;
 
-namespace ULT {
+namespace ClCreateContextTests {
 static int cbInvoked = 0;
 void CL_CALLBACK eventCallBack(const char *, const void *,
                                size_t, void *) {
@@ -102,4 +102,4 @@ TEST_F(clCreateContextTests, givenInvalidContextCreationPropertiesThenContextCre
     EXPECT_EQ(nullptr, context);
 }
 
-} // namespace ULT
+} // namespace ClCreateContextTests

unit_tests/api/cl_create_image_tests.inl

@@ -27,7 +27,7 @@
 
 using namespace OCLRT;
 
-namespace ULT {
+namespace ClCreateImageTests {
 
 template <typename T>
 struct clCreateImageTests : public api_fixture,
@@ -871,4 +871,4 @@ TEST_P(clCreateNon2dImageFromImageTest, givenImage2dWhenCreateImageFromNon2dImag
 INSTANTIATE_TEST_CASE_P(clCreateNon2dImageFromImageTests,
                         clCreateNon2dImageFromImageTest,
                         ::testing::ValuesIn(non2dImageTypes));
-} // namespace ULT
+} // namespace ClCreateImageTests

unit_tests/api/cl_create_perf_counters_command_queue_tests.inl

@@ -1,24 +1,24 @@
 /*
- * Copyright (c) 2017, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
+* Copyright (c) 2017 - 2018, Intel Corporation
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+* OTHER DEALINGS IN THE SOFTWARE.
+*/
 
 #include "cl_api_tests.h"
 #include "runtime/context/context.h"

unit_tests/api/cl_create_pipe_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,7 +29,7 @@ using namespace OCLRT;
 
 typedef api_tests clCreatePipeTests;
 
-namespace ULT {
+namespace ClCreatePipeTests {
 
 class clCreatePipeWithParamTests : public api_fixture, public testing::TestWithParam<uint64_t> {
     void SetUp() override {
@@ -175,4 +175,4 @@ TEST_F(clCreatePipeTests, PipeInvalidContext) {
 
     delete pipe;
 }
-} // namespace ULT
+} // namespace ClCreatePipeTests

unit_tests/api/cl_create_sampler_tests.cpp

@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2017, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "cl_api_tests.h"
-#include "runtime/context/context.h"
-
-using namespace OCLRT;
-
-typedef api_tests clCreateSamplerTests;
-
-namespace ULT {
-
-TEST_F(clCreateSamplerTests, returnsSuccess) {
-    auto sampler = clCreateSampler(
-        pContext,
-        CL_TRUE,
-        CL_ADDRESS_CLAMP,
-        CL_FILTER_NEAREST,
-        &retVal);
-    EXPECT_EQ(CL_SUCCESS, retVal);
-    EXPECT_NE(nullptr, sampler);
-
-    retVal = clReleaseSampler(sampler);
-    EXPECT_EQ(CL_SUCCESS, retVal);
-}
-
-TEST_F(clCreateSamplerTests, noRet) {
-    auto sampler = clCreateSampler(
-        pContext,
-        CL_TRUE,
-        CL_ADDRESS_CLAMP,
-        CL_FILTER_NEAREST,
-        nullptr);
-    EXPECT_NE(nullptr, sampler);
-
-    retVal = clReleaseSampler(sampler);
-    EXPECT_EQ(CL_SUCCESS, retVal);
-}
-
-TEST_F(clCreateSamplerTests, nullContextReturnsError) {
-    auto sampler = clCreateSampler(
-        nullptr,
-        CL_FALSE,
-        CL_ADDRESS_CLAMP_TO_EDGE,
-        CL_FILTER_LINEAR,
-        &retVal);
-    EXPECT_EQ(CL_INVALID_CONTEXT, retVal);
-    EXPECT_EQ(nullptr, sampler);
-    delete sampler;
-}
-} // namespace ULT

unit_tests/api/cl_create_sampler_tests.inl

@@ -0,0 +1,70 @@
+/*
+* Copyright (c) 2017 - 2018, Intel Corporation
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+* OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include "cl_api_tests.h"
+#include "runtime/context/context.h"
+
+using namespace OCLRT;
+
+typedef api_tests clCreateSamplerTests;
+
+namespace ULT {
+
+TEST_F(clCreateSamplerTests, returnsSuccess) {
+    auto sampler = clCreateSampler(
+        pContext,
+        CL_TRUE,
+        CL_ADDRESS_CLAMP,
+        CL_FILTER_NEAREST,
+        &retVal);
+    EXPECT_EQ(CL_SUCCESS, retVal);
+    EXPECT_NE(nullptr, sampler);
+
+    retVal = clReleaseSampler(sampler);
+    EXPECT_EQ(CL_SUCCESS, retVal);
+}
+
+TEST_F(clCreateSamplerTests, noRet) {
+    auto sampler = clCreateSampler(
+        pContext,
+        CL_TRUE,
+        CL_ADDRESS_CLAMP,
+        CL_FILTER_NEAREST,
+        nullptr);
+    EXPECT_NE(nullptr, sampler);
+
+    retVal = clReleaseSampler(sampler);
+    EXPECT_EQ(CL_SUCCESS, retVal);
+}
+
+TEST_F(clCreateSamplerTests, nullContextReturnsError) {
+    auto sampler = clCreateSampler(
+        nullptr,
+        CL_FALSE,
+        CL_ADDRESS_CLAMP_TO_EDGE,
+        CL_FILTER_LINEAR,
+        &retVal);
+    EXPECT_EQ(CL_INVALID_CONTEXT, retVal);
+    EXPECT_EQ(nullptr, sampler);
+    delete sampler;
+}
+} // namespace ULT

unit_tests/api/cl_create_sub_buffer_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,7 @@
 
 using namespace OCLRT;
 
-namespace ULT {
+namespace ClCreateSubbufferTests {
 
 template <bool hasHostPtr, cl_mem_flags parentFlags>
 class clCreateSubBufferTemplateTests : public api_fixture,
@@ -225,4 +225,4 @@ TEST_F(clCreateSubBufferTests, inheritFlags) {
 
     clReleaseMemObject(subBuffer);
 }
-} // namespace ULT
+} // namespace ClCreateSubbufferTests

unit_tests/api/cl_create_sub_devices_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_create_user_event_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_barrier_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_barrier_with_wait_list_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_copy_buffer_rect_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_copy_image_to_buffer_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 -2018, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_fill_buffer_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_fill_image_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_marker_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_marker_with_wait_list_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_migrate_mem_objects_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_nd_range_kernel_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_read_buffer_rect_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_read_buffer_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_task_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_unmap_mem_object_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_write_buffer_rect_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_enqueue_write_buffer_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_finish_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_flush_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_context_info_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_device_ids_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_device_info_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_extension_function_address_for_platform_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_extension_function_address_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_image_params_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_kernel_arg_info_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_kernel_info_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_kernel_sub_group_info_khr_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_kernel_sub_group_info_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_kernel_work_group_info_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_mem_object_info_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_pipe_info_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_get_program_info_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_intel_accelerator_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_intel_motion_estimation.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_release_command_queue_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
+
 #include "cl_api_tests.h"
 #include "runtime/context/context.h"
 #include "unit_tests/fixtures/device_host_queue_fixture.h"

unit_tests/api/cl_release_context_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_release_event_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,6 +26,8 @@
 #include "test.h"
 
 using namespace OCLRT;
+
+namespace ClReleaseEventTests {
 template <typename T>
 class EventFixture : public api_fixture, public T {
   public:
@@ -162,3 +164,4 @@ INSTANTIATE_TEST_CASE_P(SetInvalidStatus,
                         ::testing::Combine(
                             ::testing::ValuesIn(invalidStatus),
                             ::testing::ValuesIn(expectInvalidStatus)));
+} // namespace ClReleaseEventTests

unit_tests/api/cl_release_mem_obj_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_release_program_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_retain_release_command_queue_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_retain_release_context_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_retain_release_device_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_retain_release_sampler_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_set_default_device_command_queue_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_set_event_callback_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,7 @@
 #include "unit_tests/helpers/debug_manager_state_restore.h"
 using namespace OCLRT;
 
-namespace ULT {
+namespace ClSetEventCallbackTests {
 
 static int cbInvoked = 0;
 static void *cbData = nullptr;
@@ -189,4 +189,4 @@ TEST_F(clSetEventCallback_, UserDataPassed) {
 
     delete event;
 }
-} // namespace ULT
+} // namespace ClSetEventCallbackTests

unit_tests/api/cl_set_mem_object_destructor_callback_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_set_performance_configuration_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

unit_tests/api/cl_svm_alloc_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),