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:
parent
430c991179
commit
d7687e32c4
|
@ -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
|
||||||
|
|
|
@ -31,4 +31,8 @@ if(UNIX)
|
||||||
"${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()
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue