mirror of
https://github.com/catchorg/Catch2.git
synced 2024-12-23 03:43:28 +01:00
Build 20
This commit is contained in:
parent
f6d2fef26b
commit
eb760f689b
@ -1,6 +1,6 @@
|
|||||||
![catch logo](catch-logo-small.png)
|
![catch logo](catch-logo-small.png)
|
||||||
|
|
||||||
*v1.0 build 19 (master branch)*
|
*v1.0 build 20 (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)
|
||||||
|
|
||||||
|
@ -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, 19, "master" );
|
Version libraryVersion( 1, 0, 20, "master" );
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* CATCH v1.0 build 19 (master branch)
|
* CATCH v1.0 build 20 (master branch)
|
||||||
* Generated: 2013-12-14 23:16:21.805565
|
* Generated: 2013-12-18 08:38:15.171445
|
||||||
* ----------------------------------------------------------
|
* ----------------------------------------------------------
|
||||||
* 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.
|
||||||
@ -6166,7 +6166,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, 19, "master" );
|
Version libraryVersion( 1, 0, 20, "master" );
|
||||||
}
|
}
|
||||||
|
|
||||||
// #included from: catch_text.hpp
|
// #included from: catch_text.hpp
|
||||||
@ -6739,9 +6739,15 @@ namespace Catch {
|
|||||||
std::string stdOut;
|
std::string stdOut;
|
||||||
std::string stdErr;
|
std::string stdErr;
|
||||||
};
|
};
|
||||||
friend bool operator == ( Ptr<SectionNode> const& node, SectionInfo const& other ) {
|
|
||||||
return node->stats.sectionInfo.lineInfo == other.lineInfo;
|
struct BySectionInfo {
|
||||||
}
|
BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
|
||||||
|
bool operator() ( Ptr<SectionNode> const& node ) const {
|
||||||
|
return node->stats.sectionInfo.lineInfo == m_other.lineInfo;
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
SectionInfo const& m_other;
|
||||||
|
};
|
||||||
|
|
||||||
typedef Node<TestCaseStats, SectionNode> TestCaseNode;
|
typedef Node<TestCaseStats, SectionNode> TestCaseNode;
|
||||||
typedef Node<TestGroupStats, TestCaseNode> TestGroupNode;
|
typedef Node<TestGroupStats, TestCaseNode> TestGroupNode;
|
||||||
@ -6769,7 +6775,9 @@ namespace Catch {
|
|||||||
else {
|
else {
|
||||||
SectionNode& parentNode = *m_sectionStack.back();
|
SectionNode& parentNode = *m_sectionStack.back();
|
||||||
SectionNode::ChildSections::const_iterator it =
|
SectionNode::ChildSections::const_iterator it =
|
||||||
std::find( parentNode.childSections.begin(), parentNode.childSections.end(), sectionInfo );
|
std::find_if( parentNode.childSections.begin(),
|
||||||
|
parentNode.childSections.end(),
|
||||||
|
BySectionInfo( sectionInfo ) );
|
||||||
if( it == parentNode.childSections.end() ) {
|
if( it == parentNode.childSections.end() ) {
|
||||||
node = new SectionNode( incompleteStats );
|
node = new SectionNode( incompleteStats );
|
||||||
parentNode.childSections.push_back( node );
|
parentNode.childSections.push_back( node );
|
||||||
|
Loading…
Reference in New Issue
Block a user