3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-20 19:45:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'reevaluate' into dev-modernize

Browse Source
This commit is contained in:
Phil Nash
2017-08-10 16:18:05 +01:00
parent 3382312bd8 ee9b19efd3
commit 97c06ca6fb
45 changed files with 726 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/internal/catch_run_context.hpp
View File

@@ -19,7 +19,7 @@
#include "catch_test_spec.hpp"
#include "catch_test_case_tracker.hpp"
#include "catch_timer.h"
#include "catch_result_builder.h"
#include "catch_assertionhandler.h"
#include "catch_fatal_condition.h"
#include <string>
@@ -117,15 +117,13 @@ namespace Catch {
private:
ResultBuilder makeUnexpectedResultBuilder() const;
void handleUnfinishedSections();
TestRunInfo m_runInfo;
IMutableContext& m_context;
TestCase const* m_activeTestCase = nullptr;
ITracker* m_testCaseTracker;
AssertionResult m_lastResult;
Option<AssertionResult> m_lastResult;
IConfigPtr m_config;
Totals m_totals;