diff --git a/unit_tests/built_ins/built_in_tests.cpp b/unit_tests/built_ins/built_in_tests.cpp index f53fed8a73..eaaa2f67d5 100644 --- a/unit_tests/built_ins/built_in_tests.cpp +++ b/unit_tests/built_ins/built_in_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -29,7 +29,6 @@ #include "runtime/kernel/kernel.h" #include "runtime/platform/platform.h" #include "unit_tests/global_environment.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/fixtures/built_in_fixture.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/context_fixture.h" @@ -46,8 +45,7 @@ using namespace OCLRT; class BuiltInTests - : public MemoryManagementFixture, - public BuiltInFixture, + : public BuiltInFixture, public DeviceFixture, public ContextFixture, public ::testing::Test { @@ -63,7 +61,6 @@ class BuiltInTests } void SetUp() override { - MemoryManagementFixture::SetUp(); DeviceFixture::SetUp(); cl_device_id device = pDevice; ContextFixture::SetUp(1, &device); @@ -75,7 +72,6 @@ class BuiltInTests BuiltInFixture::TearDown(); ContextFixture::TearDown(); DeviceFixture::TearDown(); - MemoryManagementFixture::TearDown(); } void AppendBuiltInStringFromFile(std::string builtInFile, size_t &size) { @@ -1505,4 +1501,4 @@ TEST_F(BuiltInTests, givenSipKernelWhenItIsCreatedThenItHasGraphicsAllocationFor const SipKernel &sipKern = BuiltIns::getInstance().getSipKernel(SipKernelType::Csr, *pContext->getDevice(0)); auto sipAllocation = sipKern.getSipAllocation(); EXPECT_NE(nullptr, sipAllocation); -} \ No newline at end of file +} diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp index e68d353278..1bbd091e95 100644 --- a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp @@ -37,7 +37,6 @@ #include "runtime/gen_common/reg_configs.h" #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/fixtures/built_in_fixture.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/helpers/debug_manager_state_restore.h" @@ -63,12 +62,10 @@ using ::testing::_; struct UltCommandStreamReceiverTest : public DeviceFixture, public BuiltInFixture, - public MemoryManagementFixture, public HardwareParse, ::testing::Test { void SetUp() override { - MemoryManagementFixture::SetUp(); DeviceFixture::SetUp(); BuiltInFixture::SetUp(pDevice); HardwareParse::SetUp(); @@ -117,7 +114,6 @@ struct UltCommandStreamReceiverTest HardwareParse::TearDown(); BuiltInFixture::TearDown(); DeviceFixture::TearDown(); - MemoryManagementFixture::TearDown(); } template diff --git a/unit_tests/command_stream/command_stream_receiver_tests.cpp b/unit_tests/command_stream/command_stream_receiver_tests.cpp index 4d811c9187..8d20b8be09 100644 --- a/unit_tests/command_stream/command_stream_receiver_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_tests.cpp @@ -30,7 +30,6 @@ #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/mocks/mock_builtins.h" #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_program.h" @@ -42,10 +41,8 @@ using namespace OCLRT; struct CommandStreamReceiverTest : public DeviceFixture, - public MemoryManagementFixture, public ::testing::Test { void SetUp() override { - MemoryManagementFixture::SetUp(); DeviceFixture::SetUp(); commandStreamReceiver = &pDevice->getCommandStreamReceiver(); @@ -54,7 +51,6 @@ struct CommandStreamReceiverTest : public DeviceFixture, void TearDown() override { DeviceFixture::TearDown(); - MemoryManagementFixture::TearDown(); } CommandStreamReceiver *commandStreamReceiver; @@ -260,4 +256,4 @@ TEST_F(CommandStreamReceiverTest, givenForced32BitAddressingWhenDebugSurfaceIsAl HWTEST_F(CommandStreamReceiverTest, givenDefaultCommandStreamReceiverThenDefaultDispatchingPolicyIsImmediateSubmission) { auto &csr = pDevice->getUltCommandStreamReceiver(); EXPECT_EQ(CommandStreamReceiver::DispatchMode::ImmediateDispatch, csr.dispatchMode); -} \ No newline at end of file +} diff --git a/unit_tests/compiler_interface/binary_cache_tests.cpp b/unit_tests/compiler_interface/binary_cache_tests.cpp index acb020c02c..a3f9b2054d 100644 --- a/unit_tests/compiler_interface/binary_cache_tests.cpp +++ b/unit_tests/compiler_interface/binary_cache_tests.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -41,18 +40,16 @@ using namespace OCLRT; using namespace std; -class BinaryCacheFixture : public MemoryManagementFixture +class BinaryCacheFixture { public: - void SetUp() override { - MemoryManagementFixture::SetUp(); + void SetUp() { cache = new BinaryCache; } - void TearDown() override { + void TearDown() { delete cache; - MemoryManagementFixture::TearDown(); } BinaryCache *cache; }; @@ -102,20 +99,17 @@ class BinaryCacheMock : public BinaryCache { bool loadResult = false; }; -class CompilerInterfaceCachedFixture : public MemoryManagementFixture, - public DeviceFixture { +class CompilerInterfaceCachedFixture : public DeviceFixture { public: - void SetUp() override { - MemoryManagementFixture::SetUp(); + void SetUp() { DeviceFixture::SetUp(); pCompilerInterface = TestedCompilerInterface::getInstance(); ASSERT_NE(pCompilerInterface, nullptr); } - void TearDown() override { + void TearDown() { TestedCompilerInterface::shutdown(); DeviceFixture::TearDown(); - MemoryManagementFixture::TearDown(); } CompilerInterface *pCompilerInterface; diff --git a/unit_tests/compiler_interface/compiler_interface_tests.cpp b/unit_tests/compiler_interface/compiler_interface_tests.cpp index 0fcfd7966d..e241b2b6e7 100644 --- a/unit_tests/compiler_interface/compiler_interface_tests.cpp +++ b/unit_tests/compiler_interface/compiler_interface_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,6 @@ #include "runtime/helpers/file_io.h" #include "runtime/platform/platform.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/global_environment.h" #include "unit_tests/helpers/test_files.h" #include "unit_tests/helpers/memory_management.h" @@ -47,8 +46,7 @@ const char *gCBadDompilerDllName = "libbad_compiler.so"; #error "Unknown OS!" #endif -class CompilerInterfaceTest : public MemoryManagementFixture, - public DeviceFixture, +class CompilerInterfaceTest : public DeviceFixture, public ::testing::Test { public: CompilerInterfaceTest() { @@ -56,7 +54,6 @@ class CompilerInterfaceTest : public MemoryManagementFixture, } void SetUp() override { - MemoryManagementFixture::SetUp(); DeviceFixture::SetUp(); retVal = CL_SUCCESS; @@ -102,7 +99,6 @@ class CompilerInterfaceTest : public MemoryManagementFixture, pCompilerInterface.reset(); DeviceFixture::TearDown(); - MemoryManagementFixture::TearDown(); } std::unique_ptr pCompilerInterface = nullptr; diff --git a/unit_tests/context/context_multi_device_tests.cpp b/unit_tests/context/context_multi_device_tests.cpp index 76bedc36e3..9a4a762b10 100644 --- a/unit_tests/context/context_multi_device_tests.cpp +++ b/unit_tests/context/context_multi_device_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -24,15 +24,12 @@ #include "hw_cmds.h" #include "runtime/helpers/array_count.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "test.h" #include "gtest/gtest.h" using namespace OCLRT; -typedef Test ContextMultiDevice; - -TEST_F(ContextMultiDevice, singleDevice) { +TEST(ContextMultiDevice, singleDevice) { cl_device_id devices[] = { DeviceHelper<>::create()}; auto numDevices = ARRAY_COUNT(devices); @@ -61,7 +58,7 @@ TEST_F(ContextMultiDevice, singleDevice) { } } -TEST_F(ContextMultiDevice, eightDevices) { +TEST(ContextMultiDevice, eightDevices) { cl_device_id devices[] = { DeviceHelper<>::create(), DeviceHelper<>::create(), diff --git a/unit_tests/context/driver_diagnostics_tests.h b/unit_tests/context/driver_diagnostics_tests.h index a9fe829007..ff34b9cead 100644 --- a/unit_tests/context/driver_diagnostics_tests.h +++ b/unit_tests/context/driver_diagnostics_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -30,7 +30,6 @@ #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/fixtures/built_in_fixture.h" #include "unit_tests/fixtures/image_fixture.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/fixtures/platform_fixture.h" #include "unit_tests/fixtures/program_fixture.h" #include "unit_tests/mocks/mock_buffer.h" @@ -46,22 +45,19 @@ bool containsHint(const char *providedHint, char *userData); void CL_CALLBACK callbackFunction(const char *providedHint, const void *flags, size_t size, void *userData); -struct DriverDiagnosticsTest : public MemoryManagementFixture, - public PlatformFixture, +struct DriverDiagnosticsTest : public PlatformFixture, public ::testing::Test { using PlatformFixture::SetUp; DriverDiagnosticsTest() : retVal(CL_SUCCESS) { } void SetUp() override { - MemoryManagementFixture::SetUp(); PlatformFixture::SetUp(numPlatformDevices, platformDevices); memset(userData, 0, maxHintCounter * DriverDiagnostics::maxHintStringSize); } void TearDown() override { PlatformFixture::TearDown(); - MemoryManagementFixture::TearDown(); } cl_int retVal; diff --git a/unit_tests/fixtures/hello_world_fixture.h b/unit_tests/fixtures/hello_world_fixture.h index a3f8cc4d5c..c545a7c8b8 100644 --- a/unit_tests/fixtures/hello_world_fixture.h +++ b/unit_tests/fixtures/hello_world_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -31,7 +31,6 @@ #include "unit_tests/indirect_heap/indirect_heap_fixture.h" #include "unit_tests/fixtures/built_in_fixture.h" #include "unit_tests/fixtures/hello_world_kernel_fixture.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "gen_cmd_parse.h" #include "unit_tests/fixtures/buffer_fixture.h" @@ -53,8 +52,7 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, public FixtureFactory::CommandQueueFixture, public FixtureFactory::KernelFixture, public DeviceFixture, - public BuiltInFixture, - public MemoryManagementFixture { + public BuiltInFixture { typedef typename FixtureFactory::IndirectHeapFixture IndirectHeapFixture; typedef typename FixtureFactory::CommandStreamFixture CommandStreamFixture; @@ -79,7 +77,6 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, public: virtual void SetUp() { - MemoryManagementFixture::SetUp(); DeviceFixture::SetUp(); ASSERT_NE(nullptr, pDevice); BuiltInFixture::SetUp(pDevice); @@ -120,7 +117,6 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, CommandQueueFixture::TearDown(); BuiltInFixture::TearDown(); DeviceFixture::TearDown(); - MemoryManagementFixture::TearDown(); } void *pSrcMemory; diff --git a/unit_tests/kernel/kernel_accelerator_arg_tests.cpp b/unit_tests/kernel/kernel_accelerator_arg_tests.cpp index 1b0a54a836..f563977ebe 100644 --- a/unit_tests/kernel/kernel_accelerator_arg_tests.cpp +++ b/unit_tests/kernel/kernel_accelerator_arg_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -30,7 +30,6 @@ #include "runtime/accelerators/intel_motion_estimation.h" #include "unit_tests/fixtures/context_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_kernel.h" @@ -41,7 +40,7 @@ using namespace OCLRT; -class KernelArgAcceleratorFixture : public ContextFixture, public DeviceFixture, public MemoryManagementFixture { +class KernelArgAcceleratorFixture : public ContextFixture, public DeviceFixture { using ContextFixture::SetUp; @@ -50,14 +49,13 @@ class KernelArgAcceleratorFixture : public ContextFixture, public DeviceFixture, } protected: - void SetUp() override { + void SetUp() { desc = { CL_ME_MB_TYPE_4x4_INTEL, CL_ME_SUBPIXEL_MODE_QPEL_INTEL, CL_ME_SAD_ADJUST_MODE_HAAR_INTEL, CL_ME_SEARCH_PATH_RADIUS_16_12_INTEL}; - MemoryManagementFixture::SetUp(); DeviceFixture::SetUp(); cl_device_id device = pDevice; ContextFixture::SetUp(1, &device); @@ -98,7 +96,6 @@ class KernelArgAcceleratorFixture : public ContextFixture, public DeviceFixture, delete pProgram; ContextFixture::TearDown(); DeviceFixture::TearDown(); - MemoryManagementFixture::TearDown(); } cl_motion_estimation_desc_intel desc; diff --git a/unit_tests/kernel/kernel_arg_pipe_tests.cpp b/unit_tests/kernel/kernel_arg_pipe_tests.cpp index 4490d7d210..14187d2a73 100644 --- a/unit_tests/kernel/kernel_arg_pipe_tests.cpp +++ b/unit_tests/kernel/kernel_arg_pipe_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,6 @@ #include "runtime/mem_obj/pipe.h" #include "unit_tests/fixtures/context_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "test.h" #include "unit_tests/mocks/mock_pipe.h" #include "unit_tests/mocks/mock_buffer.h" @@ -39,7 +38,7 @@ using namespace OCLRT; -class KernelArgPipeFixture : public ContextFixture, public DeviceFixture, public MemoryManagementFixture { +class KernelArgPipeFixture : public ContextFixture, public DeviceFixture { using ContextFixture::SetUp; @@ -48,8 +47,7 @@ class KernelArgPipeFixture : public ContextFixture, public DeviceFixture, public } protected: - void SetUp() override { - MemoryManagementFixture::SetUp(); + void SetUp() { DeviceFixture::SetUp(); cl_device_id device = pDevice; ContextFixture::SetUp(1, &device); @@ -87,7 +85,6 @@ class KernelArgPipeFixture : public ContextFixture, public DeviceFixture, public delete pProgram; ContextFixture::TearDown(); DeviceFixture::TearDown(); - MemoryManagementFixture::TearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/unit_tests/mem_obj/mem_obj_tests.cpp b/unit_tests/mem_obj/mem_obj_tests.cpp index dfd9b625cc..70b4ac8d2b 100644 --- a/unit_tests/mem_obj/mem_obj_tests.cpp +++ b/unit_tests/mem_obj/mem_obj_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -27,7 +27,6 @@ #include "unit_tests/mocks/mock_deferred_deleter.h" #include "unit_tests/mocks/mock_graphics_allocation.h" #include "unit_tests/mocks/mock_memory_manager.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "gtest/gtest.h" using namespace OCLRT; @@ -324,9 +323,6 @@ TEST(MemObj, givenMultipleMemObjectsWithReusedGraphicsAllocationWhenDestroyedThe MockContext context; context.setMemoryManager(&memoryManager); - MemoryManagementFixture memoryLeaksCheck; - memoryLeaksCheck.SetUp(); - auto allocation = memoryManager.allocateGraphicsMemory(1); std::unique_ptr memObj1(new MemObj(&context, CL_MEM_OBJECT_BUFFER, 0, 1, nullptr, nullptr, allocation, true, false, false)); @@ -346,7 +342,4 @@ TEST(MemObj, givenMultipleMemObjectsWithReusedGraphicsAllocationWhenDestroyedThe EXPECT_EQ(1u, allocation->peekReuseCount()); memObj2.reset(nullptr); - - // GraphicsAllocation should be removed by last memObj - memoryLeaksCheck.TearDown(); } diff --git a/unit_tests/memory_manager/address_mapper_tests.cpp b/unit_tests/memory_manager/address_mapper_tests.cpp index dc1fd9cfd4..eb97b03da2 100644 --- a/unit_tests/memory_manager/address_mapper_tests.cpp +++ b/unit_tests/memory_manager/address_mapper_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,23 +26,20 @@ #include "runtime/memory_manager/address_mapper.h" #include "test.h" #include "gtest/gtest.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/helpers/memory_management.h" #include using namespace OCLRT; -class AddressMapperFixture : public MemoryManagementFixture { +class AddressMapperFixture { public: - void SetUp() override { - MemoryManagementFixture::SetUp(); + void SetUp() { mapper = new AddressMapper(); } - void TearDown() override { + void TearDown() { delete mapper; - MemoryManagementFixture::TearDown(); } AddressMapper *mapper; }; diff --git a/unit_tests/memory_manager/page_table_tests.cpp b/unit_tests/memory_manager/page_table_tests.cpp index 97cfd581a0..5b8957fd61 100644 --- a/unit_tests/memory_manager/page_table_tests.cpp +++ b/unit_tests/memory_manager/page_table_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -25,7 +25,6 @@ #include "runtime/memory_manager/page_table.h" #include "test.h" #include "gtest/gtest.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/helpers/memory_management.h" #include @@ -87,19 +86,17 @@ class GGTTPageTable : public PDPE { } }; -class PageTableFixture : public MemoryManagementFixture, public PTEFixture { +class PageTableFixture : public PTEFixture { protected: const uintptr_t refAddr = (uintptr_t(1) << IntSelector<46, 31, is64Bit>::value); public: - void SetUp() override { - MemoryManagementFixture::SetUp(); + void SetUp() { PTEFixture::SetUp(); } - void TearDown() override { + void TearDown() { PTEFixture::TearDown(); - MemoryManagementFixture::TearDown(); } }; diff --git a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp b/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp index 48d5c4fa73..d7bf8530ef 100644 --- a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp +++ b/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp @@ -22,26 +22,15 @@ #include "runtime/os_interface/linux/drm_command_stream.h" #include "runtime/os_interface/linux/drm_memory_manager.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/os_interface/linux/device_command_stream_fixture.h" #include "test.h" using namespace OCLRT; -class DrmCommandStreamMMFixture : public MemoryManagementFixture { - public: - void SetUp() override { - MemoryManagementFixture::SetUp(); - } - - void TearDown() override { - MemoryManagementFixture::TearDown(); - } +class DrmCommandStreamMMTest : public ::testing::Test { }; -typedef Test DrmCommandStreamMMTest; - HWTEST_F(DrmCommandStreamMMTest, MMwithPinBB) { DebugManagerStateRestore dbgRestorer; { diff --git a/unit_tests/platform/platform_tests.cpp b/unit_tests/platform/platform_tests.cpp index dbe68a0dd0..d0fd4cff0a 100644 --- a/unit_tests/platform/platform_tests.cpp +++ b/unit_tests/platform/platform_tests.cpp @@ -24,7 +24,6 @@ #include "runtime/device/device.h" #include "runtime/platform/extensions.h" #include "runtime/sharings/sharing_factory.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/fixtures/platform_fixture.h" #include "unit_tests/mocks/mock_async_event_handler.h" #include "unit_tests/mocks/mock_csr.h" @@ -34,7 +33,7 @@ using namespace OCLRT; -struct PlatformTest : public MemoryManagementFixture, public ::testing::Test { +struct PlatformTest : public ::testing::Test { PlatformTest() {} void SetUp() override { pPlatform = platform(); } @@ -200,4 +199,4 @@ TEST_F(PlatformTest, testRemoveLastSpace) { std::string xSpaceString = "x "; removeLastSpace(xSpaceString); EXPECT_EQ(std::string("x"), xSpaceString); -} \ No newline at end of file +} diff --git a/unit_tests/platform/platform_tests_mt.cpp b/unit_tests/platform/platform_tests_mt.cpp index f9c2461ad0..001b1fed7d 100644 --- a/unit_tests/platform/platform_tests_mt.cpp +++ b/unit_tests/platform/platform_tests_mt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -21,13 +21,12 @@ */ #include "runtime/helpers/options.h" -#include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/fixtures/platform_fixture.h" #include "gtest/gtest.h" using namespace OCLRT; -struct PlatformTestMt : public MemoryManagementFixture, public ::testing::Test { +struct PlatformTestMt : public ::testing::Test { PlatformTestMt() {} void SetUp() override { pPlatform = platform(); }