diff options
| author | Phil Nash | 2014-05-20 18:28:19 +0100 |
|---|---|---|
| committer | Phil Nash | 2014-05-20 18:28:19 +0100 |
| commit | 2c9e9ac004ead78e648390cd6bfacdeb23559e46 (patch) | |
| tree | be510db8ef093833c849ac379a98dfa6d9a72337 /include | |
| parent | baf181f15d27b555417a12db948ad8e91ad5b075 (diff) | |
| download | catch3-2c9e9ac004ead78e648390cd6bfacdeb23559e46.tar.gz | |
Fixed space separated lists of test specs
- they form an AND expression. They were forming an OR expression due to changes made to fix -f - so that had to be fixed differently
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_commandline.hpp | 2 | ||||
| -rw-r--r-- | include/internal/catch_test_spec_parser.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp index 05e9f46b..baed9c81 100644 --- a/include/internal/catch_commandline.hpp +++ b/include/internal/catch_commandline.hpp @@ -49,7 +49,7 @@ namespace Catch { while( std::getline( f, line ) ) { line = trim(line); if( !line.empty() && !startsWith( line, "#" ) ) - addTestOrTags( config, "\"" + line + "\"" ); + addTestOrTags( config, "\"" + line + "\"," ); } } diff --git a/include/internal/catch_test_spec_parser.hpp b/include/internal/catch_test_spec_parser.hpp index 53c724b9..6fc356e8 100644 --- a/include/internal/catch_test_spec_parser.hpp +++ b/include/internal/catch_test_spec_parser.hpp @@ -36,10 +36,10 @@ namespace Catch { visitChar( m_arg[m_pos] ); if( m_mode == Name ) addPattern<TestSpec::NamePattern>(); - addFilter(); return *this; } TestSpec testSpec() { + addFilter(); return m_testSpec; } private: |