Skip to content

Commit c0a8522

Browse files
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
1 parent 5052c07 commit c0a8522

File tree

15 files changed

+97
-197
lines changed

15 files changed

+97
-197
lines changed

unit_tests/CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ add_custom_target(run_unit_tests ALL)
2828

2929
set(IGDRCL_SRCS_tests_local
3030
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
31-
${CMAKE_CURRENT_SOURCE_DIR}/base_object_allocator.cpp
32-
${CMAKE_CURRENT_SOURCE_DIR}/custom_event_listener.h
33-
${CMAKE_CURRENT_SOURCE_DIR}/global_environment.cpp
34-
${CMAKE_CURRENT_SOURCE_DIR}/global_environment.h
35-
${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
36-
${CMAKE_CURRENT_SOURCE_DIR}/memory_leak_listener.cpp
37-
${CMAKE_CURRENT_SOURCE_DIR}/memory_leak_listener.h
38-
${CMAKE_CURRENT_SOURCE_DIR}/options.cpp
3931
${CMAKE_CURRENT_SOURCE_DIR}/ult_configuration.cpp
4032
)
4133

@@ -68,6 +60,7 @@ endif()
6860
set(NEO_IGDRCL_TESTS__TARGET_OBJECTS
6961
$<TARGET_OBJECTS:igdrcl_libult>
7062
$<TARGET_OBJECTS:igdrcl_libult_cs>
63+
$<TARGET_OBJECTS:igdrcl_libult_env>
7164
$<TARGET_OBJECTS:${SHARINGS_ENABLE_LIB_NAME}>
7265
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
7366
$<TARGET_OBJECTS:${BUILTINS_BINARIES_LIB_NAME}>

unit_tests/aub_tests/CMakeLists.txt

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ project(igdrcl_aub_tests)
2323
include(${CMAKE_CURRENT_SOURCE_DIR}/common.cmake)
2424

2525
add_executable(igdrcl_aub_tests
26-
${IGDRCL_SOURCE_DIR}/unit_tests/main.cpp
2726
${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp
2827
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
2928
$<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
3029
$<TARGET_OBJECTS:igdrcl_libult>
3130
$<TARGET_OBJECTS:igdrcl_libult_cs>
31+
$<TARGET_OBJECTS:igdrcl_libult_env>
3232
)
3333

3434
set_target_properties(igdrcl_aub_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
@@ -37,8 +37,8 @@ add_custom_target(run_aub_tests)
3737
set_target_properties(run_aub_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
3838

3939
target_include_directories(igdrcl_aub_tests PRIVATE
40-
${GTEST_INCLUDE_DIR}
41-
${GMOCK_INCLUDE_DIR}
40+
${GTEST_INCLUDE_DIR}
41+
${GMOCK_INCLUDE_DIR}
4242
)
4343

4444
if(WIN32)
@@ -48,33 +48,13 @@ if(WIN32)
4848
endif()
4949

5050
target_sources(igdrcl_aub_tests PRIVATE
51-
${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp
52-
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.cpp
53-
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.cpp
54-
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.cpp
55-
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.cpp
56-
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp
57-
${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.cpp
58-
${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.cpp
59-
${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.cpp
60-
${IGDRCL_SOURCE_DIR}/unit_tests/base_object_allocator.cpp
61-
${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.cpp
62-
${IGDRCL_SOURCE_DIR}/unit_tests/memory_leak_listener.cpp
63-
${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp
6451
${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
6552
)
6653

6754
if(WIN32)
6855
target_sources(igdrcl_aub_tests PRIVATE
69-
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/options.cpp
70-
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
71-
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
7256
${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
7357
)
74-
else()
75-
target_sources(igdrcl_aub_tests PRIVATE
76-
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp
77-
)
7858
endif()
7959

8060
add_subdirectories()

unit_tests/command_queue/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ set(IGDRCL_SRCS_tests_command_queue
2222
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
2323
${CMAKE_CURRENT_SOURCE_DIR}/buffer_operations_fixture.h
2424
${CMAKE_CURRENT_SOURCE_DIR}/buffer_operations_withAsyncGPU_fixture.h
25-
${CMAKE_CURRENT_SOURCE_DIR}/command_queue_fixture.cpp
26-
${CMAKE_CURRENT_SOURCE_DIR}/command_queue_fixture.h
2725
${CMAKE_CURRENT_SOURCE_DIR}/command_queue_flush_waitlist_tests.cpp
2826
${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw_tests.cpp
2927
${CMAKE_CURRENT_SOURCE_DIR}/command_queue_tests.cpp

unit_tests/fixtures/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,8 @@
2020

2121
set(IGDRCL_SRCS_tests_fixtures
2222
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
23-
${CMAKE_CURRENT_SOURCE_DIR}/buffer_fixture.cpp
24-
${CMAKE_CURRENT_SOURCE_DIR}/buffer_fixture.h
25-
${CMAKE_CURRENT_SOURCE_DIR}/built_in_fixture.cpp
26-
${CMAKE_CURRENT_SOURCE_DIR}/built_in_fixture.h
2723
${CMAKE_CURRENT_SOURCE_DIR}/context_fixture.cpp
2824
${CMAKE_CURRENT_SOURCE_DIR}/context_fixture.h
29-
${CMAKE_CURRENT_SOURCE_DIR}/device_fixture.cpp
30-
${CMAKE_CURRENT_SOURCE_DIR}/device_fixture.h
3125
${CMAKE_CURRENT_SOURCE_DIR}/device_host_queue_fixture.cpp
3226
${CMAKE_CURRENT_SOURCE_DIR}/device_host_queue_fixture.h
3327
${CMAKE_CURRENT_SOURCE_DIR}/execution_model_fixture.h
@@ -41,16 +35,12 @@ set(IGDRCL_SRCS_tests_fixtures
4135
${CMAKE_CURRENT_SOURCE_DIR}/kernel_data_fixture.h
4236
${CMAKE_CURRENT_SOURCE_DIR}/media_kernel_fixture.h
4337
${CMAKE_CURRENT_SOURCE_DIR}/memory_allocator_fixture.h
44-
${CMAKE_CURRENT_SOURCE_DIR}/memory_management_fixture.cpp
45-
${CMAKE_CURRENT_SOURCE_DIR}/memory_management_fixture.h
4638
${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_fixture.cpp
4739
${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_fixture.h
4840
${CMAKE_CURRENT_SOURCE_DIR}/platform_fixture.cpp
4941
${CMAKE_CURRENT_SOURCE_DIR}/platform_fixture.h
5042
${CMAKE_CURRENT_SOURCE_DIR}/preemption_fixture.cpp
5143
${CMAKE_CURRENT_SOURCE_DIR}/preemption_fixture.h
52-
${CMAKE_CURRENT_SOURCE_DIR}/program_fixture.cpp
53-
${CMAKE_CURRENT_SOURCE_DIR}/program_fixture.h
5444
${CMAKE_CURRENT_SOURCE_DIR}/run_kernel_fixture.h
5545
${CMAKE_CURRENT_SOURCE_DIR}/scenario_test_fixture.h
5646
${CMAKE_CURRENT_SOURCE_DIR}/simple_arg_fixture.h

unit_tests/helpers/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ set(IGDRCL_SRCS_tests_helpers
3838
${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.cpp
3939
${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.h
4040
${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.h
41-
${CMAKE_CURRENT_SOURCE_DIR}/kernel_binary_helper.cpp
42-
${CMAKE_CURRENT_SOURCE_DIR}/kernel_binary_helper.h
4341
${CMAKE_CURRENT_SOURCE_DIR}/kernel_commands_tests.cpp
4442
${CMAKE_CURRENT_SOURCE_DIR}/memory_management_tests.cpp
4543
${CMAKE_CURRENT_SOURCE_DIR}/mipmap_tests.cpp
@@ -50,8 +48,6 @@ set(IGDRCL_SRCS_tests_helpers
5048
${CMAKE_CURRENT_SOURCE_DIR}/string_to_hash_tests.cpp
5149
${CMAKE_CURRENT_SOURCE_DIR}/string_tests.cpp
5250
${CMAKE_CURRENT_SOURCE_DIR}/task_information_tests.cpp
53-
${CMAKE_CURRENT_SOURCE_DIR}/test_files.cpp
54-
${CMAKE_CURRENT_SOURCE_DIR}/test_files.h
5551
${CMAKE_CURRENT_SOURCE_DIR}/TestDebugVariables.inl
5652
${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4_tests.cpp
5753
${CMAKE_CURRENT_SOURCE_DIR}/validator_tests.cpp

unit_tests/indirect_heap/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020

2121
set(IGDRCL_SRCS_tests_indirect_heap
2222
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
23-
${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap_fixture.cpp
24-
${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap_fixture.h
2523
${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap_tests.cpp
2624
)
2725
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_indirect_heap})

unit_tests/libult/CMakeLists.txt

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,62 @@ target_include_directories(igdrcl_libult PRIVATE
7272
${GTEST_INCLUDE_DIR}
7373
)
7474

75-
foreach(target_name igdrcl_libult igdrcl_libult_cs)
75+
set(IGDRCL_SRCS_LIB_ULT_ENV
76+
${IGDRCL_SOURCE_DIR}/unit_tests/base_object_allocator.cpp
77+
${IGDRCL_SOURCE_DIR}/unit_tests/custom_event_listener.h
78+
${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.cpp
79+
${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.h
80+
${IGDRCL_SOURCE_DIR}/unit_tests/main.cpp
81+
${IGDRCL_SOURCE_DIR}/unit_tests/memory_leak_listener.cpp
82+
${IGDRCL_SOURCE_DIR}/unit_tests/memory_leak_listener.h
83+
${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp
84+
${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp
85+
${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.h
86+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp
87+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.h
88+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.cpp
89+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.h
90+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.cpp
91+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.h
92+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.cpp
93+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.h
94+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.cpp
95+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.h
96+
${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.cpp
97+
${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.h
98+
${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.cpp
99+
${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.h
100+
${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.cpp
101+
${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.h
102+
)
103+
add_library (igdrcl_libult_env OBJECT
104+
${IGDRCL_SRCS_LIB_ULT_ENV}
105+
)
106+
107+
set(IGDRCL_SRCS_LIB_ULT_ENV_WINDOWS
108+
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/options.cpp
109+
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
110+
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.h
111+
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
112+
)
113+
114+
set(IGDRCL_SRCS_LIB_ULT_ENV_LINUX
115+
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp
116+
)
117+
118+
if(WIN32)
119+
target_sources(igdrcl_libult_env PRIVATE ${IGDRCL_SRCS_LIB_ULT_ENV_WINDOWS})
120+
else()
121+
target_sources(igdrcl_libult_env PRIVATE ${IGDRCL_SRCS_LIB_ULT_ENV_LINUX})
122+
endif()
123+
124+
target_include_directories(igdrcl_libult_env PRIVATE
125+
${GTEST_INCLUDE_DIR}
126+
${GMOCK_INCLUDE_DIR}
127+
${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
128+
)
129+
130+
foreach(target_name igdrcl_libult igdrcl_libult_cs igdrcl_libult_env)
76131
set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE ON)
77132
set_target_properties(${target_name} PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
78133
set_property(TARGET ${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})

unit_tests/mt_tests/CMakeLists.txt

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -18,68 +18,35 @@
1818
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
1919
# OTHER DEALINGS IN THE SOFTWARE.
2020

21-
cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
22-
2321
project(igdrcl_mt_tests)
2422

25-
add_subdirectory(api)
26-
add_subdirectory(command_queue)
27-
add_subdirectory(device_queue)
28-
add_subdirectory(event)
29-
add_subdirectory(fixtures)
30-
add_subdirectory(helpers)
31-
add_subdirectory(indirect_heap)
32-
add_subdirectory(memory_manager)
33-
add_subdirectory(os_interface)
34-
add_subdirectory(platform)
35-
add_subdirectory(utilities)
36-
37-
set(IGDRCL_SRCS_mt_tests_local
38-
#local files
23+
add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL
3924
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
40-
#necessary dependencies from igdrcl_tests
41-
${IGDRCL_SOURCE_DIR}/unit_tests/base_object_allocator.cpp
42-
${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.cpp
43-
${IGDRCL_SOURCE_DIR}/unit_tests/main.cpp
44-
${IGDRCL_SOURCE_DIR}/unit_tests/memory_leak_listener.cpp
25+
4526
${IGDRCL_SOURCE_DIR}/unit_tests/ult_configuration.cpp
46-
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.cpp
27+
28+
$<TARGET_OBJECTS:igdrcl_libult>
29+
$<TARGET_OBJECTS:igdrcl_libult_cs>
30+
$<TARGET_OBJECTS:igdrcl_libult_env>
31+
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
4732
)
4833

34+
add_subdirectories()
35+
4936
# Setting up our local list of test files
50-
set(IGDRCL_SRCS_mt_tests
51-
${IGDRCL_SRCS_gtest}
37+
target_sources(igdrcl_mt_tests PRIVATE
5238
${IGDRCL_SRCS_mt_tests_api}
53-
${IGDRCL_SRCS_mt_tests_command_queue}
5439
${IGDRCL_SRCS_mt_tests_device_queue}
5540
${IGDRCL_SRCS_mt_tests_event}
56-
${IGDRCL_SRCS_mt_tests_fixtures}
57-
${IGDRCL_SRCS_mt_tests_helpers}
58-
${IGDRCL_SRCS_mt_tests_indirect_heap}
59-
${IGDRCL_SRCS_mt_tests_local}
6041
${IGDRCL_SRCS_mt_tests_memory_manager}
61-
${IGDRCL_SRCS_mt_tests_os_interface}
6242
${IGDRCL_SRCS_mt_tests_platform}
6343
${IGDRCL_SRCS_mt_tests_utilities}
6444
)
6545

66-
if(MSVC)
67-
list(APPEND IGDRCL_SRCS_mt_tests
68-
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
69-
${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
70-
)
71-
endif(MSVC)
72-
7346
#these tests fail because of data race, set '*' after fix problem
7447
set(GTEST_FILTER "-AsyncGPUoperations.MapBufferAfterWriteBuffer")
7548
MESSAGE(STATUS "GTest filter for mt tests:" ${GTEST_FILTER} )
7649

77-
add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL
78-
${IGDRCL_SRCS_mt_tests}
79-
$<TARGET_OBJECTS:igdrcl_libult>
80-
$<TARGET_OBJECTS:igdrcl_libult_cs>
81-
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
82-
)
8350
target_link_libraries(igdrcl_mt_tests ${TSAN_LIB})
8451
target_link_libraries(igdrcl_mt_tests ${NEO_MOCKABLE_LIB_NAME})
8552
target_link_libraries(igdrcl_mt_tests gtest gmock)
@@ -102,7 +69,6 @@ if(MSVC)
10269
${WDK_INCLUDE_PATHS}
10370
${GMM_INCLUDE_PATHS}
10471
${UMKM_SHAREDDATA_INCLUDE_PATHS}
105-
${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
10672
)
10773
target_link_libraries (igdrcl_mt_tests Ws2_32.lib)
10874
else()

unit_tests/mt_tests/command_queue/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017, Intel Corporation
1+
# Copyright (c) 2017 - 2018, Intel Corporation
22
#
33
# Permission is hereby granted, free of charge, to any person obtaining a
44
# copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,14 @@
1919
# OTHER DEALINGS IN THE SOFTWARE.
2020

2121
set(IGDRCL_SRCS_mt_tests_command_queue
22-
#local files
23-
"${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"
24-
#necessary dependencies from igdrcl_tests
25-
"${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp"
26-
"${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp"
27-
"${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_kernel_mt_tests.cpp"
28-
"${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_fixture.cpp"
29-
"${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/ooq_task_tests_mt.cpp"
30-
"${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/ioq_task_tests_mt.cpp"
31-
PARENT_SCOPE
22+
# local files
23+
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
24+
25+
# necessary dependencies from igdrcl_tests
26+
${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp
27+
${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_kernel_mt_tests.cpp
28+
${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/enqueue_fixture.cpp
29+
${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/ooq_task_tests_mt.cpp
30+
${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/ioq_task_tests_mt.cpp
3231
)
32+
target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_command_queue})

unit_tests/mt_tests/fixtures/CMakeLists.txt

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017, Intel Corporation
1+
# Copyright (c) 2017 - 2018, Intel Corporation
22
#
33
# Permission is hereby granted, free of charge, to any person obtaining a
44
# copy of this software and associated documentation files (the "Software"),
@@ -19,14 +19,11 @@
1919
# OTHER DEALINGS IN THE SOFTWARE.
2020

2121
set(IGDRCL_SRCS_mt_tests_fixtures
22-
#local files
23-
"${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"
24-
#necessary dependencies from igdrcl_tests
25-
"${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.cpp"
26-
"${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.cpp"
27-
"${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.cpp"
28-
"${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/image_fixture.cpp"
29-
"${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp"
30-
"${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/platform_fixture.cpp"
31-
PARENT_SCOPE
22+
# local files
23+
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
24+
25+
# necessary dependencies from igdrcl_tests
26+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/image_fixture.cpp
27+
${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/platform_fixture.cpp
3228
)
29+
target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_fixtures})

0 commit comments

Comments
 (0)