Move tests_configuration.h to shared

- add ult configuration to level zero core tests

Change-Id: Ie291395adb607df8c558b924e32ce2cedbce3f93
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>

level_zero/cmake/l0_tests.cmake

@@ -77,6 +77,7 @@ get_property(COMPUTE_RUNTIME_MOCKABLE_INCLUDES
 add_library(compute_runtime_mockable_extra
     STATIC
     EXCLUDE_FROM_ALL
+        ${CMAKE_CURRENT_LIST_DIR}/l0_tests.cmake
         ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
         ${COMPUTE_RUNTIME_DIR}/opencl/source/aub/aub_stream_interface.cpp
         ${COMPUTE_RUNTIME_DIR}/shared/source/debug_settings/debug_settings_manager.cpp
@@ -101,7 +102,6 @@ add_library(compute_runtime_mockable_extra
         ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp
         ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/create_tbx_sockets.cpp
         ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp
-        ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/ult_configuration.cpp
 )
 
 set_property(TARGET compute_runtime_mockable_extra APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})

level_zero/core/test/unit_tests/CMakeLists.txt

@@ -31,7 +31,10 @@ target_sources(${TARGET_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ult_configuration.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/white_box.h
+    ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
 )
 
 target_sources(${TARGET_NAME} PRIVATE

level_zero/core/test/unit_tests/test_mode.h

@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "shared/test/unit_test/tests_configuration.h"
+
+namespace NEO {
+constexpr TestMode defaultTestMode = TestMode::UnitTests;
+} // namespace NEO

level_zero/core/test/unit_tests/ult_configuration.cpp

@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "test_mode.h"
+
+namespace NEO {
+TestMode testMode = defaultTestMode;
+} // namespace NEO

opencl/test/unit_test/CMakeLists.txt

@@ -46,8 +46,8 @@ add_custom_target(run_unit_tests ALL)
 set(IGDRCL_SRCS_tests_local
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/libult/os_interface.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h
   ${CMAKE_CURRENT_SOURCE_DIR}/ult_configuration.cpp
+  ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
 )
 
 if(WIN32)

opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp

@@ -12,12 +12,12 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/unit_test/helpers/memory_management.h"
+#include "shared/test/unit_test/tests_configuration.h"
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/command_stream/tbx_command_stream_receiver.h"
 #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
-#include "opencl/test/unit_test/tests_configuration.h"
 
 #include "gtest/gtest.h"
 

opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h

@@ -8,6 +8,7 @@
 #pragma once
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/unit_test/tests_configuration.h"
 
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 #include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
@@ -17,7 +18,6 @@
 #include "opencl/source/memory_manager/memory_banks.h"
 #include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
-#include "opencl/test/unit_test/tests_configuration.h"
 
 #include <cstdint>
 

opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h

@@ -8,6 +8,7 @@
 #pragma once
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/test/unit_test/tests_configuration.h"
 
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 #include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
@@ -19,7 +20,6 @@
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
-#include "opencl/test/unit_test/tests_configuration.h"
 
 #include <sstream>
 

opencl/test/unit_test/aub_tests/test_mode.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "opencl/test/unit_test/tests_configuration.h"
+#include "shared/test/unit_test/tests_configuration.h"
 
 namespace NEO {
 constexpr TestMode defaultTestMode = TestMode::AubTests;

opencl/test/unit_test/fixtures/mock_aub_center_fixture.h

@@ -9,12 +9,12 @@
 
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/test/unit_test/helpers/default_hw_info.h"
+#include "shared/test/unit_test/tests_configuration.h"
 
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
 #include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
-#include "opencl/test/unit_test/tests_configuration.h"
 
 namespace NEO {
 struct MockAubCenterFixture {

opencl/test/unit_test/libult/create_tbx_sockets.cpp

@@ -5,9 +5,10 @@
  *
  */
 
+#include "shared/test/unit_test/tests_configuration.h"
+
 #include "opencl/source/tbx/tbx_sockets_imp.h"
 #include "opencl/test/unit_test/mocks/mock_tbx_sockets.h"
-#include "opencl/test/unit_test/tests_configuration.h"
 
 namespace NEO {
 TbxSockets *TbxSockets::create() {

opencl/test/unit_test/linux/test_mode.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "opencl/test/unit_test/tests_configuration.h"
+#include "shared/test/unit_test/tests_configuration.h"
 
 namespace NEO {
 constexpr TestMode defaultTestMode = TestMode::NotSpecified;

opencl/test/unit_test/main.cpp

@@ -14,6 +14,7 @@
 #include "shared/test/unit_test/helpers/default_hw_info.inl"
 #include "shared/test/unit_test/helpers/memory_leak_listener.h"
 #include "shared/test/unit_test/helpers/ult_hw_config.inl"
+#include "shared/test/unit_test/tests_configuration.h"
 
 #include "opencl/source/os_interface/ocl_reg_path.h"
 #include "opencl/test/unit_test/custom_event_listener.h"
@@ -23,7 +24,6 @@
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 #include "opencl/test/unit_test/mocks/mock_sip.h"
-#include "opencl/test/unit_test/tests_configuration.h"
 #include "opencl/test/unit_test/ult_config_listener.h"
 
 #include "gmock/gmock.h"

opencl/test/unit_test/mocks/mock_device.cpp

@@ -10,11 +10,11 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/unit_test/tests_configuration.h"
 
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "opencl/test/unit_test/mocks/mock_ostime.h"
-#include "opencl/test/unit_test/tests_configuration.h"
 
 using namespace NEO;
 

opencl/test/unit_test/mt_tests/test_mode.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "opencl/test/unit_test/tests_configuration.h"
+#include "shared/test/unit_test/tests_configuration.h"
 
 namespace NEO {
 constexpr TestMode defaultTestMode = TestMode::UnitTests;

opencl/test/unit_test/test_mode.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "opencl/test/unit_test/tests_configuration.h"
+#include "shared/test/unit_test/tests_configuration.h"
 
 namespace NEO {
 constexpr TestMode defaultTestMode = TestMode::UnitTests;

opencl/test/unit_test/windows/test_mode.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "opencl/test/unit_test/tests_configuration.h"
+#include "shared/test/unit_test/tests_configuration.h"
 
 namespace NEO {
 constexpr TestMode defaultTestMode = TestMode::UnitTests;