removing MMF from DeviceTest

Change-Id: I023108c137e21ec63bcd3a17ad69489282084591
This commit is contained in:
Artur Harasimiuk
2018-03-29 20:37:43 +02:00
committed by sys_ocldev
parent a8597ac162
commit cef24fdd4d
3 changed files with 6 additions and 42 deletions

View File

@ -25,7 +25,6 @@
#include "unit_tests/helpers/debug_manager_state_restore.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/mocks/mock_context.h"
#include "unit_tests/mocks/mock_csr.h"
#include "unit_tests/libult/create_command_stream.h"
@ -34,19 +33,8 @@
#include "runtime/device/device.h"
using namespace OCLRT;
struct DeviceTest : public DeviceFixture,
public MemoryManagementFixture,
public ::testing::Test {
void SetUp() override {
MemoryManagementFixture::SetUp();
DeviceFixture::SetUp();
}
void TearDown() override {
DeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
};
typedef Test<DeviceFixture> DeviceTest;
TEST_F(DeviceTest, Create) {
EXPECT_NE(nullptr, pDevice);
@ -155,4 +143,4 @@ TEST(DeviceCleanup, givenDeviceWhenItIsDestroyedThenFlushBatchedSubmissionsIsCal
mockDevice.reset(nullptr);
EXPECT_EQ(1, flushedBatchedSubmissionsCalledCount);
}
}

View File

@ -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,23 +21,11 @@
*/
#include "unit_tests/fixtures/device_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "test.h"
using namespace OCLRT;
struct DeviceTest : public DeviceFixture,
public MemoryManagementFixture,
public ::testing::Test {
void SetUp() override {
MemoryManagementFixture::SetUp();
DeviceFixture::SetUp();
}
void TearDown() override {
DeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
};
typedef Test<DeviceFixture> DeviceTest;
BXTTEST_F(DeviceTest, getSupportedClVersion12Device) {
auto version = pDevice->getSupportedClVersion();

View File

@ -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,23 +21,11 @@
*/
#include "unit_tests/fixtures/device_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "test.h"
using namespace OCLRT;
struct DeviceTest : public DeviceFixture,
public MemoryManagementFixture,
public ::testing::Test {
void SetUp() override {
MemoryManagementFixture::SetUp();
DeviceFixture::SetUp();
}
void TearDown() override {
DeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
};
typedef Test<DeviceFixture> DeviceTest;
SKLTEST_F(DeviceTest, getSupportedClVersion21Device) {
auto version = pDevice->getSupportedClVersion();