3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed used of cleaned-up context by runner's destructor

Browse Source 
This was causing a segfault for some
This commit is contained in:
Phil Nash
2012-05-25 08:52:05 +01:00
parent eb22e212c0
commit 06e959be3e
4 changed files with 107 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
include/catch_runner.hpp
View File

@@ -39,31 +39,36 @@ namespace Catch {
config.setStreamBuf( ofs.rdbuf() );
}
Runner runner( config );
int result = 0;
// Scope here for the Runner so it can use the context before it is cleaned-up
{
Runner runner( config );
// Run test specs specified on the command line - or default to all
if( !config.testsSpecified() ) {
config.getReporter()->StartGroup( "" );
runner.runAll();
config.getReporter()->EndGroup( "", runner.getTotals() );
}
else {
// !TBD We should get all the testcases upfront, report any missing,
// then just run them
std::vector<std::string>::const_iterator it = config.getTestSpecs().begin();
std::vector<std::string>::const_iterator itEnd = config.getTestSpecs().end();
for(; it != itEnd; ++it ) {
Totals prevTotals = runner.getTotals();
config.getReporter()->StartGroup( *it );
if( runner.runMatching( *it ) == 0 ) {
// Use reporter?
// std::cerr << "\n[Unable to match any test cases with: " << *it << "]" << std::endl;
}
config.getReporter()->EndGroup( *it, runner.getTotals() - prevTotals );
// Run test specs specified on the command line - or default to all
if( !config.testsSpecified() ) {
config.getReporter()->StartGroup( "" );
runner.runAll();
config.getReporter()->EndGroup( "", runner.getTotals() );
}
else {
// !TBD We should get all the testcases upfront, report any missing,
// then just run them
std::vector<std::string>::const_iterator it = config.getTestSpecs().begin();
std::vector<std::string>::const_iterator itEnd = config.getTestSpecs().end();
for(; it != itEnd; ++it ) {
Totals prevTotals = runner.getTotals();
config.getReporter()->StartGroup( *it );
if( runner.runMatching( *it ) == 0 ) {
// Use reporter?
// std::cerr << "\n[Unable to match any test cases with: " << *it << "]" << std::endl;
}
config.getReporter()->EndGroup( *it, runner.getTotals() - prevTotals );
}
}
result = static_cast<int>( runner.getTotals().assertions.failed );
}
int result = static_cast<int>( runner.getTotals().assertions.failed );
Catch::Context::cleanUp();
Catch::Context::cleanUp();
return result;
}

2
include/internal/catch_context.h
View File

@@ -27,6 +27,8 @@ namespace Catch {
struct IContext
{
virtual ~IContext(){}
virtual IResultCapture& getResultCapture() = 0;
virtual IRunner& getRunner() = 0;
virtual IReporterRegistry& getReporterRegistry() = 0;