From e1103a80ca1abd7aeda615d0addfa6f6abae664d Mon Sep 17 00:00:00 2001
From: Moritz Pflanzer <moritz.pflanzer@arm.com>
Date: Tue, 18 Jul 2017 12:20:45 +0100
Subject: COMPMID-415: Fix failed expectations

Change-Id: I53dfdb6fcfa6318b8ca43b373941aa8233c8e6d1
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80898
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
---
 framework/Framework.cpp | 14 +++++++++++---
 framework/Framework.h   |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'framework')

diff --git a/framework/Framework.cpp b/framework/Framework.cpp
index c25b3e5d4c..1f09550830 100644
--- a/framework/Framework.cpp
+++ b/framework/Framework.cpp
@@ -147,6 +147,11 @@ void Framework::log_test_end(const std::string &test_name)
 void Framework::log_failed_expectation(const std::string &msg)
 {
     std::cerr << "ERROR: " << msg << "\n";
+
+    if(_current_test_result != nullptr)
+    {
+        _current_test_result->status = TestResult::Status::FAILED;
+    }
 }
 
 int Framework::num_iterations() const
@@ -201,7 +206,9 @@ void Framework::run_test(TestCaseFactory &test_factory)
     log_test_start(test_case_name);
 
     Profiler   profiler = get_profiler();
-    TestResult result;
+    TestResult result(TestResult::Status::SUCCESS);
+
+    _current_test_result = &result;
 
     try
     {
@@ -219,8 +226,6 @@ void Framework::run_test(TestCaseFactory &test_factory)
             }
 
             test_case->do_teardown();
-
-            result.status = TestResult::Status::SUCCESS;
         }
         catch(const TestError &error)
         {
@@ -265,6 +270,7 @@ void Framework::run_test(TestCaseFactory &test_factory)
     catch(...)
     {
         std::cerr << "FATAL ERROR: Received unhandled exception during fixture creation\n";
+        result.status = TestResult::Status::CRASHED;
 
         if(_throw_errors)
         {
@@ -272,6 +278,8 @@ void Framework::run_test(TestCaseFactory &test_factory)
         }
     }
 
+    _current_test_result = nullptr;
+
     result.measurements = profiler.measurements();
 
     set_test_result(test_case_name, result);
diff --git a/framework/Framework.h b/framework/Framework.h
index a7d8a15541..2fb81ee40f 100644
--- a/framework/Framework.h
+++ b/framework/Framework.h
@@ -261,6 +261,7 @@ private:
     std::regex     _test_name_filter{ ".*" };
     std::regex     _test_id_filter{ ".*" };
     DatasetMode    _dataset_mode{ DatasetMode::ALL };
+    TestResult    *_current_test_result{ nullptr };
 };
 
 template <typename T>
-- 
cgit v1.2.1