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

build 9

Browse Source
This commit is contained in:
Phil Nash 2014-12-15 07:26:31 +00:00
parent 7e1f21b334
commit 91c17f34eb
3 changed files with 14 additions and 13 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.1 build 8 (develop branch)* *v1.1 build 9 (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)

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, 1, 8, "develop" ); Version libraryVersion( 1, 1, 9, "develop" );
} }
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

23
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.1 build 8 (develop branch) * CATCH v1.1 build 9 (develop branch)
* Generated: 2014-12-12 08:10:57.025852 * Generated: 2014-12-15 07:26:07.689692
* ---------------------------------------------------------- * ----------------------------------------------------------
* 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.
@ -6489,7 +6489,7 @@ namespace Catch {
namespace Catch { namespace Catch {
inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) { inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
if( tag == "." || if( startsWith( tag, "." ) ||
tag == "hide" || tag == "hide" ||
tag == "!hide" ) tag == "!hide" )
return TestCaseInfo::IsHidden; return TestCaseInfo::IsHidden;
@ -6503,7 +6503,7 @@ namespace Catch {
return TestCaseInfo::None; return TestCaseInfo::None;
} }
inline bool isReservedTag( std::string const& tag ) { inline bool isReservedTag( std::string const& tag ) {
return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !isalnum( tag[0] ); return TestCaseInfo::None && tag.size() > 0 && !isalnum( tag[0] );
} }
inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) { inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
if( isReservedTag( tag ) ) { if( isReservedTag( tag ) ) {
@ -6543,14 +6543,15 @@ namespace Catch {
} }
else { else {
if( c == ']' ) { if( c == ']' ) {
enforceNotReservedTag( tag, _lineInfo ); TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
if( prop == TestCaseInfo::IsHidden )
inTag = false;
if( tag == "hide" || tag == "." )
isHidden = true; isHidden = true;
else else if( prop == TestCaseInfo::None )
tags.insert( tag ); enforceNotReservedTag( tag, _lineInfo );
tags.insert( tag );
tag.clear(); tag.clear();
inTag = false;
} }
else else
tag += c; tag += c;
@ -6668,7 +6669,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, 8, "develop" ); Version libraryVersion( 1, 1, 9, "develop" );
} }
// #included from: catch_message.hpp // #included from: catch_message.hpp