dev build 5

This commit is contained in:
Phil Nash 2015-07-07 08:25:15 +01:00
parent 02e1966db3
commit e6b365dc8c
3 changed files with 10 additions and 10 deletions

View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![catch logo](catch-logo-small.png)
*v1.2.1-develop.4* *v1.2.1-develop.5*
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

View File

@ -37,7 +37,7 @@ namespace Catch {
return os; return os;
} }
Version libraryVersion( 1, 2, 1, "develop", 4 ); Version libraryVersion( 1, 2, 1, "develop", 5 );
} }

View File

@ -1,6 +1,6 @@
/* /*
* Catch v1.2.1-develop.4 * Catch v1.2.1-develop.5
* Generated: 2015-07-06 06:21:18.816844 * Generated: 2015-07-07 08:24:50.226161
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -4279,6 +4279,10 @@ namespace Catch {
.describe( "load test names to run from a file" ) .describe( "load test names to run from a file" )
.bind( &loadTestNamesFromFile, "filename" ); .bind( &loadTestNamesFromFile, "filename" );
cli["-#"]["--filenames-as-tags"]
.describe( "adds a tag for the filename" )
.bind( &ConfigData::filenamesAsTags );
// Less common commands which don't have a short form // Less common commands which don't have a short form
cli["--list-test-names-only"] cli["--list-test-names-only"]
.describe( "list all/matching test cases names only" ) .describe( "list all/matching test cases names only" )
@ -4300,10 +4304,6 @@ namespace Catch {
.describe( "force colourised output" ) .describe( "force colourised output" )
.bind( &ConfigData::forceColour ); .bind( &ConfigData::forceColour );
cli["--filenames-as-tags"]
.describe( "adds a tag for the filename" )
.bind( &ConfigData::filenamesAsTags );
return cli; return cli;
} }
@ -5626,7 +5626,7 @@ namespace Catch {
if( lastDot != std::string::npos ) if( lastDot != std::string::npos )
filename = filename.substr( 0, lastDot ); filename = filename.substr( 0, lastDot );
tags.insert( "@" + filename ); tags.insert( "#" + filename );
setTags( test, tags ); setTags( test, tags );
} }
} }
@ -6823,7 +6823,7 @@ namespace Catch {
return os; return os;
} }
Version libraryVersion( 1, 2, 1, "develop", 4 ); Version libraryVersion( 1, 2, 1, "develop", 5 );
} }