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

Fixed sticky INFO (which persisted across TEST_CASEs) from #152 and generated build 18

Browse Source
This commit is contained in:
Phil Nash
2013-02-04 00:05:16 +00:00
parent fb944f2b6b
commit d768b1b7f9
6 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
single_include/catch.hpp
View File

@@ -1,6 +1,6 @@
/*
* CATCH v0.9 build 17 (integration branch)
* Generated: 2013-02-02 20:37:06.007152
* CATCH v0.9 build 18 (integration branch)
* Generated: 2013-02-04 00:03:53.198397
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -4594,6 +4594,7 @@ namespace Catch {
try {
m_lastAssertionInfo = AssertionInfo( "TEST_CASE", m_runningTest->getTestCase().getTestCaseInfo().lineInfo, "", ResultDisposition::Normal );
m_runningTest->reset();
if( m_reporter->getPreferences().shouldRedirectStdOut ) {
StreamRedirect coutRedir( std::cout, redirectedCout );
StreamRedirect cerrRedir( std::cerr, redirectedCerr );
@@ -4612,6 +4613,7 @@ namespace Catch {
exResult << translateActiveException();
actOnCurrentResult( exResult.buildResult( m_lastAssertionInfo ) );
}
m_messages.clear();
}
private:
@@ -5814,7 +5816,7 @@ namespace Catch {
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion( 0, 9, 17, "integration" );
Version libraryVersion( 0, 9, 18, "integration" );
}
// #included from: catch_line_wrap.hpp