Reorganization directory structure [4/n]

Change-Id: Ib868ed62d12ea8f9f123644219ba299e86a658ac

CMakeLists.txt

@@ -114,6 +114,11 @@ if(NOT DEFINED NEO_CORE_DIRECTORY)
   set(NEO_CORE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/source)
 endif()
 
+# Set the core source directory
+if(NOT DEFINED NEO_CORE_TEST_DIRECTORY)
+  set(NEO_CORE_TEST_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/test)
+endif()
+
 if(SKIP_UNIT_TESTS)
   set(SKIP_NEO_UNIT_TESTS TRUE)
 endif()
@@ -780,7 +785,7 @@ endif()
 
 # Project-wide include paths
 # Please keep alphabetical order
-include_directories(shared/source/unit_tests)
+include_directories(shared/test/unit_test)
 include_directories(${NEO_BUILD_DIR})
 include_directories(${NEO_SOURCE_DIR})
 include_directories(${NEO_CORE_DIRECTORY}/command_stream/definitions${BRANCH_DIR_SUFFIX})
@@ -829,6 +834,7 @@ else()
     endif()
 endif()
 add_subdirectory_unique(shared/source)
+add_subdirectory_unique(shared/test/unit_test)
 
 macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
     set(NEO_STATIC_LIB_NAME ${LIB_NAME})

manifests/manifest.yml

@@ -14,7 +14,7 @@ components:
   infra:
     branch: infra
     dest_dir: infra
-    revision: ecf3373fbbf3e722a8aa9ce9d3e7c72ce6e219ab
+    revision: c0676b1b2eebded32d1c49a1545e096534012a5d
     type: git
   internal:
     branch: master

opencl/test/unit_test/CMakeLists.txt

@@ -199,7 +199,7 @@ set_target_properties(unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 set_target_properties(prepare_test_kernels PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 set_target_properties(run_unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 
-target_include_directories(igdrcl_tests BEFORE PRIVATE ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX})
+target_include_directories(igdrcl_tests BEFORE PRIVATE ${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX})
 
 if(WIN32)
   set(cloc_cmd_prefix ocloc)

opencl/test/unit_test/aub_tests/CMakeLists.txt

@@ -47,7 +47,7 @@ endif()
 target_include_directories(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_sources(igdrcl_aub_tests PRIVATE
-  ${NEO_CORE_DIRECTORY}/unit_tests/page_fault_manager/default_asan_options.cpp
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/page_fault_manager/default_asan_options.cpp
   ${NEO_CORE_DIRECTORY}/gmm_helper/resource_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
 )
@@ -80,7 +80,7 @@ else()
     ${NEO_CORE_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
   )
 endif()
-target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX})
+target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX})
 
 macro(macro_for_each_test_config)
   if(NOT TARGET ${PLATFORM_IT_LOWER}_aub_tests)

opencl/test/unit_test/gen_common/CMakeLists.txt

@@ -18,7 +18,7 @@ set(IGDRCL_SRCS_tests_gen_common
   ${CMAKE_CURRENT_SOURCE_DIR}/gen_commands_common_validation.h
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/matchers.h
-  ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX}/test.h
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}/test.h
 )
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen_common})
 

opencl/test/unit_test/helpers/CMakeLists.txt

@@ -54,8 +54,8 @@ set(IGDRCL_SRCS_tests_helpers
   ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/validator_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/variable_backup.h
-  ${NEO_CORE_DIRECTORY}/unit_tests/helpers/aligned_memory_tests.cpp
-  ${NEO_CORE_DIRECTORY}/unit_tests/helpers/debug_manager_state_restore.h
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/aligned_memory_tests.cpp
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/debug_manager_state_restore.h
 )
 
 get_property(NEO_CORE_PREAMBLE_TESTS GLOBAL PROPERTY NEO_CORE_PREAMBLE_TESTS)

opencl/test/unit_test/libult/CMakeLists.txt

@@ -6,17 +6,17 @@
 
 macro(macro_for_each_gen)
   list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW
-    ${NEO_CORE_DIRECTORY}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp
-    ${NEO_CORE_DIRECTORY}/unit_tests/libult/${GEN_TYPE_LOWER}.cpp
+    ${NEO_CORE_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp
+    ${NEO_CORE_TEST_DIRECTORY}/unit_test/libult/${GEN_TYPE_LOWER}.cpp
     ${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_hw_info_config_${GEN_TYPE_LOWER}.cpp
     ${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp
     ${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_family_full_core_${GEN_TYPE_LOWER}.cpp
     ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp
   )
 
-  if(EXISTS "${NEO_CORE_DIRECTORY}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
-    list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW "${NEO_CORE_DIRECTORY}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
-    include_directories(${NEO_CORE_DIRECTORY}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/)
+  if(EXISTS "${NEO_CORE_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
+    list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW "${NEO_CORE_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
+    include_directories(${NEO_CORE_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/)
   endif()
 endmacro()
 
@@ -24,7 +24,7 @@ apply_macro_for_each_gen("TESTED")
 
 set(IGDRCL_SRCS_LIB_ULT
   ${NEO_CORE_DIRECTORY}/helpers/allow_deferred_deleter.cpp
-  ${NEO_CORE_DIRECTORY}/unit_tests/utilities/cpuintrinsics.cpp
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
   ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
   ${NEO_SOURCE_DIR}/opencl/source/dll/debugger.cpp
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
@@ -42,10 +42,10 @@ set(IGDRCL_SRCS_LIB_ULT
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_command_stream_receiver.h
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp
-  ${NEO_CORE_DIRECTORY}/unit_tests/helpers/memory_leak_listener.cpp
-  ${NEO_CORE_DIRECTORY}/unit_tests/helpers/memory_leak_listener.h
-  ${NEO_CORE_DIRECTORY}/unit_tests/helpers/memory_management.cpp
-  ${NEO_CORE_DIRECTORY}/unit_tests/helpers/memory_management.h
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/memory_leak_listener.cpp
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/memory_leak_listener.h
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/memory_management.cpp
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/memory_management.h
 )
 
 set(IGDRCL_SRCS_LIB_ULT_WINDOWS

opencl/test/unit_test/linux/CMakeLists.txt

@@ -36,7 +36,7 @@ target_link_libraries(igdrcl_${target_name} ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_
 
 set_property(TARGET igdrcl_${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
 target_include_directories(igdrcl_${target_name} PRIVATE
-  ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
   ${NEO_SOURCE_DIR}/opencl/source/dll/linux/devices${BRANCH_DIR_SUFFIX}
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
   ${CMAKE_CURRENT_SOURCE_DIR}

opencl/test/unit_test/mt_tests/CMakeLists.txt

@@ -79,7 +79,7 @@ function(run_mt_tests target slices subslices eu_per_ss)
   )
 endfunction()
 
-target_include_directories(igdrcl_mt_tests BEFORE PRIVATE ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/source/gen_common)
+target_include_directories(igdrcl_mt_tests BEFORE PRIVATE ${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/source/gen_common)
 
 macro(macro_for_each_test_config)
   run_mt_tests(${PLATFORM_IT_LOWER} ${SLICES} ${SUBSLICES} ${EU_PER_SS})

opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt

@@ -37,7 +37,7 @@ endif()
 target_link_libraries(neo_page_fault_manager_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
 
 target_include_directories(neo_page_fault_manager_tests PRIVATE
-  ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
 )
 

opencl/test/unit_test/windows/CMakeLists.txt

@@ -30,7 +30,7 @@ add_executable(igdrcl_windows_dll_tests
 target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
 
 target_include_directories(igdrcl_windows_dll_tests PRIVATE
-  ${NEO_CORE_DIRECTORY}/unit_tests/test_macros${BRANCH_DIR_SUFFIX}
+  ${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )