Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small cleanup around Linux specific ULTs 

- move main file to linux/ folder
- don't use default listener. follow main ULTs behavior

Change-Id: I236a42eef9d7bb3f61112f847aec7fc3e9f7873e
This commit is contained in:
Artur Harasimiuk 2018-02-16 10:15:42 +01:00 committed by sys_ocldev
parent 430c991179
commit d7687e32c4
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unit_tests/CMakeLists.txt
View File

@ -234,7 +234,7 @@ if(MSVC)
target_link_libraries (igdrcl_tests gtest gmock Ws2_32.lib) target_link_libraries (igdrcl_tests gtest gmock Ws2_32.lib)
else() else()
add_executable(igdrcl_linux add_executable(igdrcl_linux
"main_linux.cpp" ${IGDRCL_SRCS_linux_tests}
$<TARGET_OBJECTS:igdrcl_libult_cs> $<TARGET_OBJECTS:igdrcl_libult_cs>
${IGDRCL_SOURCE_DIR}/unit_tests/abort.cpp ${IGDRCL_SOURCE_DIR}/unit_tests/abort.cpp
${IGDRCL_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp

20
unit_tests/linux/CMakeLists.txt
View File

@ -23,12 +23,16 @@ cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
project(igdrcl_linux_dll_tests) project(igdrcl_linux_dll_tests)
if(UNIX) if(UNIX)
set(IGDRCL_SRCS_linux_dll_tests set(IGDRCL_SRCS_linux_dll_tests
"${IGDRCL_SRCS_linux_dll_tests}" "${IGDRCL_SRCS_linux_dll_tests}"
"${CMAKE_CURRENT_SOURCE_DIR}/main_linux_dll.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/main_linux_dll.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/drm_null_device_tests.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/drm_null_device_tests.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h" "${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h"
"${IGDRCL_SOURCE_DIR}/runtime/os_interface/debug_settings_manager.cpp" "${IGDRCL_SOURCE_DIR}/runtime/os_interface/debug_settings_manager.cpp"
PARENT_SCOPE) PARENT_SCOPE)
set(IGDRCL_SRCS_linux_tests
"${CMAKE_CURRENT_SOURCE_DIR}/main_linux.cpp"
PARENT_SCOPE)
endif() endif()

4
unit_tests/main_linux.cpp → unit_tests/linux/main_linux.cpp
View File

@ -28,13 +28,15 @@
using namespace OCLRT; using namespace OCLRT;
int main(int argc, char **argv) { int main(int argc, char **argv) {
bool useDefaultListener = true; bool useDefaultListener = false;
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
if (!strcmp("--disable_default_listener", argv[i])) { if (!strcmp("--disable_default_listener", argv[i])) {
useDefaultListener = false; useDefaultListener = false;
} else if (!strcmp("--enable_default_listener", argv[i])) {
useDefaultListener = true;
} }
} }

4
unit_tests/linux/main_linux_dll.cpp
View File

@ -281,7 +281,7 @@ TEST_F(DrmTests, failOnInvalidDeviceName) {
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
bool useDefaultListener = true; bool useDefaultListener = false;
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
@ -289,6 +289,8 @@ int main(int argc, char **argv) {
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
if (!strcmp("--disable_default_listener", argv[i])) { if (!strcmp("--disable_default_listener", argv[i])) {
useDefaultListener = false; useDefaultListener = false;
} else if (!strcmp("--enable_default_listener", argv[i])) {
useDefaultListener = true;
} }
} }