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

summaryrefslogtreecommitdiffhomepage
path: root/include/internal/catch_session.cpp
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-11-07 12:39:07 +0100
committerMartin Hořeňovský2019-11-14 10:53:12 +0100
commitd36c15c3caf96c2e751f4ad83a386c1fd047c2f6 (patch)
treecba3faef17447ccfd3a2c9a7e751f8a52e2ae226 /include/internal/catch_session.cpp
parent302e2c0b06f131199b97ad33bdebacc359782ff0 (diff)
downloadcatch3-d36c15c3caf96c2e751f4ad83a386c1fd047c2f6.tar.gz
Store tags in one big pre-allocated string and only work with refs
This should decrease the number of allocations before main is entered significantly, but complicates the code somewhat in return. Assuming I used `massif` right, doing just `SelfTest --list-tests` went from 929 allocations at "Remove gcc-4.9 from the travis builds" (2 commits up), to 614 allocations with this commit.
Diffstat (limited to 'include/internal/catch_session.cpp')
-rw-r--r--include/internal/catch_session.cpp28
1 files changed, 6 insertions, 22 deletions
diff --git a/include/internal/catch_session.cpp b/include/internal/catch_session.cpp
index 87b52d44..a4d5c016 100644
--- a/include/internal/catch_session.cpp
+++ b/include/internal/catch_session.cpp
@@ -116,26 +116,9 @@ namespace Catch {
TestSpec::Matches m_matches;
};
- void applyFilenamesAsTags(Catch::IConfig const& config) {
- for (auto const& testCase : getAllTestCasesSorted(config)) {
- // Yeah, sue me. This will be removed soon.
- auto& testInfo = const_cast<TestCaseInfo&>(testCase.getTestCaseInfo());
-
- std::string filename = testInfo.lineInfo.file;
- auto lastSlash = filename.find_last_of("\\/");
- if (lastSlash != std::string::npos) {
- filename.erase(0, lastSlash);
- filename[0] = '#';
- }
-
- auto lastDot = filename.find_last_of('.');
- if (lastDot != std::string::npos) {
- filename.erase(lastDot);
- }
-
- auto tags = testInfo.tags;
- tags.push_back(std::move(filename));
- setTags(testInfo, tags);
+ void applyFilenamesAsTags() {
+ for (auto const& testInfo : getRegistryHub().getTestCaseRegistry().getAllInfos()) {
+ testInfo->addFilenameTag();
}
}
@@ -285,8 +268,9 @@ namespace Catch {
seedRng( *m_config );
- if( m_configData.filenamesAsTags )
- applyFilenamesAsTags( *m_config );
+ if (m_configData.filenamesAsTags) {
+ applyFilenamesAsTags();
+ }
// Create reporter(s) so we can route listings through them
auto reporter = makeReporter(m_config);