3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-23 05:46:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

build 45

Browse Source 
- fixes
This commit is contained in:
Phil Nash 2014-05-19 18:22:59 +01:00
parent 7139035906
commit ebd4888fe1
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![catch logo](catch-logo-small.png)
*v1.0 build 44 (master branch)* *v1.0 build 45 (master 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)

2
include/internal/catch_version.hpp
View File

@ -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, 0, 44, "master" ); Version libraryVersion( 1, 0, 45, "master" );
} }
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

22
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 44 (master branch) * CATCH v1.0 build 45 (master branch)
* Generated: 2014-05-16 18:53:00.411119 * Generated: 2014-05-19 18:22:42.461908
* ---------------------------------------------------------- * ----------------------------------------------------------
* 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.
@ -2711,7 +2711,7 @@ namespace Catch {
public: public:
NamePattern( std::string const& name ) : m_name( toLower( name ) ), m_wildcard( NoWildcard ) { NamePattern( std::string const& name ) : m_name( toLower( name ) ), m_wildcard( NoWildcard ) {
if( startsWith( m_name, "*" ) ) { if( startsWith( m_name, "*" ) ) {
m_name = name.substr( 1 ); m_name = m_name.substr( 1 );
m_wildcard = WildcardAtStart; m_wildcard = WildcardAtStart;
} }
if( endsWith( m_name, "*" ) ) { if( endsWith( m_name, "*" ) ) {
@ -2731,6 +2731,15 @@ namespace Catch {
case WildcardAtBothEnds: case WildcardAtBothEnds:
return contains( toLower( testCase.name ), m_name ); return contains( toLower( testCase.name ), m_name );
} }
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunreachable-code"
#endif
throw std::logic_error( "Unknown enum" );
#ifdef __clang__
#pragma clang diagnostic pop
#endif
} }
private: private:
std::string m_name; std::string m_name;
@ -2811,10 +2820,10 @@ namespace Catch {
visitChar( m_arg[m_pos] ); visitChar( m_arg[m_pos] );
if( m_mode == Name ) if( m_mode == Name )
addPattern<TestSpec::NamePattern>(); addPattern<TestSpec::NamePattern>();
addFilter();
return *this; return *this;
} }
TestSpec testSpec() { TestSpec testSpec() {
addFilter();
return m_testSpec; return m_testSpec;
} }
private: private:
@ -3950,7 +3959,7 @@ namespace Catch {
while( std::getline( f, line ) ) { while( std::getline( f, line ) ) {
line = trim(line); line = trim(line);
if( !line.empty() && !startsWith( line, "#" ) ) if( !line.empty() && !startsWith( line, "#" ) )
addTestOrTags( config, line ); addTestOrTags( config, "\"" + line + "\"" );
} }
} }
@ -6326,6 +6335,7 @@ namespace Catch {
if( tag == "hide" || tag == "." ) { if( tag == "hide" || tag == "." ) {
tags.insert( "hide" ); tags.insert( "hide" );
tags.insert( "." ); tags.insert( "." );
isHidden = true;
} }
else { else {
tags.insert( tag ); tags.insert( tag );
@ -6434,7 +6444,7 @@ namespace Catch {
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 44, "master" ); Version libraryVersion( 1, 0, 45, "master" );
} }
// #included from: catch_message.hpp // #included from: catch_message.hpp