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-13 14:55:05 +0200
committerMartin Hořeňovský2022-04-13 15:02:25 +0200
commita243cbae52d5599ccce07b36cfe8b2e3308d4108 (patch)
tree9d18094f4bbfa4eef34bac5d4ea1bbce8a2a4936 /src/catch2/catch_session.cpp
parent79d1e8238135427a6780a6db2cdb8b9be0b7f086 (diff)
downloadcatch3-a243cbae52d5599ccce07b36cfe8b2e3308d4108.tar.gz
Introduce type to handle reporter specs with defaults filled-in
Diffstat (limited to 'src/catch2/catch_session.cpp')
-rw-r--r--src/catch2/catch_session.cpp25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/catch2/catch_session.cpp b/src/catch2/catch_session.cpp
index 048fd915..e6ad93a1 100644
--- a/src/catch2/catch_session.cpp
+++ b/src/catch2/catch_session.cpp
@@ -43,15 +43,14 @@ namespace Catch {
IEventListenerPtr prepareReporters(Config const* config) {
if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()
- && config->getReporterSpecs().size() == 1) {
- auto const& spec = config->getReporterSpecs()[0];
+ && config->getProcessedReporterSpecs().size() == 1) {
+ auto const& spec = config->getProcessedReporterSpecs()[0];
return createReporter(
- spec.name(),
- ReporterConfig(
- config,
- makeStream(*spec.outputFile()),
- *spec.colourMode(),
- spec.customOptions() ) );
+ spec.name,
+ ReporterConfig( config,
+ makeStream( spec.outputFilename ),
+ spec.colourMode,
+ spec.customOptions ) );
}
auto multi = Detail::make_unique<MultiReporter>(config);
@@ -62,13 +61,13 @@ namespace Catch {
}
std::size_t reporterIdx = 0;
- for (auto const& reporterSpec : config->getReporterSpecs()) {
+ for ( auto const& reporterSpec : config->getProcessedReporterSpecs() ) {
multi->addReporter( createReporter(
- reporterSpec.name(),
+ reporterSpec.name,
ReporterConfig( config,
- makeStream( *reporterSpec.outputFile() ),
- *reporterSpec.colourMode(),
- reporterSpec.customOptions() ) ) );
+ makeStream( reporterSpec.outputFilename ),
+ reporterSpec.colourMode,
+ reporterSpec.customOptions ) ) );
reporterIdx++;
}