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-01-01 16:19:31 +0100
committerGitHub2022-01-01 16:19:31 +0100
commitf2f585b4788b61ed202e78b73b105f099d9cce7b (patch)
tree174f72ba09e22e564a571f96c21a175a68d85103 /src/catch2/catch_session.cpp
parent6b55f5d780c5d8e935720f9d7d8ed28a3ba8617f (diff)
parentb5547f2ef6be18f70d2e9638d8f1eb0d8d42d2ba (diff)
downloadcatch3-f2f585b4788b61ed202e78b73b105f099d9cce7b.tar.gz
Merge pull request #2183 from mjerabek/dev-multiple-reporters
Add support for multiple reporters
Diffstat (limited to 'src/catch2/catch_session.cpp')
-rw-r--r--src/catch2/catch_session.cpp20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/catch2/catch_session.cpp b/src/catch2/catch_session.cpp
index 38111fe8..2325bf2f 100644
--- a/src/catch2/catch_session.cpp
+++ b/src/catch2/catch_session.cpp
@@ -34,7 +34,7 @@ namespace Catch {
namespace {
const int MaxExitCode = 255;
- IStreamingReporterPtr createReporter(std::string const& reporterName, IConfig const* config) {
+ IStreamingReporterPtr createReporter(std::string const& reporterName, ReporterConfig const& config) {
auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << '\'');
@@ -42,16 +42,26 @@ namespace Catch {
}
IStreamingReporterPtr makeReporter(Config const* config) {
- if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
- return createReporter(config->getReporterName(), config);
+ if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()
+ && config->getReportersAndOutputFiles().size() == 1) {
+ auto& stream = config->getReporterOutputStream(0);
+ return createReporter(config->getReportersAndOutputFiles()[0].reporterName, ReporterConfig(config, stream));
}
auto multi = Detail::make_unique<ListeningReporter>(config);
+
auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
for (auto const& listener : listeners) {
- multi->addListener(listener->create(Catch::ReporterConfig(config)));
+ multi->addListener(listener->create(Catch::ReporterConfig(config, config->defaultStream())));
+ }
+
+ std::size_t reporterIdx = 0;
+ for (auto const& reporterAndFile : config->getReportersAndOutputFiles()) {
+ auto& stream = config->getReporterOutputStream(reporterIdx);
+ multi->addReporter(createReporter(reporterAndFile.reporterName, ReporterConfig(config, stream)));
+ reporterIdx++;
}
- multi->addReporter(createReporter(config->getReporterName(), config));
+
return multi;
}