diff options
| author | Phil Nash | 2010-11-29 22:33:48 +0000 |
|---|---|---|
| committer | Phil Nash | 2010-11-29 22:33:48 +0000 |
| commit | fa9f970890dfcc56e3267f0db484ee1594a91967 (patch) | |
| tree | 3cb60cf421a74058c24a166697dab4e392cf0982 /Test/TestMain.cpp | |
| parent | 388e9ffde6e760a4a4e06104f4dbd1d4fff90137 (diff) | |
| parent | ceab2a63bde9cfc28a75bfcbe8a4515ae050cba2 (diff) | |
| download | catch3-fa9f970890dfcc56e3267f0db484ee1594a91967.tar.gz | |
fixed merge
Diffstat (limited to 'Test/TestMain.cpp')
| -rw-r--r-- | Test/TestMain.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Test/TestMain.cpp b/Test/TestMain.cpp index 1492fb7d..b2bf7f84 100644 --- a/Test/TestMain.cpp +++ b/Test/TestMain.cpp @@ -14,6 +14,7 @@ #include "../catch_runner.hpp" // This code runs the meta tests and verifies that the failing ones failed and the successful ones succeeded +/* int main (int argc, char * const argv[]) { using namespace Catch; @@ -22,17 +23,18 @@ int main (int argc, char * const argv[]) if( argc > 1 && ( std::string( argv[1] ) == "-s" || std::string( argv[1] ) == "--success" ) ) showAllResults = true; + std::ostringstream ossSucceeding; + std::ostringstream ossFailing; + ReporterConfig reporterConfig( ReporterConfig::Include::SuccessfulResults ); BasicReporter reporter (reporterConfig ); - Runner runner; - runner.setReporter( &reporter ); - std::ostringstream ossSucceeding; + Runner runner( &reporter ); + reporterConfig.setStreamBuf( ossSucceeding.rdbuf() ); runner.runMatching( "succeeding/*" ); std::string succeedingResults = ossSucceeding.str(); - std::ostringstream ossFailing; reporterConfig.setStreamBuf( ossFailing.rdbuf() ); runner.runMatching( "failing/*" ); std::string failingResults = ossFailing.str(); @@ -56,7 +58,7 @@ int main (int argc, char * const argv[]) { std::cout << failingResults << "\n\n"; } - + if( result == 0 ) { const size_t expectedTestCaseCount = 99; // !TBD factor this out @@ -73,3 +75,5 @@ int main (int argc, char * const argv[]) } return result; } +*/ +#include "catch_default_main.hpp"
\ No newline at end of file |