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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/catch_session.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_session.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_session.cpp')
-rw-r--r--src/catch2/catch_session.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/catch2/catch_session.cpp b/src/catch2/catch_session.cpp
index 5af8f454..048fd915 100644
--- a/src/catch2/catch_session.cpp
+++ b/src/catch2/catch_session.cpp
@@ -34,8 +34,8 @@ namespace Catch {
namespace {
const int MaxExitCode = 255;
- IEventListenerPtr createReporter(std::string const& reporterName, ReporterConfig const& config) {
- auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
+ IEventListenerPtr createReporter(std::string const& reporterName, ReporterConfig&& config) {
+ auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, CATCH_MOVE(config));
CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << '\'');
return reporter;
@@ -45,13 +45,12 @@ namespace Catch {
if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()
&& config->getReporterSpecs().size() == 1) {
auto const& spec = config->getReporterSpecs()[0];
- auto stream = config->getReporterOutputStream(0);
return createReporter(
- config->getReporterSpecs()[0].name(),
+ spec.name(),
ReporterConfig(
config,
- stream,
- spec.colourMode().valueOr( config->defaultColourMode() ),
+ makeStream(*spec.outputFile()),
+ *spec.colourMode(),
spec.customOptions() ) );
}
@@ -64,13 +63,11 @@ namespace Catch {
std::size_t reporterIdx = 0;
for (auto const& reporterSpec : config->getReporterSpecs()) {
- auto stream = config->getReporterOutputStream(reporterIdx);
multi->addReporter( createReporter(
reporterSpec.name(),
ReporterConfig( config,
- stream,
- reporterSpec.colourMode().valueOr(
- config->defaultColourMode() ),
+ makeStream( *reporterSpec.outputFile() ),
+ *reporterSpec.colourMode(),
reporterSpec.customOptions() ) ) );
reporterIdx++;
}