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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/catch_config.cpp
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-04-12 21:22:43 +0200
committerMartin Hořeňovský2022-04-13 15:00:50 +0200
commit79d1e8238135427a6780a6db2cdb8b9be0b7f086 (patch)
tree13b7a82bbad094af77171b2807b5d9241acc1721 /src/catch2/catch_config.cpp
parent4f09f1120ba0a28f218a00821a8347a443042ecb (diff)
downloadcatch3-79d1e8238135427a6780a6db2cdb8b9be0b7f086.tar.gz
Store IStream instance owning ptrs in reporter instances
This ended up being a surprisingly large refactoring, motivated by removing a `const_cast` from `Config`'s handling of reporter streams, forced by previous commit.
Diffstat (limited to 'src/catch2/catch_config.cpp')
-rw-r--r--src/catch2/catch_config.cpp26
1 files changed, 15 insertions, 11 deletions
diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp
index 9f112bd8..32d40410 100644
--- a/src/catch2/catch_config.cpp
+++ b/src/catch2/catch_config.cpp
@@ -76,20 +76,28 @@ namespace Catch {
}
#endif
+
+ // We now fixup the reporter specs to handle default output spec,
+ // default colour spec, etc
bool defaultOutputUsed = false;
- m_reporterStreams.reserve( m_data.reporterSpecifications.size() );
- for ( auto const& reporterSpec : m_data.reporterSpecifications ) {
+ for ( auto& reporterSpec : m_data.reporterSpecifications ) {
if ( reporterSpec.outputFile().none() ) {
CATCH_ENFORCE( !defaultOutputUsed,
"Internal error: cannot use default output for "
"multiple reporters" );
defaultOutputUsed = true;
- m_reporterStreams.push_back(
- makeStream( data.defaultOutputFilename ) );
- } else {
- m_reporterStreams.push_back(
- makeStream( *reporterSpec.outputFile() ) );
+ reporterSpec = ReporterSpec{ reporterSpec.name(),
+ data.defaultOutputFilename,
+ reporterSpec.colourMode(),
+ reporterSpec.customOptions() };
+ }
+
+ if ( reporterSpec.colourMode().none() ) {
+ reporterSpec = ReporterSpec{ reporterSpec.name(),
+ reporterSpec.outputFile(),
+ data.defaultColourMode,
+ reporterSpec.customOptions() };
}
}
}
@@ -108,10 +116,6 @@ namespace Catch {
return m_data.reporterSpecifications;
}
- IStream* Config::getReporterOutputStream(std::size_t reporterIdx) const {
- return const_cast<IStream*>(m_reporterStreams.at(reporterIdx).get());
- }
-
TestSpec const& Config::testSpec() const { return m_testSpec; }
bool Config::hasTestFilters() const { return m_hasTestFilters; }