From 2cf2ef54154ad6a8278ceb034ac1a9f663d56a1f Mon Sep 17 00:00:00 2001
From: Niklas Hauser <niklas.hauser@arm.com>
Date: Fri, 13 Nov 2015 13:20:20 +0000
Subject: [PATCH] Move default handlers into specification.

---
 "frameworks\\utest/source/harness.cpp" | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git "a/frameworks\\utest/source/harness.cpp" "b/frameworks\\utest/source/harness.cpp"
index eac7c0257c..bbebf6bc7d 100644
--- "a/frameworks\\utest/source/harness.cpp"
+++ "b/frameworks\\utest/source/harness.cpp"
@@ -42,7 +42,7 @@ namespace
     size_t case_failed = 0;
     size_t case_failed_before = 0;
 
-    handlers_t defaults = greentea_handlers;
+    handlers_t defaults = default_handlers;
     handlers_t handlers = defaults;
 }
 
@@ -50,17 +50,13 @@ static void die() {
     while(1) ;
 }
 
-void Harness::set_default_handlers(const handlers_t defaults)
-{
-    ::defaults = defaults;
-}
-
 void Harness::run(const Specification specification)
 {
     util::CriticalSectionLock lock;
 
     test_cases = specification.cases;
     test_length = specification.length;
+    defaults = specification.defaults;
     handlers.test_set_up = defaults.get_handler(specification.set_up_handler);
     handlers.test_tear_down = defaults.get_handler(specification.tear_down_handler);