ULTs: more MemoryManagementFixture cleanup

Change-Id: Iaeb60c9c9e22baf63ff01419a5a6dde1e1652a47

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<MemoryManagementFixture> 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(),

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;