From 6b06953732a7da4ff2446d69c2fcafed69c5008a Mon Sep 17 00:00:00 2001
From: John Richardson <john.richardson@arm.com>
Date: Fri, 27 Apr 2018 12:55:37 +0100
Subject: COMPMID-1087: Fix CLHOGDetector failure.

Change-Id: Ied0fbbd50f1e4dcf930798bc3b735cb70329017d
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/129313
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
---
 tests/validation/CL/HOGDetector.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'tests/validation/CL/HOGDetector.cpp')

diff --git a/tests/validation/CL/HOGDetector.cpp b/tests/validation/CL/HOGDetector.cpp
index dcf35091a1..6c2c18c3ea 100644
--- a/tests/validation/CL/HOGDetector.cpp
+++ b/tests/validation/CL/HOGDetector.cpp
@@ -65,25 +65,24 @@ using CLHOGDetectorFixture = HOGDetectorValidationFixture<CLTensor,
                                                           uint8_t,
                                                           float>;
 
-// TODO (COMPMID-1087) : CLHOGDetector fails on hikey
-DISABLED_FIXTURE_DATA_TEST_CASE(RunSmall, CLHOGDetectorFixture, framework::DatasetMode::PRECOMMIT,
-                                combine(combine(combine(
-                                DetectionWindowStrideDataset,
-                                datasets::SmallHOGDescriptorDataset()),
-                                framework::dataset::make("Format", Format::U8)),
-                                framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE})))
+FIXTURE_DATA_TEST_CASE(RunSmall, CLHOGDetectorFixture, framework::DatasetMode::PRECOMMIT,
+                       combine(combine(combine(
+                       DetectionWindowStrideDataset,
+                       datasets::SmallHOGDescriptorDataset()),
+                       framework::dataset::make("Format", Format::U8)),
+                       framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE})))
 
 {
     // Validate output
     validate_detection_windows(_target.begin(), _target.end(), _reference.begin(), _reference.end(), tolerance);
 }
 
-DISABLED_FIXTURE_DATA_TEST_CASE(RunLarge, CLHOGDetectorFixture, framework::DatasetMode::NIGHTLY,
-                                combine(combine(combine(
-                                DetectionWindowStrideDataset,
-                                datasets::LargeHOGDescriptorDataset()),
-                                framework::dataset::make("Format", Format::U8)),
-                                framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE})))
+FIXTURE_DATA_TEST_CASE(RunLarge, CLHOGDetectorFixture, framework::DatasetMode::NIGHTLY,
+                       combine(combine(combine(
+                       DetectionWindowStrideDataset,
+                       datasets::LargeHOGDescriptorDataset()),
+                       framework::dataset::make("Format", Format::U8)),
+                       framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE})))
 {
     // Validate output
     validate_detection_windows(_target.begin(), _target.end(), _reference.begin(), _reference.end(), tolerance);
-- 
cgit v1.2.1