3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch:Failure to apply filters through external file

This commit is contained in:
amitherman95 2019-10-08 13:55:08 +03:00 committed by Martin Hořeňovský
parent 75200e199e
commit adb4789136
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/internal/catch_test_spec_parser.cpp
View File

@ -7,6 +7,7 @@
#include "catch_test_spec_parser.h" #include "catch_test_spec_parser.h"
namespace Catch { namespace Catch {
TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {} TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
@ -18,6 +19,7 @@ namespace Catch {
m_escapeChars.clear(); m_escapeChars.clear();
m_substring.reserve(m_arg.size()); m_substring.reserve(m_arg.size());
m_patternName.reserve(m_arg.size()); m_patternName.reserve(m_arg.size());
m_realPatternPos = 0;
for( m_pos = 0; m_pos < m_arg.size(); ++m_pos ) for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
visitChar( m_arg[m_pos] ); visitChar( m_arg[m_pos] );
endMode(); endMode();
@ -32,6 +34,7 @@ namespace Catch {
escape(); escape();
m_substring += c; m_substring += c;
m_patternName += c; m_patternName += c;
m_realPatternPos++;
return; return;
}else if((m_mode != EscapedName) && (c == ',') ) { }else if((m_mode != EscapedName) && (c == ',') ) {
endMode(); endMode();
@ -49,7 +52,10 @@ namespace Catch {
break; break;
case EscapedName: case EscapedName:
endMode(); endMode();
break; m_substring += c;
m_patternName += c;
m_realPatternPos++;
return;
default: default:
case Tag: case Tag:
case QuotedName: case QuotedName:
@ -59,8 +65,10 @@ namespace Catch {
} }
m_substring += c; m_substring += c;
if( !isControlChar( c ) ) if( !isControlChar( c ) ) {
m_patternName += c; m_patternName += c;
m_realPatternPos++;
}
} }
// Two of the processing methods return true to signal the caller to return // Two of the processing methods return true to signal the caller to return
// without adding the given character to the current pattern strings // without adding the given character to the current pattern strings
@ -119,7 +127,7 @@ namespace Catch {
void TestSpecParser::escape() { void TestSpecParser::escape() {
saveLastMode(); saveLastMode();
m_mode = EscapedName; m_mode = EscapedName;
m_escapeChars.push_back( m_pos ); m_escapeChars.push_back(m_realPatternPos);
} }
bool TestSpecParser::isControlChar( char c ) const { bool TestSpecParser::isControlChar( char c ) const {
switch( m_mode ) { switch( m_mode ) {

1
include/internal/catch_test_spec_parser.h
View File

@ -25,6 +25,7 @@ namespace Catch {
Mode lastMode = None; Mode lastMode = None;
bool m_exclusion = false; bool m_exclusion = false;
std::size_t m_pos = 0; std::size_t m_pos = 0;
std::size_t m_realPatternPos = 0;
std::string m_arg; std::string m_arg;
std::string m_substring; std::string m_substring;
std::string m_patternName; std::string m_patternName;