Reverted previous two commits as they didn’t fix anything

This commit is contained in:
Phil Nash 2017-06-22 15:52:01 +01:00
parent 3bb16e8418
commit 0470b300a8

View File

@ -76,72 +76,72 @@ namespace Catch {
auto cli auto cli
= ExeName( config.processName ) = ExeName( config.processName )
+ Help( config.showHelp ); + Help( config.showHelp )
+ Opt( config.listTests )
cli += Opt( config.listTests )
["-l"]["--list-tests"] ["-l"]["--list-tests"]
( "list all/matching test cases" ); ( "list all/matching test cases" )
cli += Opt( config.listTags ) + Opt( config.listTags )
["-t"]["--list-tags"] ["-t"]["--list-tags"]
( "list all/matching tags" ); ( "list all/matching tags" )
cli += Opt( config.showSuccessfulTests ) + Opt( config.showSuccessfulTests )
["-s"]["--success"] ["-s"]["--success"]
( "include successful tests in output" ); ( "include successful tests in output" )
cli += Opt( config.shouldDebugBreak ) + Opt( config.shouldDebugBreak )
["-b"]["--break"] ["-b"]["--break"]
( "break into debugger on failure" ); ( "break into debugger on failure" )
cli += Opt( config.noThrow ) + Opt( config.noThrow )
["-e"]["--nothrow"] ["-e"]["--nothrow"]
( "skip exception tests" ); ( "skip exception tests" )
cli += Opt( config.showInvisibles ) + Opt( config.showInvisibles )
["-i"]["--invisibles"] ["-i"]["--invisibles"]
( "show invisibles (tabs, newlines)" ); ( "show invisibles (tabs, newlines)" )
cli += Opt( config.outputFilename, "filename" ) + Opt( config.outputFilename, "filename" )
["-o"]["--out"] ["-o"]["--out"]
( "output filename" ); ( "output filename" )
cli += Opt( config.reporterNames, "name" ) + Opt( config.reporterNames, "name" )
["-r"]["--reporter"] ["-r"]["--reporter"]
( "reporter to use (defaults to console)" ); ( "reporter to use (defaults to console)" )
cli += Opt( config.name, "name" ) + Opt( config.name, "name" )
["-n"]["--name"] ["-n"]["--name"]
( "suite name" ); ( "suite name" )
cli += Opt( [&]( bool ){ config.abortAfter = 1; } ) + Opt( [&]( bool ){ config.abortAfter = 1; } )
["-a"]["--abort"] ["-a"]["--abort"]
( "abort at first failure" ); ( "abort at first failure" )
cli += Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" ) + Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
["-x"]["--abortx"] ["-x"]["--abortx"]
( "abort after x failures" ); ( "abort after x failures" )
cli += Opt( setWarning, "warning name" ) + Opt( setWarning, "warning name" )
["-w"]["--warn"] ["-w"]["--warn"]
( "enable warnings" ); ( "enable warnings" )
cli += Opt( [&]( bool ) { config.showDurations = ShowDurations::Always; } ) + Opt( [&]( bool ) { config.showDurations = ShowDurations::Always; } )
["-d"]["--durations"] ["-d"]["--durations"]
( "show test durations" ); ( "show test durations" )
cli += Opt( loadTestNamesFromFile, "filename" ) + Opt( loadTestNamesFromFile, "filename" )
["-f"]["--input-file"] ["-f"]["--input-file"]
( "load test names to run from a file" ); ( "load test names to run from a file" )
cli += Opt( config.filenamesAsTags ) + Opt( config.filenamesAsTags )
["-#"]["--filenames-as-tags"] ["-#"]["--filenames-as-tags"]
( "adds a tag for the filename" ); ( "adds a tag for the filename" )
cli += Opt( config.sectionsToRun, "section name" ) + Opt( config.sectionsToRun, "section name" )
["-c"]["--section"] ["-c"]["--section"]
( "specify section to run" ); ( "specify section to run" )
cli += Opt( config.listTestNamesOnly ) + Opt( config.listTestNamesOnly )
["--list-test-names-only"] ["--list-test-names-only"]
( "list all/matching test cases names only" ); ( "list all/matching test cases names only" )
cli += Opt( config.listReporters ) + Opt( config.listReporters )
["--list-reporters"] ["--list-reporters"]
( "list all reporters" ); ( "list all reporters" )
cli += Opt( setTestOrder, "decl|lex|rand" ) + Opt( setTestOrder, "decl|lex|rand" )
["--order"] ["--order"]
( "test case order (defaults to decl)" ); ( "test case order (defaults to decl)" )
cli += Opt( setRngSeed, "'time'|number" ) + Opt( setRngSeed, "'time'|number" )
["--rng-seed"] ["--rng-seed"]
( "set a specific seed for random numbers" ); ( "set a specific seed for random numbers" )
cli += Opt( setColourUsage, "yes|no" ) + Opt( setColourUsage, "yes|no" )
["--use-colour"] ["--use-colour"]
( "should output be colourised" ); ( "should output be colourised" )
cli += Arg( config.testsOrTags, "test name|pattern|tags" )
+ Arg( config.testsOrTags, "test name|pattern|tags" )
( "which test or tests to use" ); ( "which test or tests to use" );
return cli; return cli;