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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal/catch_test_case_tracker.cpp
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-10-22 14:20:47 +0200
committerMartin Hořeňovský2020-10-23 21:21:15 +0200
commit4c8454b5ecfc744a85cac57cf96b8de078e26db5 (patch)
tree7d33dd78d720311ebca196b714f80d484160af92 /src/catch2/internal/catch_test_case_tracker.cpp
parent8878f90323f7229b391f18e467113cb654fbdc06 (diff)
downloadcatch3-4c8454b5ecfc744a85cac57cf96b8de078e26db5.tar.gz
Fix potential infinite loops in generators combined with section filter
The problem was that under specific circumstances, namely that none of their children progressed, `GeneratorTracker` will not progress. This was changed recently, to allow for code like this, where a `SECTION` follows a `GENERATE` at the same level: ```cpp SECTION("A") {} auto a = GENERATE(1, 2); SECTION("B") {} ``` However, this interacted badly with `SECTION` filters (`-c foo`), as they could deactivate all `SECTION`s below a generator, and thus stop it from progressing forever. This commit makes GeneratorTracker check whether there are any filters active, and if they are, it checks whether its section-children can ever run. Fixes #2025
Diffstat (limited to 'src/catch2/internal/catch_test_case_tracker.cpp')
-rw-r--r--src/catch2/internal/catch_test_case_tracker.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/catch2/internal/catch_test_case_tracker.cpp b/src/catch2/internal/catch_test_case_tracker.cpp
index 066069a9..3891614d 100644
--- a/src/catch2/internal/catch_test_case_tracker.cpp
+++ b/src/catch2/internal/catch_test_case_tracker.cpp
@@ -230,6 +230,14 @@ namespace TestCaseTracking {
m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
}
+ std::vector<std::string> const& SectionTracker::getFilters() const {
+ return m_filters;
+ }
+
+ std::string const& SectionTracker::trimmedName() const {
+ return m_trimmed_name;
+ }
+
} // namespace TestCaseTracking
using TestCaseTracking::ITracker;