eden-emu/Catch2
15
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-06-02 18:07:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix for #270 (REQUIRE continues if test throws an exception).

Browse source 
Added test case that reproduced the bug then applied the fix.
This commit is contained in:
Phil Nash 2014-04-12 19:07:24 +01:00
parent e9d35377fa
commit a176b93738
9 changed files with 60 additions and 12 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 v1.0 build 33 (master branch)
* Generated: 2014-03-24 18:11:50.426554
* CATCH v1.0 build 34 (master branch)
* Generated: 2014-04-12 19:07:02.688717
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -1599,7 +1599,7 @@ struct TestFailureException{};
throw; \
} catch( ... ) { \
INTERNAL_CATCH_ACCEPT_EXPR( Catch::ExpressionResultBuilder( Catch::ResultWas::ThrewException ) << Catch::translateActiveException(), \
resultDisposition | Catch::ResultDisposition::ContinueOnFailure, expr ); \
resultDisposition, expr ); \
} \
} while( Catch::isTrue( false ) )
@ -6598,7 +6598,7 @@ namespace Catch {
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion( 1, 0, 33, "master" );
Version libraryVersion( 1, 0, 34, "master" );
}
// #included from: catch_message.hpp