commit edc5ffa62ab7c552539956eba8bb1d56fb48057c
author Kevin May <kevin.may@arm.com> Wed May 22 12:02:53 2019 +0100
committer Kevin May <kevin.may@arm.com> Thu May 23 16:22:21 2019 +0100
tree 553ae127123aa59ebc2823db91e6b7639edee6fa
parent c6494ccc24d5db72e1a6afc0f71c18b5016027e8

IVGCVSW-3116 Fix failing NN Driver Tests on Android Q

	* Refactor Convolution2d Unit test for fp16Enabled
	* Disable GpuAcc for Unit tests in Android Q

Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I9613eb325841bdf7d25abf51259fe2f5d973c929

test/Merger.cpp

diff --git a/test/Merger.cpp b/test/Merger.cpp
index 16ac451..9b3d847 100644
--- a/test/Merger.cpp
+++ b/test/Merger.cpp
@@ -19,7 +19,11 @@
 namespace
 {
 
-static const boost::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::GpuAcc }};
+#ifndef ARMCOMPUTECL_ENABLED
+    static const boost::array<armnn::Compute, 1> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef }};
+#else
+    static const boost::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::GpuAcc }};
+#endif
 
 void
 MergerTestImpl(const std::vector<const TestTensor*> & inputs,