From 2ad04efd161c763de72467760e26e3478d6bd63f Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 18 May 2022 17:56:20 +0000 Subject: [PATCH] Move debug setting and file reader tests to shared Signed-off-by: Mateusz Jablonski --- opencl/test/unit_test/utilities/CMakeLists.txt | 5 +---- shared/test/unit_test/utilities/CMakeLists.txt | 5 ++++- .../utilities/debug_file_reader_tests.cpp | 4 ++-- .../utilities/debug_file_reader_tests.inl | 2 +- .../utilities/debug_settings_reader_tests.cpp | 15 +++++++-------- 5 files changed, 15 insertions(+), 16 deletions(-) rename {opencl => shared}/test/unit_test/utilities/debug_file_reader_tests.cpp (91%) rename {opencl => shared}/test/unit_test/utilities/debug_file_reader_tests.inl (99%) rename {opencl => shared}/test/unit_test/utilities/debug_settings_reader_tests.cpp (90%) diff --git a/opencl/test/unit_test/utilities/CMakeLists.txt b/opencl/test/unit_test/utilities/CMakeLists.txt index 76687f7279..f32636d4e7 100644 --- a/opencl/test/unit_test/utilities/CMakeLists.txt +++ b/opencl/test/unit_test/utilities/CMakeLists.txt @@ -1,14 +1,11 @@ # -# Copyright (C) 2018-2021 Intel Corporation +# Copyright (C) 2018-2022 Intel Corporation # # SPDX-License-Identifier: MIT # set(IGDRCL_SRCS_tests_utilities ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}debug_file_reader_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader_tests.inl - ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_tests.h ${CMAKE_CURRENT_SOURCE_DIR}/tag_allocator_tests.cpp diff --git a/shared/test/unit_test/utilities/CMakeLists.txt b/shared/test/unit_test/utilities/CMakeLists.txt index 52626ce83f..a3109768d4 100644 --- a/shared/test/unit_test/utilities/CMakeLists.txt +++ b/shared/test/unit_test/utilities/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2019-2021 Intel Corporation +# Copyright (C) 2019-2022 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -11,6 +11,9 @@ target_sources(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/containers_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/containers_tests_helpers.h ${CMAKE_CURRENT_SOURCE_DIR}/cpuintrinsics_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}debug_file_reader_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader_tests.inl + ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/destructor_counted.h ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/io_functions_tests.cpp diff --git a/opencl/test/unit_test/utilities/debug_file_reader_tests.cpp b/shared/test/unit_test/utilities/debug_file_reader_tests.cpp similarity index 91% rename from opencl/test/unit_test/utilities/debug_file_reader_tests.cpp rename to shared/test/unit_test/utilities/debug_file_reader_tests.cpp index 7436b9abce..e439f11fb6 100644 --- a/opencl/test/unit_test/utilities/debug_file_reader_tests.cpp +++ b/shared/test/unit_test/utilities/debug_file_reader_tests.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "opencl/test/unit_test/utilities/debug_file_reader_tests.inl" +#include "shared/test/unit_test/utilities/debug_file_reader_tests.inl" using namespace NEO; diff --git a/opencl/test/unit_test/utilities/debug_file_reader_tests.inl b/shared/test/unit_test/utilities/debug_file_reader_tests.inl similarity index 99% rename from opencl/test/unit_test/utilities/debug_file_reader_tests.inl rename to shared/test/unit_test/utilities/debug_file_reader_tests.inl index a9b15596d5..f53ee8d70e 100644 --- a/opencl/test/unit_test/utilities/debug_file_reader_tests.inl +++ b/shared/test/unit_test/utilities/debug_file_reader_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp b/shared/test/unit_test/utilities/debug_settings_reader_tests.cpp similarity index 90% rename from opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp rename to shared/test/unit_test/utilities/debug_settings_reader_tests.cpp index 8885e6cb7e..11ff5f12ef 100644 --- a/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp +++ b/shared/test/unit_test/utilities/debug_settings_reader_tests.cpp @@ -1,17 +1,16 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/file_io.h" #include "shared/source/utilities/debug_settings_reader.h" #include "shared/test/common/test_macros/test.h" -#include "opencl/source/os_interface/ocl_reg_path.h" - #include "gtest/gtest.h" #include @@ -31,7 +30,7 @@ class MockSettingsReader : public SettingsReader { }; TEST(SettingsReader, WhenCreatingSettingsReaderThenReaderIsCreated) { - SettingsReader *reader = SettingsReader::create(oclRegPath); + SettingsReader *reader = SettingsReader::create(ApiSpecificConfig::getRegistryPath()); EXPECT_NE(nullptr, reader); delete reader; } @@ -41,7 +40,7 @@ TEST(SettingsReader, GivenNoSettingsFileWhenCreatingSettingsReaderThenOsReaderIs auto fileReader = std::unique_ptr(SettingsReader::createFileReader()); EXPECT_EQ(nullptr, fileReader.get()); - auto osReader = std::unique_ptr(SettingsReader::create(oclRegPath)); + auto osReader = std::unique_ptr(SettingsReader::create(ApiSpecificConfig::getRegistryPath())); EXPECT_NE(nullptr, osReader.get()); } @@ -51,7 +50,7 @@ TEST(SettingsReader, GivenSettingsFileExistsWhenCreatingSettingsReaderThenReader const char data[] = "ProductFamilyOverride = test"; writeDataToFile(SettingsReader::settingsFileName, &data, sizeof(data)); } - auto reader = std::unique_ptr(SettingsReader::create(oclRegPath)); + auto reader = std::unique_ptr(SettingsReader::create(ApiSpecificConfig::getRegistryPath())); EXPECT_NE(nullptr, reader.get()); std::string defaultValue("unk"); EXPECT_STREQ("test", reader->getSetting("ProductFamilyOverride", defaultValue).c_str()); @@ -75,13 +74,13 @@ TEST(SettingsReader, WhenCreatingFileReaderThenReaderIsCreated) { } TEST(SettingsReader, WhenCreatingOsReaderThenReaderIsCreated) { - SettingsReader *reader = SettingsReader::createOsReader(false, oclRegPath); + SettingsReader *reader = SettingsReader::createOsReader(false, ApiSpecificConfig::getRegistryPath()); EXPECT_NE(nullptr, reader); delete reader; } TEST(SettingsReader, GivenRegKeyWhenCreatingOsReaderThenReaderIsCreated) { - std::string regKey = oclRegPath; + std::string regKey = ApiSpecificConfig::getRegistryPath(); std::unique_ptr reader(SettingsReader::createOsReader(false, regKey)); EXPECT_NE(nullptr, reader); }