mirror of https://github.com/catchorg/Catch2.git
build 6
This commit is contained in:
parent
4b3fa4742b
commit
85b4e94192
|
@ -1,6 +1,6 @@
|
||||||
![catch logo](catch-logo-small.png)
|
![catch logo](catch-logo-small.png)
|
||||||
|
|
||||||
*v1.1 build 5 (develop branch)*
|
*v1.1 build 6 (develop branch)*
|
||||||
|
|
||||||
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
|
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
|
|
||||||
// These numbers are maintained by a script
|
// These numbers are maintained by a script
|
||||||
Version libraryVersion( 1, 1, 5, "develop" );
|
Version libraryVersion( 1, 1, 6, "develop" );
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* CATCH v1.1 build 5 (develop branch)
|
* CATCH v1.1 build 6 (develop branch)
|
||||||
* Generated: 2014-09-18 18:24:52.876757
|
* Generated: 2014-10-02 18:50:47.450525
|
||||||
* ----------------------------------------------------------
|
* ----------------------------------------------------------
|
||||||
* This file has been merged from multiple headers. Please don't edit it directly
|
* This file has been merged from multiple headers. Please don't edit it directly
|
||||||
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||||
|
@ -3819,7 +3819,7 @@ namespace Clara {
|
||||||
m_throwOnUnrecognisedTokens( other.m_throwOnUnrecognisedTokens )
|
m_throwOnUnrecognisedTokens( other.m_throwOnUnrecognisedTokens )
|
||||||
{
|
{
|
||||||
if( other.m_floatingArg.get() )
|
if( other.m_floatingArg.get() )
|
||||||
m_floatingArg = ArgAutoPtr( new Arg( *other.m_floatingArg ) );
|
m_floatingArg.reset( new Arg( *other.m_floatingArg ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
CommandLine& setThrowOnUnrecognisedTokens( bool shouldThrow = true ) {
|
CommandLine& setThrowOnUnrecognisedTokens( bool shouldThrow = true ) {
|
||||||
|
@ -3847,7 +3847,7 @@ namespace Clara {
|
||||||
ArgBuilder operator[]( UnpositionalTag ) {
|
ArgBuilder operator[]( UnpositionalTag ) {
|
||||||
if( m_floatingArg.get() )
|
if( m_floatingArg.get() )
|
||||||
throw std::logic_error( "Only one unpositional argument can be added" );
|
throw std::logic_error( "Only one unpositional argument can be added" );
|
||||||
m_floatingArg = ArgAutoPtr( new Arg() );
|
m_floatingArg.reset( new Arg() );
|
||||||
ArgBuilder builder( m_floatingArg.get() );
|
ArgBuilder builder( m_floatingArg.get() );
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
|
@ -5054,14 +5054,22 @@ namespace Catch {
|
||||||
fatal( "<unknown signal>", -sig );
|
fatal( "<unknown signal>", -sig );
|
||||||
}
|
}
|
||||||
|
|
||||||
FatalConditionHandler() {
|
FatalConditionHandler() : m_isSet( true ) {
|
||||||
for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i )
|
for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i )
|
||||||
signal( signalDefs[i].id, handleSignal );
|
signal( signalDefs[i].id, handleSignal );
|
||||||
}
|
}
|
||||||
~FatalConditionHandler() {
|
~FatalConditionHandler() {
|
||||||
|
reset();
|
||||||
|
}
|
||||||
|
void reset() {
|
||||||
|
if( m_isSet ) {
|
||||||
for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i )
|
for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i )
|
||||||
signal( signalDefs[i].id, SIG_DFL );
|
signal( signalDefs[i].id, SIG_DFL );
|
||||||
|
m_isSet = false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool m_isSet;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Catch
|
} // namespace Catch
|
||||||
|
@ -5341,6 +5349,7 @@ namespace Catch {
|
||||||
void invokeActiveTestCase() {
|
void invokeActiveTestCase() {
|
||||||
FatalConditionHandler fatalConditionHandler; // Handle signals
|
FatalConditionHandler fatalConditionHandler; // Handle signals
|
||||||
m_activeTestCase->invoke();
|
m_activeTestCase->invoke();
|
||||||
|
fatalConditionHandler.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -6640,7 +6649,7 @@ namespace Catch {
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
|
|
||||||
// These numbers are maintained by a script
|
// These numbers are maintained by a script
|
||||||
Version libraryVersion( 1, 1, 5, "develop" );
|
Version libraryVersion( 1, 1, 6, "develop" );
|
||||||
}
|
}
|
||||||
|
|
||||||
// #included from: catch_message.hpp
|
// #included from: catch_message.hpp
|
||||||
|
|
Loading…
Reference in New Issue