IVGCVSW-1709: Clean up memory manager bodge

 * Added quick workaround for the memory management errors in the
   CL/Neon unit tests

Change-Id: I56250db462cdbdc1acc0a5824807d288fb0c1d11

1 files changed, 2 insertions, 14 deletions

diff --git a/src/backends/cl/test/ClContextControlFixture.hpp b/src/backends/cl/test/ClContextControlFixture.hpp
index 52e34147bb..0371c69a0b 100644
--- a/src/backends/cl/test/ClContextControlFixture.hpp
+++ b/src/backends/cl/test/ClContextControlFixture.hpp
@@ -6,26 +6,14 @@
 #pragma once
 
 #include <cl/ClContextControl.hpp>
+#include <backendsCommon/WorkloadFactory.hpp>
 
 template<bool ProfilingEnabled>
 struct ClContextControlFixtureBase
 {
-    static ClContextControlFixtureBase*& Instance()
-    {
-        static ClContextControlFixtureBase* s_Instance = nullptr;
-        return s_Instance;
-    }
-
     // Initialising ClContextControl to ensure OpenCL is loaded correctly for each test case
     ClContextControlFixtureBase()
-        : m_ClContextControl(nullptr, ProfilingEnabled)
-    {
-        Instance() = this;
-    }
-    ~ClContextControlFixtureBase()
-    {
-        Instance() = nullptr;
-    }
+        : m_ClContextControl(nullptr, ProfilingEnabled) {}
 
     armnn::ClContextControl m_ClContextControl;
 };