From 70af3e33db864ae779bf58e8f99e53dc1c8b2bd8 Mon Sep 17 00:00:00 2001 From: Pawel Cieslak Date: Mon, 4 Nov 2019 14:08:35 +0100 Subject: [PATCH] Remove tbx tests. Change-Id: I8511c55483504dfb463869958b274d02b45d4079 Signed-off-by: Pawel Cieslak --- unit_tests/tbx/CMakeLists.txt | 58 -------------------- unit_tests/tbx/main_tbx.cpp | 63 ---------------------- unit_tests/tbx/tbx_tests_configuration.cpp | 12 ----- unit_tests/tbx/test_mode.h | 14 ----- 4 files changed, 147 deletions(-) delete mode 100644 unit_tests/tbx/CMakeLists.txt delete mode 100644 unit_tests/tbx/main_tbx.cpp delete mode 100644 unit_tests/tbx/tbx_tests_configuration.cpp delete mode 100644 unit_tests/tbx/test_mode.h diff --git a/unit_tests/tbx/CMakeLists.txt b/unit_tests/tbx/CMakeLists.txt deleted file mode 100644 index 86a8909102..0000000000 --- a/unit_tests/tbx/CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ -# -# Copyright (C) 2017-2019 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -add_executable(igdrcl_tbx_tests - ${CMAKE_CURRENT_SOURCE_DIR}/main_tbx.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tbx_tests_configuration.cpp - ${NEO_SOURCE_DIR}/runtime/dll/create_command_stream.cpp - ${NEO_SOURCE_DIR}/runtime/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp - ${NEO_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp - ${NEO_SOURCE_DIR}/unit_tests/libult/os_interface.cpp - ${NEO_SOURCE_DIR}/unit_tests/options.cpp - $ -) - -target_link_libraries(igdrcl_tbx_tests ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS}) - -if(WIN32) - target_include_directories(igdrcl_tbx_tests PRIVATE - ${NEO_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX} - ) - target_include_directories(igdrcl_tbx_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - target_sources(igdrcl_tbx_tests PRIVATE - ${NEO_SOURCE_DIR}/runtime/dll/windows/options.cpp - ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp - ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/sys_calls.cpp - ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_calls.cpp - ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp - ${NEO_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h - ) - target_link_libraries(igdrcl_tbx_tests dbghelp) -else() - target_sources(igdrcl_tbx_tests PRIVATE - ${NEO_SOURCE_DIR}/runtime/dll/linux/allocator_helper.cpp - ${NEO_SOURCE_DIR}/runtime/dll/linux/options.cpp - ${NEO_SOURCE_DIR}/unit_tests/os_interface/linux/create_drm_memory_manager.cpp - ) -endif() - -copy_gmm_dll_for(igdrcl_tbx_tests) -create_project_source_tree(igdrcl_tbx_tests ${NEO_SOURCE_DIR}/runtime ${NEO_SOURCE_DIR}/unit_tests) - -add_custom_target(run_tbx_tests ALL DEPENDS unit_tests igdrcl_tbx_tests) -add_custom_command( - TARGET run_tbx_tests - POST_BUILD - COMMAND WORKING_DIRECTORY ${TargetDir} - COMMAND echo Target Directory is: ${TargetDir} - COMMAND echo Running TBX tests - COMMAND igdrcl_tbx_tests -) -add_dependencies(run_unit_tests run_tbx_tests) - -set_target_properties(igdrcl_tbx_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER}) -set_target_properties(run_tbx_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER}) diff --git a/unit_tests/tbx/main_tbx.cpp b/unit_tests/tbx/main_tbx.cpp deleted file mode 100644 index d39efca183..0000000000 --- a/unit_tests/tbx/main_tbx.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2017-2019 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/hw_info.h" -#include "unit_tests/custom_event_listener.h" -#include "unit_tests/helpers/gtest_helpers.h" - -using namespace NEO; - -namespace NEO { -bool getDevices(size_t &numDevicesReturned, ExecutionEnvironment &executionEnvironment); -} // namespace NEO - -TEST(CSRTests, getDevices) { - size_t numDevicesReturned = 0; - - DebugManagerStateRestore dbgState; - DebugManager.flags.SetCommandStreamReceiver.set(2); - ExecutionEnvironment executionEnvironment; - NEO::getDevices(numDevicesReturned, executionEnvironment); - - auto hwInfo = executionEnvironment.getHardwareInfo(); - - EXPECT_GT_VAL(hwInfo->gtSystemInfo.EUCount, 0u); - EXPECT_GT_VAL(hwInfo->gtSystemInfo.ThreadCount, 0u); - EXPECT_GT_VAL(hwInfo->gtSystemInfo.SliceCount, 0u); - EXPECT_GT_VAL(hwInfo->gtSystemInfo.SubSliceCount, 0u); - EXPECT_GT_VAL(hwInfo->gtSystemInfo.L3CacheSizeInKb, 0u); - EXPECT_EQ_VAL(hwInfo->gtSystemInfo.CsrSizeInMb, 8u); - EXPECT_FALSE(hwInfo->gtSystemInfo.IsDynamicallyPopulated); -} - -int main(int argc, char **argv) { - bool useDefaultListener = false; - - ::testing::InitGoogleTest(&argc, argv); - - // parse remaining args assuming they're mine - for (int i = 1; i < argc; ++i) { - if (!strcmp("--enable_default_listener", argv[i])) { - useDefaultListener = true; - } - } - - if (useDefaultListener == false) { - auto &listeners = ::testing::UnitTest::GetInstance()->listeners(); - auto defaultListener = listeners.default_result_printer(); - auto customEventListener = new CCustomEventListener(defaultListener); - - listeners.Release(defaultListener); - listeners.Append(customEventListener); - } - - auto retVal = RUN_ALL_TESTS(); - - return retVal; -} diff --git a/unit_tests/tbx/tbx_tests_configuration.cpp b/unit_tests/tbx/tbx_tests_configuration.cpp deleted file mode 100644 index 7de0682b7b..0000000000 --- a/unit_tests/tbx/tbx_tests_configuration.cpp +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (C) 2018-2019 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "test_mode.h" - -namespace NEO { -TestMode testMode = defaultTestMode; -} // namespace NEO diff --git a/unit_tests/tbx/test_mode.h b/unit_tests/tbx/test_mode.h deleted file mode 100644 index 86db5c51d2..0000000000 --- a/unit_tests/tbx/test_mode.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2019 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once - -#include "unit_tests/tests_configuration.h" - -namespace NEO { -constexpr TestMode defaultTestMode = TestMode::TbxTests; -} // namespace NEO