From c0a8522eb1c37b9f2dcd0d9832180e020dcd6dc4 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Tue, 20 Mar 2018 10:58:28 +0100 Subject: [PATCH] Cmake refactor part 19 - create new object library igdrcl_libult_env - move sources shared between igdrcl_tests, igdrcl_aub_tests and igdrcl_mt_tests to igdrcl_libult_env - partially cleanup unit_tests/mt_tests/CMakeLists.txt Change-Id: I4f4bbfa5649d84d79133b9d5c9bd137c68b7d82e --- unit_tests/CMakeLists.txt | 9 +-- unit_tests/aub_tests/CMakeLists.txt | 26 +-------- unit_tests/command_queue/CMakeLists.txt | 2 - unit_tests/fixtures/CMakeLists.txt | 10 ---- unit_tests/helpers/CMakeLists.txt | 4 -- unit_tests/indirect_heap/CMakeLists.txt | 2 - unit_tests/libult/CMakeLists.txt | 57 ++++++++++++++++++- unit_tests/mt_tests/CMakeLists.txt | 54 ++++-------------- .../mt_tests/command_queue/CMakeLists.txt | 22 +++---- unit_tests/mt_tests/fixtures/CMakeLists.txt | 19 +++---- unit_tests/mt_tests/helpers/CMakeLists.txt | 18 +++--- .../mt_tests/indirect_heap/CMakeLists.txt | 27 --------- .../mt_tests/os_interface/CMakeLists.txt | 39 ------------- unit_tests/os_interface/linux/CMakeLists.txt | 1 - .../os_interface/windows/CMakeLists.txt | 4 -- 15 files changed, 97 insertions(+), 197 deletions(-) delete mode 100644 unit_tests/mt_tests/indirect_heap/CMakeLists.txt delete mode 100644 unit_tests/mt_tests/os_interface/CMakeLists.txt diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt index af114c1f2e..7e1fbceb50 100644 --- a/unit_tests/CMakeLists.txt +++ b/unit_tests/CMakeLists.txt @@ -28,14 +28,6 @@ add_custom_target(run_unit_tests ALL) set(IGDRCL_SRCS_tests_local ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/base_object_allocator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/custom_event_listener.h - ${CMAKE_CURRENT_SOURCE_DIR}/global_environment.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/global_environment.h - ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/memory_leak_listener.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/memory_leak_listener.h - ${CMAKE_CURRENT_SOURCE_DIR}/options.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ult_configuration.cpp ) @@ -68,6 +60,7 @@ endif() set(NEO_IGDRCL_TESTS__TARGET_OBJECTS $ $ + $ $ $ $ diff --git a/unit_tests/aub_tests/CMakeLists.txt b/unit_tests/aub_tests/CMakeLists.txt index 4a7624fa89..b02ef8c896 100644 --- a/unit_tests/aub_tests/CMakeLists.txt +++ b/unit_tests/aub_tests/CMakeLists.txt @@ -23,12 +23,12 @@ project(igdrcl_aub_tests) include(${CMAKE_CURRENT_SOURCE_DIR}/common.cmake) add_executable(igdrcl_aub_tests - ${IGDRCL_SOURCE_DIR}/unit_tests/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp $ $ $ $ + $ ) set_target_properties(igdrcl_aub_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER}) @@ -37,8 +37,8 @@ add_custom_target(run_aub_tests) set_target_properties(run_aub_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER}) target_include_directories(igdrcl_aub_tests PRIVATE - ${GTEST_INCLUDE_DIR} - ${GMOCK_INCLUDE_DIR} + ${GTEST_INCLUDE_DIR} + ${GMOCK_INCLUDE_DIR} ) if(WIN32) @@ -48,33 +48,13 @@ if(WIN32) endif() target_sources(igdrcl_aub_tests PRIVATE - ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/base_object_allocator.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/memory_leak_listener.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp ) if(WIN32) target_sources(igdrcl_aub_tests PRIVATE - ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/options.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp ) -else() - target_sources(igdrcl_aub_tests PRIVATE - ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp - ) endif() add_subdirectories() diff --git a/unit_tests/command_queue/CMakeLists.txt b/unit_tests/command_queue/CMakeLists.txt index 94f7ef407a..651bace66a 100644 --- a/unit_tests/command_queue/CMakeLists.txt +++ b/unit_tests/command_queue/CMakeLists.txt @@ -22,8 +22,6 @@ set(IGDRCL_SRCS_tests_command_queue ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/buffer_operations_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/buffer_operations_withAsyncGPU_fixture.h - ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_fixture.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_flush_waitlist_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_tests.cpp diff --git a/unit_tests/fixtures/CMakeLists.txt b/unit_tests/fixtures/CMakeLists.txt index 51546463c0..9807bb9639 100644 --- a/unit_tests/fixtures/CMakeLists.txt +++ b/unit_tests/fixtures/CMakeLists.txt @@ -20,14 +20,8 @@ set(IGDRCL_SRCS_tests_fixtures ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/buffer_fixture.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/buffer_fixture.h - ${CMAKE_CURRENT_SOURCE_DIR}/built_in_fixture.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/built_in_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/context_fixture.cpp ${CMAKE_CURRENT_SOURCE_DIR}/context_fixture.h - ${CMAKE_CURRENT_SOURCE_DIR}/device_fixture.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/device_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/device_host_queue_fixture.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device_host_queue_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/execution_model_fixture.h @@ -41,16 +35,12 @@ set(IGDRCL_SRCS_tests_fixtures ${CMAKE_CURRENT_SOURCE_DIR}/kernel_data_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/media_kernel_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/memory_allocator_fixture.h - ${CMAKE_CURRENT_SOURCE_DIR}/memory_management_fixture.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/memory_management_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_fixture.cpp ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/platform_fixture.cpp ${CMAKE_CURRENT_SOURCE_DIR}/platform_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/preemption_fixture.cpp ${CMAKE_CURRENT_SOURCE_DIR}/preemption_fixture.h - ${CMAKE_CURRENT_SOURCE_DIR}/program_fixture.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/program_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/run_kernel_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/scenario_test_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/simple_arg_fixture.h diff --git a/unit_tests/helpers/CMakeLists.txt b/unit_tests/helpers/CMakeLists.txt index 9dd494c5b0..fec89f23af 100644 --- a/unit_tests/helpers/CMakeLists.txt +++ b/unit_tests/helpers/CMakeLists.txt @@ -38,8 +38,6 @@ set(IGDRCL_SRCS_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.h ${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.h - ${CMAKE_CURRENT_SOURCE_DIR}/kernel_binary_helper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/kernel_binary_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/kernel_commands_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/memory_management_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mipmap_tests.cpp @@ -50,8 +48,6 @@ set(IGDRCL_SRCS_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}/string_to_hash_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/string_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/task_information_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_files.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_files.h ${CMAKE_CURRENT_SOURCE_DIR}/TestDebugVariables.inl ${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/validator_tests.cpp diff --git a/unit_tests/indirect_heap/CMakeLists.txt b/unit_tests/indirect_heap/CMakeLists.txt index 2893f49b29..cc9dd9b839 100644 --- a/unit_tests/indirect_heap/CMakeLists.txt +++ b/unit_tests/indirect_heap/CMakeLists.txt @@ -20,8 +20,6 @@ set(IGDRCL_SRCS_tests_indirect_heap ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap_fixture.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap_tests.cpp ) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_indirect_heap}) diff --git a/unit_tests/libult/CMakeLists.txt b/unit_tests/libult/CMakeLists.txt index 68290287c5..cbcec59e89 100644 --- a/unit_tests/libult/CMakeLists.txt +++ b/unit_tests/libult/CMakeLists.txt @@ -72,7 +72,62 @@ target_include_directories(igdrcl_libult PRIVATE ${GTEST_INCLUDE_DIR} ) -foreach(target_name igdrcl_libult igdrcl_libult_cs) +set(IGDRCL_SRCS_LIB_ULT_ENV + ${IGDRCL_SOURCE_DIR}/unit_tests/base_object_allocator.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/custom_event_listener.h + ${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.h + ${IGDRCL_SOURCE_DIR}/unit_tests/main.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/memory_leak_listener.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/memory_leak_listener.h + ${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.h + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.h + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.h + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.h + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.h + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.h + ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.h + ${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.h + ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.h +) +add_library (igdrcl_libult_env OBJECT + ${IGDRCL_SRCS_LIB_ULT_ENV} +) + +set(IGDRCL_SRCS_LIB_ULT_ENV_WINDOWS + ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/options.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.h + ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp +) + +set(IGDRCL_SRCS_LIB_ULT_ENV_LINUX + ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp +) + +if(WIN32) + target_sources(igdrcl_libult_env PRIVATE ${IGDRCL_SRCS_LIB_ULT_ENV_WINDOWS}) +else() + target_sources(igdrcl_libult_env PRIVATE ${IGDRCL_SRCS_LIB_ULT_ENV_LINUX}) +endif() + +target_include_directories(igdrcl_libult_env PRIVATE + ${GTEST_INCLUDE_DIR} + ${GMOCK_INCLUDE_DIR} + ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX} +) + +foreach(target_name igdrcl_libult igdrcl_libult_cs igdrcl_libult_env) set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${target_name} PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER}) set_property(TARGET ${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) diff --git a/unit_tests/mt_tests/CMakeLists.txt b/unit_tests/mt_tests/CMakeLists.txt index 402f9b1bd0..54374a8812 100644 --- a/unit_tests/mt_tests/CMakeLists.txt +++ b/unit_tests/mt_tests/CMakeLists.txt @@ -18,68 +18,35 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR) - project(igdrcl_mt_tests) -add_subdirectory(api) -add_subdirectory(command_queue) -add_subdirectory(device_queue) -add_subdirectory(event) -add_subdirectory(fixtures) -add_subdirectory(helpers) -add_subdirectory(indirect_heap) -add_subdirectory(memory_manager) -add_subdirectory(os_interface) -add_subdirectory(platform) -add_subdirectory(utilities) - -set(IGDRCL_SRCS_mt_tests_local - #local files +add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - #necessary dependencies from igdrcl_tests - ${IGDRCL_SOURCE_DIR}/unit_tests/base_object_allocator.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/main.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/memory_leak_listener.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/ult_configuration.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.cpp + + $ + $ + $ + $ ) +add_subdirectories() + # Setting up our local list of test files -set(IGDRCL_SRCS_mt_tests - ${IGDRCL_SRCS_gtest} +target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_api} - ${IGDRCL_SRCS_mt_tests_command_queue} ${IGDRCL_SRCS_mt_tests_device_queue} ${IGDRCL_SRCS_mt_tests_event} - ${IGDRCL_SRCS_mt_tests_fixtures} - ${IGDRCL_SRCS_mt_tests_helpers} - ${IGDRCL_SRCS_mt_tests_indirect_heap} - ${IGDRCL_SRCS_mt_tests_local} ${IGDRCL_SRCS_mt_tests_memory_manager} - ${IGDRCL_SRCS_mt_tests_os_interface} ${IGDRCL_SRCS_mt_tests_platform} ${IGDRCL_SRCS_mt_tests_utilities} ) -if(MSVC) - list(APPEND IGDRCL_SRCS_mt_tests - ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp - ) -endif(MSVC) - #these tests fail because of data race, set '*' after fix problem set(GTEST_FILTER "-AsyncGPUoperations.MapBufferAfterWriteBuffer") MESSAGE(STATUS "GTest filter for mt tests:" ${GTEST_FILTER} ) -add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL - ${IGDRCL_SRCS_mt_tests} - $ - $ - $ -) target_link_libraries(igdrcl_mt_tests ${TSAN_LIB}) target_link_libraries(igdrcl_mt_tests ${NEO_MOCKABLE_LIB_NAME}) target_link_libraries(igdrcl_mt_tests gtest gmock) @@ -102,7 +69,6 @@ if(MSVC) ${WDK_INCLUDE_PATHS} ${GMM_INCLUDE_PATHS} ${UMKM_SHAREDDATA_INCLUDE_PATHS} - ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX} ) target_link_libraries (igdrcl_mt_tests Ws2_32.lib) else() diff --git a/unit_tests/mt_tests/command_queue/CMakeLists.txt b/unit_tests/mt_tests/command_queue/CMakeLists.txt index 3f7b182d6c..3393e67031 100644 --- a/unit_tests/mt_tests/command_queue/CMakeLists.txt +++ b/unit_tests/mt_tests/command_queue/CMakeLists.txt @@ -1,4 +1,4 @@ -# 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,14 +19,14 @@ # OTHER DEALINGS IN THE SOFTWARE. set(IGDRCL_SRCS_mt_tests_command_queue - #local files - "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt" - #necessary dependencies from igdrcl_tests - "${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_kernel_mt_tests.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_fixture.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/ooq_task_tests_mt.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/ioq_task_tests_mt.cpp" - PARENT_SCOPE + # local files + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + + # necessary dependencies from igdrcl_tests + ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_kernel_mt_tests.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_fixture.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/ooq_task_tests_mt.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/ioq_task_tests_mt.cpp ) +target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_command_queue}) diff --git a/unit_tests/mt_tests/fixtures/CMakeLists.txt b/unit_tests/mt_tests/fixtures/CMakeLists.txt index 5ffc97b692..5998be35a6 100644 --- a/unit_tests/mt_tests/fixtures/CMakeLists.txt +++ b/unit_tests/mt_tests/fixtures/CMakeLists.txt @@ -1,4 +1,4 @@ -# 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,14 +19,11 @@ # OTHER DEALINGS IN THE SOFTWARE. set(IGDRCL_SRCS_mt_tests_fixtures - #local files - "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt" - #necessary dependencies from igdrcl_tests - "${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/image_fixture.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/platform_fixture.cpp" - PARENT_SCOPE + # local files + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + + # necessary dependencies from igdrcl_tests + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/image_fixture.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/platform_fixture.cpp ) +target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_fixtures}) diff --git a/unit_tests/mt_tests/helpers/CMakeLists.txt b/unit_tests/mt_tests/helpers/CMakeLists.txt index 3ffd32ab13..4b47e28a43 100644 --- a/unit_tests/mt_tests/helpers/CMakeLists.txt +++ b/unit_tests/mt_tests/helpers/CMakeLists.txt @@ -1,4 +1,4 @@ -# 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,13 +19,11 @@ # OTHER DEALINGS IN THE SOFTWARE. set(IGDRCL_SRCS_mt_tests_helpers - #local files - "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt" - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_helper_mt_tests.cpp - #necessary dependencies from igdrcl_tests - "${IGDRCL_SOURCE_DIR}/unit_tests/helpers/base_object_tests_mt.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.h" - "${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.cpp" - "${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.cpp" - PARENT_SCOPE + # local files + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_helper_mt_tests.cpp + + # necessary dependencies from igdrcl_tests + ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/base_object_tests_mt.cpp ) +target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_helpers}) diff --git a/unit_tests/mt_tests/indirect_heap/CMakeLists.txt b/unit_tests/mt_tests/indirect_heap/CMakeLists.txt deleted file mode 100644 index 78aa13e686..0000000000 --- a/unit_tests/mt_tests/indirect_heap/CMakeLists.txt +++ /dev/null @@ -1,27 +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. - -set(IGDRCL_SRCS_mt_tests_indirect_heap - #local files - "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt" - #necessary dependencies from igdrcl_tests - "${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.cpp" - PARENT_SCOPE -) diff --git a/unit_tests/mt_tests/os_interface/CMakeLists.txt b/unit_tests/mt_tests/os_interface/CMakeLists.txt deleted file mode 100644 index 1ba5ada433..0000000000 --- a/unit_tests/mt_tests/os_interface/CMakeLists.txt +++ /dev/null @@ -1,39 +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. - -if(MSVC) -set(IGDRCL_SRCS_mt_tests_os_interface_windows - #necessary dependencies from igdrcl_tests - "${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/options.cpp" -) -elseif(UNIX) -set(IGDRCL_SRCS_mt_tests_os_interface_linux - #necessary dependencies from igdrcl_tests - "${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp" -) -endif() - -set(IGDRCL_SRCS_mt_tests_os_interface - #local files - "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt" - "${IGDRCL_SRCS_mt_tests_os_interface_linux}" - "${IGDRCL_SRCS_mt_tests_os_interface_windows}" - PARENT_SCOPE -) diff --git a/unit_tests/os_interface/linux/CMakeLists.txt b/unit_tests/os_interface/linux/CMakeLists.txt index aa1ea6cf5e..2fb8834758 100644 --- a/unit_tests/os_interface/linux/CMakeLists.txt +++ b/unit_tests/os_interface/linux/CMakeLists.txt @@ -39,7 +39,6 @@ set(IGDRCL_SRCS_tests_os_interface_linux ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_time_linux.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_linux.h - ${CMAKE_CURRENT_SOURCE_DIR}/options.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_time_test.cpp ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux_tests.cpp diff --git a/unit_tests/os_interface/windows/CMakeLists.txt b/unit_tests/os_interface/windows/CMakeLists.txt index 223e3431e6..3f606558ed 100644 --- a/unit_tests/os_interface/windows/CMakeLists.txt +++ b/unit_tests/os_interface/windows/CMakeLists.txt @@ -31,16 +31,12 @@ set(IGDRCL_SRCS_tests_os_interface_windows ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_memory_manager.h - ${CMAKE_CURRENT_SOURCE_DIR}/options.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.h ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/self_lib_win.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ult_dxgi_factory.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ult_dxgi_factory.h - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_create.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/wddm_kmdaf_listener_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager_tests.cpp