3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-04 06:15:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add %stderr and %stdout as recognized magic stream names

Browse Source
This commit is contained in:
Martin Hořeňovský
2022-03-07 10:42:26 +01:00
parent 61d0f7a9af
commit 06f74a0f8e
19 changed files with 194 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/catch2/internal/catch_stream.cpp
View File

@@ -102,6 +102,20 @@ namespace Detail {
bool isStdout() const override { return true; }
};
class CerrStream : public IStream {
mutable std::ostream m_os;
public:
// Store the streambuf from cerr up-front because
// cout may get redirected when running tests
CerrStream(): m_os( Catch::cerr().rdbuf() ) {}
~CerrStream() override = default;
public: // IStream
std::ostream& stream() const override { return m_os; }
bool isStdout() const override { return true; }
};
///////////////////////////////////////////////////////////////////////////
class DebugOutStream : public IStream {
@@ -128,14 +142,18 @@ namespace Detail {
if ( filename.empty() || filename == "-" ) {
return Detail::make_unique<Detail::CoutStream>();
}
else if( filename[0] == '%' ) {
if( filename == "%debug" )
if( filename[0] == '%' ) {
if ( filename == "%debug" ) {
return Detail::make_unique<Detail::DebugOutStream>();
else
} else if ( filename == "%stderr" ) {
return Detail::make_unique<Detail::CerrStream>();
} else if ( filename == "%stdout" ) {
return Detail::make_unique<Detail::CoutStream>();
} else {
CATCH_ERROR( "Unrecognised stream: '" << filename << '\'' );
}
}
else
return Detail::make_unique<Detail::FileStream>( filename );
return Detail::make_unique<Detail::FileStream>( filename );
}