From a097d2a0ed8e30d5aaf6d29ec18d0c39201b7b67 Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
Date: Wed, 24 Nov 2021 15:47:28 +0000
Subject: IVGCVSW-6453 'Move the ArmNN Test Utils code to a physically separate
 directory'

* Created include/armnnTestUtils directory
* Moved Arm NN test utils files into armnnTestUtils directory

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I03ac54c645c41c52650c4c03b6a58fb1481fef5d
---
 src/backends/aclCommon/test/CMakeLists.txt           | 1 +
 src/backends/aclCommon/test/CreateWorkloadClNeon.hpp | 4 ++--
 src/backends/aclCommon/test/MemCopyTestImpl.hpp      | 9 ++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/backends/aclCommon')

diff --git a/src/backends/aclCommon/test/CMakeLists.txt b/src/backends/aclCommon/test/CMakeLists.txt
index 756ef4aa28..7eb232a643 100644
--- a/src/backends/aclCommon/test/CMakeLists.txt
+++ b/src/backends/aclCommon/test/CMakeLists.txt
@@ -13,6 +13,7 @@ list(APPEND armnnAclCommonUnitTests_sources
 add_library(armnnAclCommonUnitTests OBJECT ${armnnAclCommonUnitTests_sources})
 target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
 target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
+target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnTestUtils)
 target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends)
 target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling)
 target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include)
diff --git a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp
index bdae9988ed..6a0d5cf766 100644
--- a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp
+++ b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp
@@ -4,8 +4,8 @@
 //
 #pragma once
 
-#include <test/CreateWorkload.hpp>
-#include <test/PredicateResult.hpp>
+#include <CreateWorkload.hpp>
+#include <armnnTestUtils/PredicateResult.hpp>
 #include <armnn/utility/PolymorphicDowncast.hpp>
 #include <backendsCommon/MemCopyWorkload.hpp>
 #include <reference/RefWorkloadFactory.hpp>
diff --git a/src/backends/aclCommon/test/MemCopyTestImpl.hpp b/src/backends/aclCommon/test/MemCopyTestImpl.hpp
index 91ba4eae17..d943cfd8c0 100644
--- a/src/backends/aclCommon/test/MemCopyTestImpl.hpp
+++ b/src/backends/aclCommon/test/MemCopyTestImpl.hpp
@@ -5,15 +5,14 @@
 #pragma once
 
 #include <ResolveType.hpp>
-
 #include <armnn/backends/IBackendInternal.hpp>
 
-#include <backendsCommon/test/LayerTests.hpp>
-#include <backendsCommon/test/TensorCopyUtils.hpp>
-#include <backendsCommon/test/WorkloadFactoryHelper.hpp>
+#include <test/TensorHelpers.hpp>
 #include <backendsCommon/test/WorkloadTestUtils.hpp>
 
-#include <test/TensorHelpers.hpp>
+#include <armnnTestUtils/LayerTestResult.hpp>
+#include <armnnTestUtils/TensorCopyUtils.hpp>
+#include <backendsCommon/test/WorkloadFactoryHelper.hpp>
 
 namespace
 {
-- 
cgit v1.2.1