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

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorMartin Moene2012-07-22 09:13:19 +0200
committerMartin Moene2012-07-22 09:13:19 +0200
commit14f1c094f4877fe2a4bf98fead66d637189c8edd (patch)
tree4aecb2c13c1a9c89466a93fa9852d51b047b6082 /include
parent79a6ae297742f4f9ad08ec0c3de588cff76b7ad7 (diff)
downloadcatch3-14f1c094f4877fe2a4bf98fead66d637189c8edd.tar.gz
Revert "Removed stray '+'"
This reverts commit 79a6ae297742f4f9ad08ec0c3de588cff76b7ad7.
Diffstat (limited to 'include')
-rw-r--r--include/catch_runner.hpp298
1 files changed, 149 insertions, 149 deletions
diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp
index cedf7aae..0e087206 100644
--- a/include/catch_runner.hpp
+++ b/include/catch_runner.hpp
@@ -1,149 +1,149 @@
-/*
- * Created by Phil on 31/10/2010.
- * Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-#ifndef TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
-
-#include "internal/catch_context_impl.hpp"
-
-#include "internal/catch_commandline.hpp"
-#include "internal/catch_list.hpp"
-#include "reporters/catch_reporter_basic.hpp"
-#include "reporters/catch_reporter_xml.hpp"
-#include "reporters/catch_reporter_junit.hpp"
-
-#include <fstream>
-#include <stdlib.h>
-#include <limits>
-
-namespace Catch {
-
- INTERNAL_CATCH_REGISTER_REPORTER( "basic", BasicReporter )
- INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter )
- INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
-
- inline int Main( Config& config ) {
-
- // Handle list request
- if( config.listWhat() != List::None )
- return List( config );
-
- // Open output file, if specified
- std::ofstream ofs;
- if( !config.getFilename().empty() ) {
- ofs.open( config.getFilename().c_str() );
- if( ofs.fail() ) {
- std::cerr << "Unable to open file: '" << config.getFilename() << "'" << std::endl;
- return (std::numeric_limits<int>::max)();
- }
- config.setStreamBuf( ofs.rdbuf() );
- }
-
- 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 );
- }
- }
- result = static_cast<int>( runner.getTotals().assertions.failed );
- }
- Catch::Context::cleanUp();
- return result;
- }
-
- inline void showUsage( std::ostream& os ) {
- os << "\t-?, -h, --help\n"
- << "\t-l, --list <tests | reporters> [xml]\n"
- << "\t-t, --test <testspec> [<testspec>...]\n"
- << "\t-r, --reporter <reporter name>\n"
- << "\t-o, --out <file name>|<%stream name>\n"
- << "\t-s, --success\n"
- << "\t-b, --break\n"
- << "\t-n, --name <name>\n"
- << "\t-a, --abort [#]\n\n"
- << "\t-nt, --nothrow\n\n"
- << "For more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line" << std::endl;
- }
- inline void showHelp( std::string exeName ) {
- std::string::size_type pos = exeName.find_last_of( "/\\" );
- if( pos != std::string::npos ) {
- exeName = exeName.substr( pos+1 );
- }
-
- std::cout << exeName << " is a CATCH host application. Options are as follows:\n\n";
- showUsage( std::cout );
- }
-
- inline int Main( int argc, char* const argv[], Config& config ) {
-
- try {
- CommandParser parser( argc, argv );
-
- if( Command cmd = parser.find( "-h", "-?", "--help" ) ) {
- if( cmd.argsCount() != 0 )
- cmd.raiseError( "Does not accept arguments" );
-
- showHelp( argv[0] );
- Catch::Context::cleanUp();
- return 0;
- }
-
- parseIntoConfig( parser, config.data() );
-
- // !TBD: wire up (do this lazily?)
- if( !config.data().reporter.empty() )
- config.setReporter( config.data().reporter );
-
- if( !config.data().stream.empty() ) {
- if( config.data().stream[0] == '%' )
- config.useStream( config.data().stream.substr( 1 ) );
- else
- config.setFilename( config.data().stream );
- }
- }
- catch( std::exception& ex ) {
- std::cerr << ex.what() << "\n\nUsage: ...\n\n";
- showUsage( std::cerr );
- Catch::Context::cleanUp();
- return (std::numeric_limits<int>::max)();
- }
-
- return Main( config );
- }
-
- inline int Main( int argc, char* const argv[] ) {
- Config config;
-// !TBD: This doesn't always work, for some reason
-// if( isDebuggerActive() )
-// config.useStream( "debug" );
- return Main( argc, argv, config );
- }
-
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
+/*
+ * Created by Phil on 31/10/2010.
+ * Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See accompanying
+ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
+
+#include "internal/catch_context_impl.hpp"
+
+#include "internal/catch_commandline.hpp"
+#include "internal/catch_list.hpp"
+#include "reporters/catch_reporter_basic.hpp"
+#include "reporters/catch_reporter_xml.hpp"
+#include "reporters/catch_reporter_junit.hpp"
+
+#include <fstream>
+#include <stdlib.h>
+#include <limits>
+
+namespace Catch {
+
+ INTERNAL_CATCH_REGISTER_REPORTER( "basic", BasicReporter )
+ INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter )
+ INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+
+ inline int Main( Config& config ) {
+
+ // Handle list request
+ if( config.listWhat() != List::None )
+ return List( config );
+
+ // Open output file, if specified
+ std::ofstream ofs;
+ if( !config.getFilename().empty() ) {
+ ofs.open( config.getFilename().c_str() );
+ if( ofs.fail() ) {
+ std::cerr << "Unable to open file: '" << config.getFilename() << "'" << std::endl;
+ return (std::numeric_limits<int>::max)();
+ }
+ config.setStreamBuf( ofs.rdbuf() );
+ }
+
+ 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 );
+ }
+ }
+ result = static_cast<int>( runner.getTotals().assertions.failed );
+ }
+ Catch::Context::cleanUp();
+ return result;
+ }
+
+ inline void showUsage( std::ostream& os ) {
+ os << "\t-?, -h, --help\n"
+ << "\t-l, --list <tests | reporters> [xml]\n"
+ << "\t-t, --test <testspec> [<testspec>...]\n"
+ << "\t-r, --reporter <reporter name>\n"
+ << "\t-o, --out <file name>|<%stream name>\n"
+ << "\t-s, --success\n"
+ << "\t-b, --break\n"
+ << "\t-n, --name <name>\n"
+ << "\t-a, --abort [#]\n\n"
+ << "\t-nt, --nothrow\n\n"
+ << "For more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line" << std::endl;
+ }
+ inline void showHelp( std::string exeName ) {
+ std::string::size_type pos = exeName.find_last_of( "/\\" );
+ if( pos != std::string::npos ) {
+ exeName = exeName.substr( pos+1 );
+ }
+
+ std::cout << exeName << " is a CATCH host application. Options are as follows:\n\n";
+ showUsage( std::cout );
+ }
+
+ inline int Main( int argc, char* const argv[], Config& config ) {
+
+ try {
+ CommandParser parser( argc, argv );
+
+ if( Command cmd = parser.find( "-h", "-?", "--help" ) ) {
+ if( cmd.argsCount() != 0 )
+ cmd.raiseError( "Does not accept arguments" );
+
+ showHelp( argv[0] );
+ Catch::Context::cleanUp();
+ return 0;
+ }
+
+ parseIntoConfig( parser, config.data() );
+
+ // !TBD: wire up (do this lazily?)
+ if( !config.data().reporter.empty() )
+ config.setReporter( config.data().reporter );
+
+ if( !config.data().stream.empty() ) {
+ if( config.data().stream[0] == '%' )
+ config.useStream( config.data().stream.substr( 1 ) );
+ else
+ config.setFilename( config.data().stream );
+ }
+ }
+ catch( std::exception& ex ) {
+ std::cerr << ex.what() << + "\n\nUsage: ...\n\n";
+ showUsage( std::cerr );
+ Catch::Context::cleanUp();
+ return (std::numeric_limits<int>::max)();
+ }
+
+ return Main( config );
+ }
+
+ inline int Main( int argc, char* const argv[] ) {
+ Config config;
+// !TBD: This doesn't always work, for some reason
+// if( isDebuggerActive() )
+// config.useStream( "debug" );
+ return Main( argc, argv, config );
+ }
+
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED