Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

ULTs cleanup

Browse Source 
- removing more occurences of unused MemoryManagerFixture

Change-Id: I4d2d03536b26a54024e09877cf1bf48dcbf8559a
This commit is contained in:
Artur Harasimiuk
2018-03-29 19:44:20 +02:00
committed by sys_ocldev
parent cef24fdd4d
commit 0432d117ca
17 changed files with 32 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unit_tests/api/cl_api_tests.cpp
View File

@ -36,7 +36,6 @@ api_fixture::api_fixture()
}
void api_fixture::SetUp() {
MemoryManagementFixture::SetUp();
PlatformFixture::SetUp(numPlatformDevices, platformDevices);
ASSERT_EQ(retVal, CL_SUCCESS);
@ -63,15 +62,12 @@ void api_fixture::TearDown() {
BuiltInFixture::TearDown();
PlatformFixture::TearDown();
MemoryManagementFixture::TearDown();
}
void api_fixture_using_aligned_memory_manager::SetUp() {
retVal = CL_SUCCESS;
retSize = 0;
MemoryManagementFixture::SetUp();
device = Device::create<MockAlignedMallocManagerDevice>(*platformDevices);
Device *devPtr = reinterpret_cast<Device *>(device);
cl_device_id clDevice = devPtr;
@ -98,6 +94,5 @@ void api_fixture_using_aligned_memory_manager::TearDown() {
delete device;
BuiltInFixture::TearDown();
MemoryManagementFixture::TearDown();
}
} // namespace OCLRT

7
unit_tests/api/cl_api_tests.h
View File

@ -22,7 +22,6 @@
#pragma once
#include "gtest/gtest.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/fixtures/platform_fixture.h"
#include "unit_tests/fixtures/built_in_fixture.h"
#include "runtime/api/api.h"
@ -38,8 +37,7 @@ class MockKernel;
class MockProgram;
class MockAlignedMallocManagerDevice;
struct api_fixture : public MemoryManagementFixture,
public PlatformFixture,
struct api_fixture : public PlatformFixture,
public BuiltInFixture {
using BuiltInFixture::SetUp;
using PlatformFixture::SetUp;
@ -70,8 +68,7 @@ struct api_tests : public api_fixture,
}
};
struct api_fixture_using_aligned_memory_manager : public MemoryManagementFixture,
public BuiltInFixture {
struct api_fixture_using_aligned_memory_manager : public BuiltInFixture {
using BuiltInFixture::SetUp;
public:

4
unit_tests/api/cl_create_command_queue_with_properties_tests.cpp
View File

@ -27,6 +27,7 @@
#include "runtime/device/device.h"
#include "runtime/device_queue/device_queue.h"
#include "runtime/helpers/base_object.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/mocks/mock_context.h"
using namespace OCLRT;
@ -56,16 +57,19 @@ struct CommandQueueWithPropertiesTest : public api_fixture,
};
struct clCreateCommandQueueWithPropertiesApi : public api_fixture,
public MemoryManagementFixture,
public ::testing::Test {
clCreateCommandQueueWithPropertiesApi() {
}
void SetUp() override {
MemoryManagementFixture::SetUp();
api_fixture::SetUp();
}
void TearDown() override {
api_fixture::TearDown();
MemoryManagementFixture::TearDown();
}
};