Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2012-09-24 08:28:23 +0100
committerPhil Nash2012-09-24 08:28:23 +0100
commitec2fccf6b80b4dbbc0f18f77ec9fee556cca34b5 (patch)
treea86c88e96127eb7464eeb20e7d8bfc0eece940a7 /include
parent5f66d1d0017b89d7e4e77d9cb80c2acdae58438c (diff)
downloadcatch3-ec2fccf6b80b4dbbc0f18f77ec9fee556cca34b5.tar.gz
Fixed SCOPED_INFO (#123)
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_capture.hpp4
-rw-r--r--include/internal/catch_runner_impl.hpp16
2 files changed, 14 insertions, 6 deletions
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp
index c4f28757..379cc24c 100644
--- a/include/internal/catch_capture.hpp
+++ b/include/internal/catch_capture.hpp
@@ -35,8 +35,8 @@ public:
return *this;
}
- std::string getInfo () const {
- return m_oss.str();
+ ResultInfo getInfo () const {
+ return ResultInfo( "", ResultWas::Info, false, SourceLineInfo(), "SCOPED_INFO", m_oss.str().c_str() );
}
private:
diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp
index 578d26dd..314182f4 100644
--- a/include/internal/catch_runner_impl.hpp
+++ b/include/internal/catch_runner_impl.hpp
@@ -156,10 +156,18 @@ namespace Catch {
else if( !result.ok() ) {
m_totals.assertions.failed++;
- std::vector<ResultInfo>::const_iterator it = m_info.begin();
- std::vector<ResultInfo>::const_iterator itEnd = m_info.end();
- for(; it != itEnd; ++it )
- m_reporter->Result( *it );
+ {
+ std::vector<ScopedInfo*>::const_iterator it = m_scopedInfos.begin();
+ std::vector<ScopedInfo*>::const_iterator itEnd = m_scopedInfos.end();
+ for(; it != itEnd; ++it )
+ m_reporter->Result( (*it)->getInfo() );
+ }
+ {
+ std::vector<ResultInfo>::const_iterator it = m_info.begin();
+ std::vector<ResultInfo>::const_iterator itEnd = m_info.end();
+ for(; it != itEnd; ++it )
+ m_reporter->Result( *it );
+ }
m_info.clear();
}